rj

embed_applications/app/front/vues/pages/wins/wins.css

@@ -11,6 +11,14 @@
     left: 0;
     left: 0;
     z-index: 999;
     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{
 .el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover{
     background: rgba(183,221,248) !important;
     background: rgba(183,221,248) !important;
     color: #fff !important;
     color: #fff !important;

embed_applications/app/front/vues/pages/wins/wins.html

@@ -46,7 +46,8 @@
                     换一换
                     换一换
                 </div>
                 </div>
             </div>
             </div>
-            <div>
+            <div style="position:relative;height: 105px;">
+                <div class="ulLoading" v-if="loadingUl" v-loading="true"></div>
                 <ul>
                 <ul>
                     <li class="wins-randColor" v-for="(item, index) in hotCharat" :key="item">{{item}}</li>
                     <li class="wins-randColor" v-for="(item, index) in hotCharat" :key="item">{{item}}</li>
                 </ul>
                 </ul>

embed_applications/app/front/vues/pages/wins/wins.js

@@ -2,7 +2,7 @@
     template: '${tmpl}',
     template: '${tmpl}',
         data: function() {
         data: function() {
             return {
             return {
-                nameLength: ['2个字', '3个字', '4个字', '5个字',],
+                nameLength: ['2个字', '3个字', '4个字',],
                 selectedCharat: "请选择商标字数",
                 selectedCharat: "请选择商标字数",
                 brandStructure: [],
                 brandStructure: [],
                 initBrandStructure: [
                 initBrandStructure: [
@@ -10,6 +10,7 @@
                     'AB',
                     'AB',
                     'AAB',
                     'AAB',
                     'ABA',
                     'ABA',
+                    'ABC',
                     'ABAB',
                     'ABAB',
                     'AABB',
                     'AABB',
                     'AAAB',
                     'AAAB',
@@ -20,19 +21,7 @@
                     'BACA',
                     'BACA',
                     'ABAC',
                     'ABAC',
                     'BCAA',
                     'BCAA',
-                    'ABCD',
-                    'AAAAB',
-                    'AAABA',
-                    'AABAA',
-                    'ABAAA',
-                    'AAABB',
-                    'ABCAA',
-                    'BCAAA',
-                    'BAAAC',
-                    'ABACA',
-                    'AABCD',
-                    'BCDAA',
-                    'ABCDE',
+                    'ABCD'
                 ],
                 ],
                 selectedStructure: "请选择商标包含结构",
                 selectedStructure: "请选择商标包含结构",
                 inputValue: "",
                 inputValue: "",
@@ -109,6 +98,7 @@
                 hotCharat: [],
                 hotCharat: [],
                 ncl_list: [],
                 ncl_list: [],
                 loading:false,
                 loading:false,
+                loadingUl:false,
                 colorList:[{
                 colorList:[{
                     bgColor:"#EDEEFA",
                     bgColor:"#EDEEFA",
                     fontColor:"#5B65D3"
                     fontColor:"#5B65D3"
@@ -156,13 +146,10 @@
                     this.brandStructure = this.initBrandStructure.slice(0, 2);
                     this.brandStructure = this.initBrandStructure.slice(0, 2);
                     break;
                     break;
                 case 3:
                 case 3:
-                    this.brandStructure = this.initBrandStructure.slice(0, 4);
+                    this.brandStructure = this.initBrandStructure.slice(0, 1).concat(this.initBrandStructure.slice(2, 5));
                     break;
                     break;
                 case 4:
                 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;
                     break;
                 default:
                 default:
                     this.brandStructure = this.initBrandStructure.slice(0, 1);
                     this.brandStructure = this.initBrandStructure.slice(0, 1);
@@ -282,9 +269,9 @@
             var obj = {
             var obj = {
                 "ncl_list": this.ncl_list.length ? this.ncl_list : ''
                 "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.$root.postReq('/web/tmquery/toolCtl/getHotWords', obj).then((d) => {
-                this.loading = false;
+                this.loadingUl = false;
                 console.log(d,'123123');
                 console.log(d,'123123');
                 this.hotCharat = d.data;
                 this.hotCharat = d.data;
                 this.$nextTick(() => {
                 this.$nextTick(() => {

embed_applications/app/front/vues/pages/winsresult/winsresult.js

@@ -56,7 +56,6 @@
                         this.paging();
                         this.paging();
                     });
                     });
                 }
                 }
-
             } catch (e) {
             } catch (e) {
                 console.log(e);
                 console.log(e);
             }
             }
@@ -146,12 +145,6 @@
 
 
     } ,
     } ,
     mounted: function() {
     mounted: function() {
-
-
-
-
-
-
     },
     },
     vname: "gsb-winsresult"
     vname: "gsb-winsresult"
 }
 }