美博会

src/main/resources/static/js/index.js

@@ -335,7 +335,9 @@ var homeData = new Vue({
         if(beatyPop){
             _this.showflag = false;
         }else{
-            _this.showflag = true;
+            setTimeout(function () {
+                 _this.showflag = true;
+            },1000)
         }
         // setTimeout(function () {
         //      window.localStorage.removeItem('beatyPop');

src/main/resources/static/js/product/beautytopic.js

@@ -14,8 +14,6 @@ var beautytopic = new Vue({
              {descriptext:'专注原装进口国际高端高科技美容设备',shopId:1201},//和创元
              {descriptext:'致力于光学医疗美容设备的研发',shopId:1206},//瑞恺迪
              {descriptext:'专注于原装进口国际医疗美容设备',shopId:1217},//塑美颜
-
-             {descriptext:'专注于原装进口国际医疗美容设备',shopId:1161},//塑美颜
              ],//描述词
          VipList:[//vip品牌
             {PCimage:'/img/Beautyfair/VIP/INDIBA-PC.jpg',H5image:'/img/Beautyfair/VIP/INDIBA-H5.jpg'},
@@ -105,14 +103,9 @@ var beautytopic = new Vue({
 				listA.forEach(function (item,index) {
 				    console.log(index)
                     for (var i=0;i < listB.length; i++){
-                            console.log(i)
-                            var newindex = listB[i];
-                            if(index == newindex){
-                                NewArray.push(Object.assign(item,listB[i]))
-                            }
-                        // if( item.shopId == listB[i].shopId ){
-						// 	NewArray.push(Object.assign(item,listB[i]))
-						// }
+                        if( item.shopId == listB[i].shopId ){
+							NewArray.push(Object.assign(item,listB[i]))
+						}
                     }
                 })
 				return NewArray