Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !164

src/pages/extendProduct/extendProduct.js

@@ -64,12 +64,18 @@ wxService.page({
     // 可使用
     if (current == 0) {
       wx.showShareMenu()
-      this.getExtendProList(1,10)
+      this.setData({
+        pageNo: 1
+      })
+      this.getExtendProList(this.data.pageNo,10)
     } else if (current == 1) {
       // 我的推广
       wx.hideShareMenu();
       this.getMyShareCount()
-      this.getMyExtendOrderList(1,10)
+      this.setData({
+        pageNum: 1
+      })
+      this.getMyExtendOrderList(this.data.pageNum,10)
     }
   },
 
@@ -325,7 +331,10 @@ wxService.page({
   onShow: function () {
     const { memberId, member } = wx.getStorageSync('_baseUserInfo')
     this.getExtendProBanner()
-    this.getExtendProList(1,10)
+    this.setData({
+      pageNo: 1
+    })
+    this.getExtendProList(this.data.pageNo,10)
     this.data.currentShareContent = null;
   },
 
@@ -367,7 +376,6 @@ wxService.page({
         })
       }
     }else{
-      console.log('11111111111', this.data.pageNum)
       if (this.data.pageNum < this.data.myTotalPages) {
         this.setData({
           pageNum: this.data.pageNum + 1,

src/pages/productDetail/productDetail.js

@@ -37,11 +37,10 @@ wxService.page({
         fromZc: options.fromZc == 1
       });
       //不是从种草过来的， 需要清除本地临时的触点信息
-      // if (!options.fromZc) {
+      // if (!options.fromZc && !options.t) {
       //   wx.removeStorageSync('TEMP_TENTACLE_INFO');
       //   wx.removeStorageSync('TIME_EXPIRATION');
       // }
-     
     }
     let memberId = options.memberId;
     if (memberId) {