Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/App.vue

@@ -14,7 +14,7 @@ export default {
       process.env.NODE_ENV == "production" ||
       JSON.stringify(extConfig) == "{}"
     ) {
-      // extConfig = { mixid: "antgood", shopid: 67 };
+      extConfig = { mixid: "antgood", shopid: 67 };
       // extConfig = { "mixid":"xyyx",
       // "shopid":133 };
     }

src/main.js

@@ -134,18 +134,18 @@ function getThemePage({mixid,shopid}) {
 
 
 
-if (!mpApp.globalData.setPopupStorage){
+// if (!mpApp.globalData.setPopupStorage){
 
-  let popUpList = wx.getStorageSync('popUpList') || []
-  let arr = []
-  popUpList.forEach(item=> {
-    arr.push(item)
-    wx.removeStorageSync(item)
-  })
-  arr.forEach(item => {
-    popUpList.splice(popUpList.indexOf(item),1)
-  })
+//   let popUpList = wx.getStorageSync('popUpList') || []
+//   let arr = []
+//   popUpList.forEach(item=> {
+//     arr.push(item)
+//     wx.removeStorageSync(item)
+//   })
+//   arr.forEach(item => {
+//     popUpList.splice(popUpList.indexOf(item),1)
+//   })
 
-  wx.setStorageSync('popUpList', popUpList)
+//   wx.setStorageSync('popUpList', popUpList)
 
-}
\ No newline at end of file
+// }
\ No newline at end of file

static/nativeComponents/PopUp/index.js

@@ -29,7 +29,14 @@ Component({
     this.setData({
       img: app.DFSImg(this.data.datas.componentData.imageUrl,700,null,1)
     })
-
+    
+    console.log(this.data.datas.componentData,'this.data.datas.componentData.once')
+    if(!this.data.datas.componentData.once){
+      console.log('laizhelile')
+      let routes = getCurrentPages()
+      let page = routes[routes.length - 1].route
+      wx.removeStorageSync(`${app.globalData.shopInfo.shopCode}_popFlag_${page}_${this.data.datas.id}`)
+    }
     if (this.getPopFlag() == 'true'){
       this.setData({
         domainShow : false
@@ -45,7 +52,9 @@ Component({
           this.setData({
             domainShow: false
           })
-          this.setPopFlag('true')
+          if(this.data.datas.componentData.once){
+            this.setPopFlag('true')
+          }
         }, this.data.datas.componentData.columnNum * 1000)
       }
     }
@@ -75,7 +84,10 @@ Component({
       this.setData({
         domainShow : false
       })
-      this.setPopFlag("true");
+      if(this.data.datas.componentData.once){
+        this.setPopFlag("true");
+      }
+      
       clearTimeout(this.data.timeout);
     },
     onclickHandle() {