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

Fixbug zyw

See merge request !158

src/pages/addAddress/addAddress.js

 
 // pages/addAddress/addAddress.js
 const wxService = require('../../utils/wxService')
+const city = require('../../utils/city')
 const { memberId } = wx.getStorageSync('_baseUserInfo')
 
 wxService.page({
@@ -64,6 +65,7 @@ wxService.page({
 
   init() {
     wxService.getC1().then((c1) => {
+      console.log('C1',c1)
       return wxService.Promise.all([wxService.Promise.resolve(c1), wxService.getC2ByC1('北京'), wxService.getC3ByC2('北京北京市')])
     }).then(res => {
       console.log(res)
@@ -73,6 +75,7 @@ wxService.page({
       this.setData({
         citys
       })
+      console.log('000000000------', citys)
     })
   },
 
@@ -107,6 +110,7 @@ wxService.page({
           this.setData({
             citys
           })
+         
         })
       }
     }).finally(() => {

src/pages/myShare/myShare.js

@@ -64,8 +64,11 @@ wxService.page({
    */
   onShow() {
     const { memberId, member } = wx.getStorageSync('_baseUserInfo')
-    let time = Date.parse(new Date())
-    if (member && member.premiumExpireTime && member.premiumExpireTime > time) {
+    const premiumExpireTime = member && member.premiumExpireTime || ''
+    // ios 兼容 是不是plus vip
+    let currentEndTime = (new Date(premiumExpireTime.replace(/-/g, '/'))).getTime(); // 到期时间
+    let time = (new Date()).getTime(); 
+    if (member && member.premiumExpireTime && currentEndTime > time) {
       this.setData({
         plus: 1
       })

src/pages/productDetail/productDetail.js

@@ -40,27 +40,40 @@ wxService.page({
       //   wx.removeStorageSync('TEMP_TENTACLE_INFO');
       //   wx.removeStorageSync('TIME_EXPIRATION');
       // }
+     
     }
-    console.log('options',options)
-
     let memberId = options.memberId;
     if (memberId) {
-      let content = {
-        title: this.data.productInfo.productName,
-        id: this.data.productInfo.productId,
-        url: this.data.productInfo.indexUrl
-      }
-      let tentacleInfo = {
-        content: JSON.stringify(content),
-        contentId: this.data.productInfo.productId,
-        tentacleId: memberId,
-        contentType: app.globalData.contants.SHARE_TYPE.PRODUCT_DETAIL, //内容类型 
-        title: this.data.productInfo.productName, //标题
-        type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
-      }
-    
-      this.generatePointObject(tentacleInfo);
+      wxService.get(`/sale/product/buyer/findByProductId?productId=${this.data.productId}`).then(res => {
+        const { result, data } = res.data
+        if (result == 0) {
+          wx.hideLoading()
+          this.setData({
+            productInfo: data
+          })
+          let content = {
+            title: this.data.productInfo.productName,
+            id: this.data.productInfo.productId,
+            url: this.data.productInfo.indexUrl
+          }
+          let tentacleInfo = {
+            content: JSON.stringify(content),
+            contentId: this.data.productInfo.productId,
+            tentacleId: memberId,
+            contentType: app.globalData.contants.SHARE_TYPE.PRODUCT_DETAIL, //内容类型 
+            title: this.data.productInfo.productName, //标题
+            type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
+          }
+
+          this.generatePointObject(tentacleInfo);
+
+        }
+      }).finally(() => {
+        wx.hideLoading()
+      })
+      
     }
+
   },
 
   swiperChange(e) {
@@ -149,6 +162,7 @@ wxService.page({
         this.setData({
           productInfo: data
         })
+        console.log('111111111111', this.data.productInfo)
       }
     }).finally(() => {
       wx.hideLoading()

src/pages/wantToBuyDetail/wantToBuyDetail.js

@@ -34,24 +34,40 @@ wxService.page({
       })
     }
 
-    let memberId = options.memberId;
-    if (memberId) {
-      let content = {
-        title: this.data.contentInfo.headline,
-        id: this.data.contentInfo.id,
-        article: this.data.contentInfo.article,
-        url: this.data.contentInfo.shareShowPictureRESDTOList[0].url
-      }
-      let tentacleInfo = {
-        content: JSON.stringify(content),
-        contentId: this.data.contentInfo.id,
-        tentacleId: memberId,
-        contentType: app.globalData.contants.SHARE_TYPE.DETAILS_OF_THE_CONTENT, //内容类型 
-        title: this.data.contentInfo.headline, //标题
-        type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
-      }
+    let memberIdByPage = options.memberId;
+    if (memberIdByPage) {
+      const { memberId, member } = wx.getStorageSync('_baseUserInfo')
+      wxService.post(`/merchant/contentMobileTerminal/getContentParticulars`, {
+        id: this.data.id,
+        userId: memberId
+      }).then(res => {
+        if (!res) return false
+        const { result, data } = res.data
+        if (result == 0) {
+          this.setData({
+            contentInfo: data
+          })
+          let content = {
+            title: this.data.contentInfo.headline,
+            id: this.data.contentInfo.id,
+            article: this.data.contentInfo.article,
+            url: this.data.contentInfo.shareShowPictureRESDTOList[0].url
+          }
+          let tentacleInfo = {
+            content: JSON.stringify(content),
+            contentId: this.data.contentInfo.id,
+            tentacleId: memberIdByPage,
+            contentType: app.globalData.contants.SHARE_TYPE.DETAILS_OF_THE_CONTENT, //内容类型 
+            title: this.data.contentInfo.headline, //标题
+            type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
+          }
 
-      this.generatePointObject(tentacleInfo);
+          this.generatePointObject(tentacleInfo);
+        }
+
+      }).finally(() => {
+      })
+     
     }
   },
   /**

src/subPackage/page/pages/myRelease/myRelease.js

@@ -53,8 +53,11 @@ wxService.page({
    */
   onShow() {
     const { memberId, member } = wx.getStorageSync('_baseUserInfo')
-    let time = Date.parse(new Date())
-    if (member && member.premiumExpireTime && member.premiumExpireTime > time) {
+    const premiumExpireTime = member && member.premiumExpireTime || ''
+    // ios 兼容 是不是plus vip
+    let currentEndTime = (new Date(premiumExpireTime.replace(/-/g, '/'))).getTime(); // 到期时间
+    let time = (new Date()).getTime(); 
+    if (member && member.premiumExpireTime && currentEndTime > time) {
       this.setData({
         plus: 1
       })

src/utils/wxService.js

@@ -918,13 +918,16 @@ class WXService extends Http {
 
   getCitysEnterty() {
     const citys = citysData
+    console.log('8888', citys)
     let list = {}
     if (this.citysEntertys) {
       list = this.citysEntertys
+      console.log('list',list)
     } else {
       for (const key in citys) {
         if (citys.hasOwnProperty(key)) {
           const element = citys[key]
+          console.log('element', element)
           handler2citys({
             city: element,
             result: { name: [], code: [] },
@@ -994,6 +997,8 @@ class WXService extends Http {
     return result
   }
 
+
+
 }
 
 const wxService = new WXService()