Merge branch 'bug修复/产品详情补丁合并收藏夹分支和定制项分支修复未选中全部选项可以加入购物车的问题' into 德莱宝测试除了手机登录不合并

# Conflicts:
#	packageA/market/detail.wxml
#	utils/Http.js

packageA/market/detail.js

@@ -13,6 +13,8 @@ import currency from "../../utils/currency";
 
 Page({
 	data: {
+		itemCount: 0,
+		selectCount: 0,
 		labelList: getLabelList(),
 		hidePrice: wx.getStorageSync('hidePrice'),
 		badge: getApp().globalData.collectCount,
@@ -73,7 +75,8 @@ Page({
 				cheekRows: res.data.cheekRows,
 				materialRows: res.data.materialRows,
 				colorRows: res.data.colorRows,
-				loading: false
+				loading: false,
+				itemCount: ['specRows', 'cheekRows', 'materialRows', 'colorRows'].filter(v => res.data[v].length).length
 			});
 			//是否定制
 			if (init && item.iscustomsize == 1) this.selectComponent("#customMade").init(item);
@@ -139,6 +142,10 @@ Page({
 			mask: true
 		})
 		content[valuename] = (content[valuename] == value.parm) ? "" : value.parm;
+		console.log(content)
+		this.setData({
+			selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length
+		})
 		this.getDetail(valuename == "spec")
 	},
 

packageA/market/detail.scss

@@ -229,4 +229,20 @@ swiper {
     color: #3874F6;
     margin-bottom: 20rpx;
   }
+}
+
+.submit {
+  height: 104rpx !important;
+  border: none !important;
+  border-radius: 0 !important;
+  color: #fff !important;
+  width: 240rpx !important;
+}
+
+.bg-blue {
+  background-color: var(--blue) !important;
+}
+
+.bg-orange {
+  background-color: #F37B1D !important;
 }

packageA/market/detail.wxml

@@ -69,6 +69,14 @@
             <navigator url="#" class="product {{content.spec===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{specRows}}" wx:key="index" bindtap="changeItemno" data-valuename="spec" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
         </view>
     </block>
+    <!-- 定制项 -->
+    <view wx:if="{{detail.iscustomsize==1}}" style="padding-bottom: 20rpx;">
+        <customMade id="customMade">
+            <view slot='head' class="label">
+                {{labelList.custom}}
+            </view>
+        </customMade>
+    </view>
 
     <block wx:if="{{detail.canuseactivity.length}}">
         <view class="label" style="border: none;">
@@ -79,7 +87,6 @@
         </navigator>
         <view style="height: 1rpx;" />
     </block>
-
     <!-- 定制项 -->
     <customMade id="customMade">
         <view slot='head' class="label">
@@ -125,10 +132,10 @@
         </view>
         收藏夹
     </navigator>
-    <view class="bg-blue submit" id='addToFavorites' bindtap="clickBut">{{detail.iscollection?'取消收藏商品':'加入收藏夹'}}</view>
-    <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' range-key='tradefield' bindchange='storage'>
-        <view class="bg-orange submit" id='addToShoppingCart' bindtap="clickBut">加入购物车</view>
+    <van-button custom-class="bg-blue submit" id='addToFavorites' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">{{detail.iscollection?'取消收藏商品':'加入收藏夹'}}</van-button>
+    <picker wx:if="{{detail.tradefield.length>=2}}" range='{{detail.tradefield}}' disabled='{{itemCount!=selectCount}}' range-key='tradefield' bindchange='storage'>
+        <van-button custom-class="bg-orange submit" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
     </picker>
-    <view wx:else class="bg-orange submit" id='addToShoppingCart' bindtap="clickBut">加入购物车</view>
+    <van-button wx:else custom-class="bg-orange submit" id='addToShoppingCart' disabled='{{itemCount!=selectCount}}' bind:click="clickBut">加入购物车</van-button>
 </view>
 <wxs src="/utils/hidePrice.wxs" module="handleHide" />