Commit 397b6fcf by 任建

rj

parent 81d09e95
......@@ -11,6 +11,14 @@
left: 0;
z-index: 999;
}
.ulLoading{
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 888;
}
.el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover{
background: rgba(183,221,248) !important;
color: #fff !important;
......
......@@ -46,7 +46,8 @@
换一换
</div>
</div>
<div>
<div style="position:relative;height: 105px;">
<div class="ulLoading" v-if="loadingUl" v-loading="true"></div>
<ul>
<li class="wins-randColor" v-for="(item, index) in hotCharat" :key="item">{{item}}</li>
</ul>
......
......@@ -2,7 +2,7 @@
template: '${tmpl}',
data: function() {
return {
nameLength: ['2个字', '3个字', '4个字', '5个字',],
nameLength: ['2个字', '3个字', '4个字',],
selectedCharat: "请选择商标字数",
brandStructure: [],
initBrandStructure: [
......@@ -10,6 +10,7 @@
'AB',
'AAB',
'ABA',
'ABC',
'ABAB',
'AABB',
'AAAB',
......@@ -20,19 +21,7 @@
'BACA',
'ABAC',
'BCAA',
'ABCD',
'AAAAB',
'AAABA',
'AABAA',
'ABAAA',
'AAABB',
'ABCAA',
'BCAAA',
'BAAAC',
'ABACA',
'AABCD',
'BCDAA',
'ABCDE',
'ABCD'
],
selectedStructure: "请选择商标包含结构",
inputValue: "",
......@@ -109,6 +98,7 @@
hotCharat: [],
ncl_list: [],
loading:false,
loadingUl:false,
colorList:[{
bgColor:"#EDEEFA",
fontColor:"#5B65D3"
......@@ -156,13 +146,10 @@
this.brandStructure = this.initBrandStructure.slice(0, 2);
break;
case 3:
this.brandStructure = this.initBrandStructure.slice(0, 4);
this.brandStructure = this.initBrandStructure.slice(0, 1).concat(this.initBrandStructure.slice(2, 5));
break;
case 4:
this.brandStructure = this.initBrandStructure.slice(0, 15);
break;
case 5:
this.brandStructure = this.initBrandStructure.slice(0);
this.brandStructure = this.initBrandStructure.slice(0, 1).concat(this.initBrandStructure.slice(5));
break;
default:
this.brandStructure = this.initBrandStructure.slice(0, 1);
......@@ -282,9 +269,9 @@
var obj = {
"ncl_list": this.ncl_list.length ? this.ncl_list : ''
};
this.loading = true;
this.loadingUl = true;
this.$root.postReq('/web/tmquery/toolCtl/getHotWords', obj).then((d) => {
this.loading = false;
this.loadingUl = false;
console.log(d,'123123');
this.hotCharat = d.data;
this.$nextTick(() => {
......
......@@ -56,7 +56,6 @@
this.paging();
});
}
} catch (e) {
console.log(e);
}
......@@ -146,12 +145,6 @@
} ,
mounted: function() {
},
vname: "gsb-winsresult"
}
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