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

Fixbug zyw

See merge request !121

src/component/plus/plus.wxml

 <!--component/plus/plus.wxml-->
+<wxs src="../../wxs/utils.wxs" module="utils" />
+
 <view class="plus-wrap" wx:if="{{skuVOList}}">
 	<scroll-view scroll-x class="scroll-view_H" scroll-with-animation="{{true}}">
 		<block
@@ -17,10 +19,11 @@
        data-price="{{navItem.price}}"
 			 bindtap="switchNav"
 			 style="{{currentTab == idx ? 'background-image: url('+ plusBgi.activeUrl +');' : 'background-image: url('+ plusBgi.inactiveUrl +');'}}"
+       wx:if="{{navItem.valid}}"
 			>
 				<view class="plus-choose">
-          <text wx:if="{{navItem.duration == 365}}">每月仅￥{{navItem.price / 12}}</text>
-				  <text wx:else>每月仅￥{{navItem.price / navItem.duration * 30}}</text>
+          <text wx:if="{{navItem.duration == 365}}">每月仅￥{{utils.numberFormat(navItem.price / 12)}}</text>
+				  <text wx:else>每月仅￥{{utils.numberFormat(navItem.price / navItem.duration * 30)}}</text>
 				</view>
 				<view class="card-kinds">
 					{{navItem.name}}

src/component/scrollDel/scrollDel.wxml

@@ -7,7 +7,7 @@
            <icon size="16" type="{{item.checked ? 'success' : 'circle'}}" color="{{checkedColor}}" data-index="{{index}}" catchtap="checkPro"></icon>
         </view>
         <view class="pro-info">
-           <image class="pro-img" src="/assets/imgs/7_1_0/icon.png" mode="widthFix"></image>
+           <image class="pro-img" src="{{item.skuImgUrl}}" mode="widthFix"></image>
            <view class="pro-right-info">
               <view class="pro-name">{{item.productName}}</view>
               <view class="pro-sku">{{item.skuSpec}}</view>

src/pages/cart/cart.js

@@ -190,6 +190,7 @@ wxService.page({
   setTotalFee(skipRedemption) {
     var cartList = this.data.cartList
     var checkProsId = [] // 选中的商品id
+    console.log(cartList)
     
     var totalFee = 0
     // 购物车总金额

src/pages/cart/cart.wxml

 <!--pages/cart/cart.wxml-->
 <view class="page-cart" style="padding-bottom:{{currentHeight + 88}}px">
-	<view class="open-card">
+	<!-- <view class="open-card">
 		<view class="vip-desc">
 			<image class="plus-img" src="/assets/imgs/7_1_0/plus-icon.png" mode="widthFix" />
 			<text class="vip-info">VIP尊享N大权益，本单立减</text>
@@ -10,7 +10,7 @@
 			<text>去开卡</text>
 			<image class="arrow-right" mode="widthFix" src="/assets/imgs/7_1_0/small-arrow-right.png" />
 		</view>
-	</view>
+	</view> -->
 	<view class="cart-content" wx:if="{{cartList.length}}">
 		<!-- 购物车列表 -->
 		<scroll-del

src/pages/extendProduct/extendProduct.js

@@ -260,7 +260,7 @@ wxService.page({
     wxService.get(`/merchant/share/productSectionBonus/buyer/query`).then(res => {
       if (res) {
         const { result, data } = res.data
-        if (result == 0) {
+        if (result == 0 && data) {
           this.setData({
             extendProBanner: data.backgroundImgUrl
           }, () => {
@@ -339,7 +339,6 @@ wxService.page({
   onShareAppMessage: function (res) {
     console.log(res)
     if (res.from != 'menu') {
-      console.log('1111111')
       let id = Integer.digit(this.data.currentShareContent.id, 10, 64);
       let tentacleId = Integer.digit(this.data.currentShareContent.tentacleId, 10, 64);
       var path = 'subPackage/page/pages/friendShareList/friendShareList?i=' + id + '&t=' + tentacleId;
@@ -349,23 +348,31 @@ wxService.page({
         path: path,
         imageUrl: this.data.proData[0].productImgUrl, // 可以更换分享的图片
       }
-    }
-
-    let tentacleInfo = {
-      content: '推广商品',
-      title: '推广商品',
-      contentType: app.globalData.contants.SHARE_TYPE.PRODUCTS_PROMOTION,
-      type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
-    };
-    wxService.getTentacleContent(tentacleInfo).then(res => {
-      if (res && res.tentacleId) {
-        let tentacleId = Integer.digit(res.tentacleId, 10, 64);
-        var path = `pages/extendProduct/extendProduct?t=${tentacleId}`;
-        return {
-          path: path
+    }else{
+      var path = ''
+      let tentacleInfo = {
+        content: '推广商品',
+        title: '推广商品',
+        contentType: app.globalData.contants.SHARE_TYPE.PRODUCTS_PROMOTION,
+        type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
+      };
+      wxService.getTentacleContent(tentacleInfo).then(res => {
+        if (res && res.tentacleId) {
+          let tentacleId = Integer.digit(res.tentacleId, 10, 64);
+          path = `pages/extendProduct/extendProduct?t=${tentacleId}`;
+          console.log('222')
+          console.log('-------------', path)
+          return {
+            path: path,
+            imageUrl: this.data.extendProList[0].productImgUrl,
+          }
         }
-      }
-    });
+      });
+      
+     
+     
+      
+    }
    
   }
 })
\ No newline at end of file