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

Fixbug zyw

See merge request !130

src/pages/confirmOrder/confirmOrder.js

 // pages/confirmOrder/confirmOrder.js
 const wxService = require('../../utils/wxService')
-const { memberId } = wx.getStorageSync('_baseUserInfo')
 
 wxService.page({
   /**
@@ -37,6 +36,7 @@ wxService.page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    const { memberId } = wx.getStorageSync('_baseUserInfo')
     // const { couponId, trolleySku2Buy } = this.options
 
     // let tradeDto = {
@@ -307,6 +307,7 @@ wxService.page({
   },
   // 获取地址列表
   getAddressList() {
+    const { memberId } = wx.getStorageSync('_baseUserInfo')
     wxService.post(`/member/addressManage/getall`, {
       userId: memberId
     }).then(res => {

src/pages/extendProduct/extendProduct.wxml

@@ -116,29 +116,29 @@
 			 wx:for-item="extendItem"
       
 			>
-        <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type={{extendItem.type}}&id={{extendItem.id}}" hover-class="none">
+        <navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type={{extendItem.tentacleContent.type}}&id={{extendItem.tentacleContent.id}}" hover-class="none">
           <view class="order-header">
             <view class="order-number">
-              <text>{{extendItem.createTime}}</text>
+              <text>{{extendItem.tentacleContent.createTime}}</text>
             </view>
             <text class="order-status">查看收益</text>
           </view>
-          <view class="pro-list" wx:if="{{extendItem.contentArr}}" >
-            <image class="pro-img"  wx:for="{{extendItem.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}"  wx:if="{{index<4}}"  src="{{contentItem.url}}" />
+          <view class="pro-list" wx:if="{{extendItem.tentacleContent.contentArr}}" >
+            <image class="pro-img"  wx:for="{{extendItem.tentacleContent.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}"  wx:if="{{index<4}}"  src="{{contentItem.url}}" />
             <!-- <image class="pro-img" />
             <image class="pro-img" />
             <image class="pro-img" /> -->
-            <text class="pro-img-dot" wx:if="{{extendItem.contentArr.length > 4}}">...</text>
+            <text class="pro-img-dot" wx:if="{{extendItem.tentacleContent.contentArr.length > 4}}">...</text>
           </view>
-          <view class="pro-list" wx:if="{{!extendItem.contentArr}}">
+          <view class="pro-list" wx:if="{{!extendItem.tentacleContent.contentArr}}">
             
             <!-- <image class="pro-img" />
             <image class="pro-img" />
             <image class="pro-img" /> -->
-            <text class="pro-img-dot">{{extendItem.content}}</text>
+            <text class="pro-img-dot">{{extendItem.tentacleContent.content}}</text>
           </view>
           <view class="pro-number">
-            <text class="total-pro">促成订单 <text class="help-order">5</text> 笔
+            <text class="total-pro">促成订单 <text class="help-order">{{extendItem.orders || 0}}</text> 笔
             </text>
           </view>
         </navigator>

src/pages/wantToBuyDetail/wantToBuyDetail.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "go-home": "/component/goHome/goHome",
     "card-modal": "/component/cardModal/cardModal",
-    "buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper"
+    "buy-image-swiper": "/component/buyImageSwiper/buyImageSwiper",
+    "x-html": "/component/html2wxml/wxHtml"
   }
 }
\ No newline at end of file

src/pages/wantToBuyDetail/wantToBuyDetail.wxml

 <view class='page-want-buy'>
 	<buy-image-swiper bind:updatePage="updatePage" image-data="{{contentInfo.shareShowPictureRESDTOList}}" />
 	<view class="buy-desc">
-		<view>{{contentInfo.describe}}</view>
+		<view> <x-html html="{{contentInfo.article}}" /></view>
 		<view class="share-wrap">
 			<view class="share-oprate" bindtap="gotoLike">
 				<image class="share-img" src="{{contentInfo.type ? '/assets/imgs/heart-primary.png'  : '/assets/imgs/heart-default.png'}}" />

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

@@ -28,6 +28,7 @@ wxService.page({
     this.getYesterdayInviteNumber()
     this.getInviteMemberList()
     this.getInviteBanner()
+    this.getIsInvite()
     wx.hideShareMenu()
   },
 
@@ -47,6 +48,19 @@ wxService.page({
     })
   },
 
+  // 判断是否可以邀请注册
+  getIsInvite(){
+    wxService.get(`/member/share/inviteFriends/buyer/checkShare`).then(res => {
+      const { result, data } = res.data
+      if (result == 0) {
+        this.setData({
+          isGoToInvite: data
+        })
+      }
+    }).finally(() => {
+    })
+  },
+
   // 获取昨日邀请人数
   getYesterdayInviteNumber() {
     // 昨天的时间
@@ -111,13 +125,13 @@ wxService.page({
             inviteBanner: data.gradientAwardPage
           }, () => {
           })
-          let now = new Date().getTime() 
-          let endTime = new Date(data.endTime).getTime() 
-          if (now < endTime){
-            this.setData({
-              isGoToInvite: true
-            })
-          }
+          // let now = new Date().getTime() 
+          // let endTime = new Date(data.endTime).getTime() 
+          // if (now < endTime){
+          //   this.setData({
+          //     isGoToInvite: true
+          //   })
+          // }
         }
       }
     })

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

@@ -13,7 +13,7 @@
   </view>
   <!-- <navigator url="/subPackage/page/pages/share/share" hover-class="none"> -->
     <view class="invite-banner" bindtap="gotoInviteShare">
-      <image src="{{!isGoToInvite ?  inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"  mode="widthFix"></image>
+      <image src="{{isGoToInvite ?  inviteBanner : '/assets/imgs/7_1_0/coming-soon.jpg'}}"  mode="widthFix"></image>
     </view>
   <!-- </navigator> -->
   <view class="order-benefit-wrap">

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

@@ -68,6 +68,7 @@ wxService.page({
 
   // 发布内容权限
   getContentPermission(){
+    const { memberId, member } = wx.getStorageSync('_baseUserInfo')
     wxService.post(`/merchant/contentMobileTerminal/getReleasePermissions`, {
       userId: memberId,
       plus:this.data.plus,
@@ -86,6 +87,7 @@ wxService.page({
 
   // banner
   getBannerInfo(){
+    const { memberId, member } = wx.getStorageSync('_baseUserInfo')
     wxService.post(`/merchant/contentMobileTerminal/getBannerAndInviteSum`, {
       userId: memberId
     }).then(res => {

src/subPackage/page/pages/myRelease/myRelease.wxml

@@ -10,7 +10,7 @@
 	</view>
 </view>
 <view class="diy-banner">
-	<image src="{{bannerUrl}}" />
+	<image src="{{bannerUrl ? bannerUrl : '/assets/imgs/7_1_0/coming-soon.jpg'}}" />
 </view>
 <button
  wx:if="{{!currentHasUserInfo}}"

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "x-dialog": "/component/dialog/dialog",
     "card-modal": "/component/cardModal/cardModal",
-    "go-home": "/component/goHome/goHome"
+    "go-home": "/component/goHome/goHome",
+    "x-html": "/component/html2wxml/wxHtml"
   }
 }
\ No newline at end of file

src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml

@@ -5,10 +5,9 @@
 	</view>
 	<view class="detail-content border_box">
 		<view class="detail-title">{{contentInfo.headline}}</view>
-		<view class="detail-desc">{{contentInfo.article}}</view>
+		<view class="detail-desc"><x-html html="{{contentInfo.article}}" /></view>
 		<view class="detail-bottom weui-flex df-j--bt">
 			<view class="bottom-collapse border_box"> 收起</view>
-
 		</view>
 	</view>
 	<view class="release-action">