Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !112

src/pages/extendProduct/extendProduct.js

@@ -226,6 +226,7 @@ wxService.page({
             //     item.contentArr = content
             //   }
             // }
+            wxService.getContentByContentType(item)  
           })
           this.setData({
             myExtendList: this.data.pageNum == 1 ? [...data.content] : [...this.data.myExtendList, ...data.content],

src/subPackage/page/pages/myInvite/myInvite.js

@@ -16,7 +16,8 @@ wxService.page({
     pageNo: 1,
     pageSize: 50,
     inviteMemberList: [],
-    inviteBanner: ''
+    inviteBanner: '',
+    isGoToInvite: false
   },
 
   /**
@@ -78,8 +79,8 @@ wxService.page({
   // 邀请会员列表
   getInviteMemberList(){
     let params = {
-      // userId: memberId,
-      // tentacleType: 3
+      userId: memberId,
+      tentacleType: 3
     }
     wx.showLoading({
       title: '加载中',
@@ -110,11 +111,25 @@ wxService.page({
             inviteBanner: data.gradientAwardPage
           }, () => {
           })
+          let now = new Date().getTime() 
+          let endTime = new Date(data.endTime).getTime() 
+          if (now < endTime){
+            this.setData({
+              isGoToInvite: true
+            })
+          }
         }
       }
     })
   },
 
+  // 点击去分享页面
+  gotoInviteShare(){
+    if (this.data.inviteMemberList && this.data.isGoToInvite){
+      wxService.router('/subPackage/page/pages/share/share')
+    }
+  },
+
   /**
    * 生命周期函数--监听页面隐藏
    */

src/subPackage/page/pages/myInvite/myInvite.wxml

@@ -11,11 +11,11 @@
         <view class="share-title">昨日邀请新增</view>
       </view>
   </view>
-  <navigator url="/subPackage/page/pages/share/share" hover-class="none">
-    <view class="invite-banner">
-      <image src="{{inviteBanner}}"></image>
+  <!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
+    <view class="invite-banner" bindtap="gotoInviteShare">
+      <image src="{{inviteMemberList && isGoToInvite ?  inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"></image>
     </view>
-  </navigator>
+  <!-- </navigator> -->
   <view class="order-benefit-wrap">
     <view class="order-benefit-list" wx:for="{{inviteMemberList}}" wx:key="{{index}}">
     <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type=10" hover-class="none">

src/subPackage/page/pages/myInvite/myInvite.wxss

@@ -34,7 +34,7 @@
   width: 712rpx;
   height: 298rpx;
   border-radius: 17rpx;
-  background-color: rgba(216, 216, 216, 1);
+  /* background-color: rgba(216, 216, 216, 1); */
   box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
 }
 .order-benefit-wrap{

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

@@ -46,7 +46,9 @@ wxService.page({
   // 发布内容权限
   getContentPermission(){
     wxService.post(`/merchant/contentMobileTerminal/getReleasePermissions`, {
-      userId: memberId
+      userId: memberId,
+      plus: 0,
+      level: 0
     }).then(res => {
       if (!res) return false
       const { result, data } = res.data

src/utils/wxService.js

@@ -289,7 +289,37 @@ class WXService extends Http {
 
     })
   }
-
+  //根据页面类型判断content取值
+  getContentByContentType(item){
+    //1,2,3,8,9,10,11 页面  取页面标题
+    if (item.contentType == 1 || item.contentType == 2 || item.contentType == 3 || item.contentType == 8 || item.contentType == 9  || item.contentType == 10 || item.contentType == 11 ){
+      item.content = item.content
+    }
+    // 详情
+    if (item.contentType == 4 || item.contentType == 6 ){
+      let content = JSON.parse(item.content)
+      item.contentArr = [content]
+    }
+    // 内容列表
+    if (item.contentType == 5){
+      if (item.contentId){
+        let content = JSON.parse(item.content)
+        item.contentArr = [content]
+      }else{
+        item.content = item.content
+      }
+    }
+    // 推广列表
+    if (item.contentType == 7) {
+      if (item.contentId) {
+        let content = JSON.parse(item.content)
+        item.contentArr = content
+      } else {
+        item.content = item.content
+      }
+    }
+  }
+  
   //更新本地触点对象信息
   updateLocalTentacleInfo() {
     //先获取本地触点对象信息