Commit 37438b9a by 任建

jiazaiyangshi

parent 3547ce08
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<body> <body>
<div id="app" style="visibility: hidden;"> <div id="app" style="visibility: hidden;">
<div> <div>
<el-scrollbar class="page-component__scroll" > <el-scrollbar class="page-component__scroll" style="marginTop:0;">
<div id="embedwarpper"> <div id="embedwarpper">
<div><keep-alive> <div style="width:100%;min-height: 850px;"><keep-alive>
<router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中" <router-view name="default" v-loading.fullscreen.lock="loading" element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)"> element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
</router-view></keep-alive> </router-view></keep-alive>
......
...@@ -5,6 +5,14 @@ ...@@ -5,6 +5,14 @@
background-color: #fff; background-color: #fff;
padding-bottom: 25px; padding-bottom: 25px;
} }
.detail-loading{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 99000;
}
.ncldetail-main-name { .ncldetail-main-name {
width: 100%; width: 100%;
...@@ -69,30 +77,44 @@ ...@@ -69,30 +77,44 @@
/* 隐藏 */ /* 隐藏 */
.ncldetail-main-content-particular { .ncldetail-main-content-particular {
width: 100%; width: 100%;
max-height: 160px; max-height: 120px;
padding: 0px 15px; padding: 0px 30px;
box-sizing: border-box;
overflow: hidden;
margin-bottom: 20px;
}
.ncldetail-main-content-particular>div{
width: 100%;
height: 118px;
border-radius:1px;
border:1px solid rgba(230,232,233,1);
box-sizing: border-box; box-sizing: border-box;
padding: 0 5px 0 13px;
overflow: auto; overflow: auto;
} }
.ncldetail-main-content-particular>div::-webkit-scrollbar {
.ncldetail-main-content-particular>div { width: 4px;
/*height: 4px;*/
}
.ncldetail-main-content-particular>div>div {
float: left; float: left;
width: 45px; width: 33px;
height: 45px; height: 33px;
line-height: 45px; line-height: 32px;
color: rgba(16, 16, 16, 1); color: rgba(16, 16, 16, 1);
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
font-family: Roboto; font-family: Roboto;
border: 1px solid rgba(187, 187, 187, 1); border: 1px solid rgba(187, 187, 187, 1);
margin: 15px; margin: 10px 7px;
cursor: pointer; cursor: pointer;
border-radius:2px;
} }
.ncldetail-main-content-particular>.special { .ncldetail-main-content-particular>div>.special {
background-color: #118EE9; background:rgba(235,242,255,1);
color: #fff; border-radius:2px;
border: #118EE9; border:1px solid rgba(202,220,255,1);
} }
/* */ /* */
...@@ -100,7 +122,7 @@ ...@@ -100,7 +122,7 @@
float: left; float: left;
min-width: 178px; min-width: 178px;
min-height: 171px; min-height: 171px;
width: 13%; width: 12.5%;
height: 10.4%; height: 10.4%;
padding-bottom: 14px; padding-bottom: 14px;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
...@@ -185,9 +207,11 @@ ...@@ -185,9 +207,11 @@
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 5; -webkit-line-clamp: 5;
overflow: hidden; overflow: auto;
}
.ncldetail-main-item>.maskLayer>.text::-webkit-scrollbar {
width: 4px;
} }
/* 2 */ /* 2 */
.ncldetail-main-content2 { .ncldetail-main-content2 {
width: 100%; width: 100%;
......
<div class="ncldetail"> <div class="ncldetail">
<div class="detail-loading" v-if="loading" v-loading="true"></div>
<div class="ncldetail-main"> <div class="ncldetail-main">
<div class="ncldetail-main-name">商标分类</div> <div class="ncldetail-main-name">商标分类</div>
<div class="ncldetail-main-title"> <div class="ncldetail-main-title">
...@@ -29,7 +30,10 @@ ...@@ -29,7 +30,10 @@
</div> </div>
</div> </div>
<div class="ncldetail-main-content-particular" v-if="recommendType && brandKey == 1"> <div class="ncldetail-main-content-particular" v-if="recommendType && brandKey == 1">
<div :class="NmcpKey == i ? \'special\' : \' \'" v-for="i in 45" @click="ncldataParEve(i)">{{i}}</div> <div>
<div :class="NmcpKey == i ? \'special\' : \' \'" v-for="i in 45" @click="ncldataParEve(i)">{{i}}</div>
</div>
</div> </div>
<div class="ncldetail-main-content2-particular" v-if="recommendType"> <div class="ncldetail-main-content2-particular" v-if="recommendType">
<div class="RecommendedDetails"> <div class="RecommendedDetails">
......
...@@ -87,7 +87,8 @@ ...@@ -87,7 +87,8 @@
RecommendedDetailsData: [], RecommendedDetailsData: [],
RecommendedDetailsObj: {}, RecommendedDetailsObj: {},
RdeKey: 0, RdeKey: 0,
NmcpKey: null NmcpKey: null,
loading: false
} }
}, },
methods: { methods: {
...@@ -127,14 +128,9 @@ ...@@ -127,14 +128,9 @@
number: this.number number: this.number
}; };
var that = this; var that = this;
const loadingbyc = this.$loading({ this.loading=true;
lock: true,
text: '拼命加载中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.$root.postReq("/web/tmquery/tmqueryCtl/getNclDetail", objdata).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/getNclDetail", objdata).then(function (d) {
loadingbyc.close(); that.loading=false;
that.RecommendedDetailsData = d.data; that.RecommendedDetailsData = d.data;
that.RecommendedDetailsObj = d.data.data[0]; that.RecommendedDetailsObj = d.data.data[0];
var str = that.RecommendedDetailsData.classification.replace(/-/,` -`); var str = that.RecommendedDetailsData.classification.replace(/-/,` -`);
...@@ -142,7 +138,7 @@ ...@@ -142,7 +138,7 @@
}).catch(function (e) { }).catch(function (e) {
console.log(e); console.log(e);
that.$root.loading = false; that.loading = false;
that.$message.warning(`操作失败,请刷新页面后重新操作`); that.$message.warning(`操作失败,请刷新页面后重新操作`);
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment