美博会

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

@@ -327,19 +327,19 @@ var homeData = new Vue({
         })
 
         var beatyPop =  window.localStorage.getItem('beatyPop');
-        //  window.onbeforeunload = function(e) {
-        //     e = e || window.event;
-        //      window.sessionStorage.removeItem('beatyPop');
-        // };
+         window.onbeforeunload = function(e) {
+            e = e || window.event;
+             window.localStorage.removeItem('beatyPop');
+        };
         //新加  优惠券弹窗
         if(beatyPop){
             _this.showflag = false;
         }else{
             _this.showflag = true;
         }
-        setTimeout(function () {
-             window.localStorage.removeItem('beatyPop');
-        },7200000)
+        // setTimeout(function () {
+        //      window.localStorage.removeItem('beatyPop');
+        // },7200000)
     }
 });
 

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

@@ -11,11 +11,12 @@ var beautytopic = new Vue({
              {descriptext:'国货之光——专注医学美容术前术后修复',shopId:1285},//优斐斯
              {descriptext:'专注于进口国际顶级医疗美容设备',shopId:1184},//美生美
              {descriptext:'专注于进口国际品牌医疗美容设备和医用级护肤品',shopId:1292},//品辉
-             {descriptext:'',shopId:1205},//恩盛国际
+             {descriptext:'致力于韩国原装进口高端美容仪器',shopId:1205},//恩盛国际
              {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',link:'https://www.caimei365.com/product/list.html?keyword=INDIBA'},
@@ -104,11 +105,17 @@ var beautytopic = new Vue({
         },
         ReturnNewFlootData:function(listA,listB){
 				var NewArray = [];
-				listA.forEach(function (item) {
+				listA.forEach(function (item,index) {
+				    console.log(index)
                     for (var i=0;i < listB.length; i++){
-                        if( item.shopId == listB[i].shopId ){
-							NewArray.push(Object.assign(item,listB[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]))
+						// }
                     }
                 })
 				return NewArray