Merge refs/heads/商城唯一解锁 into refs/heads/测试

packageA/market/detail.js

@@ -111,9 +111,14 @@ Page({
 				selectCount: ['cheek', 'color', 'material', 'spec'].filter(v => content[v].length).length,
 				UniqueLine
 			});
-			console.log("itmes", this.data.itmes)
 			//是否定制
-			if (getCustom && item.iscustomsize == 1) this.selectComponent("#customMade").init(item);
+			if (item.iscustomsize == 1 && content.spec == "custom") {
+				if (getCustom) this.selectComponent("#customMade").init(item);
+			} else {
+				this.selectComponent("#customMade").setData({
+					list: []
+				});
+			}
 		})
 	},
 	/* 预览媒体 */

packageA/market/detail.wxml

@@ -42,7 +42,12 @@
             </view>
             <view class="product-box">
                 <block wx:for="{{row[it.value+'Rows']}}" wx:key="index">
-                    <navigator v-if="{{it.isonlydisplay == 0 && item.parm}}" url="#" class="product {{content[it.value] === item.parm ? 'active' :''}} {{item.flag ? '' : 'disabled'}}" bindtap="changeItemno" data-valuename="{{it.value}}" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
+                    <block wx:if="{{it.isonlydisplay == 1}}">
+                        <navigator wx:if="{{item.flag}}" url="#" class="product {{content[it.value] === item.parm ? 'active' :''}}" bindtap="changeItemno" data-valuename="{{it.value}}" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
+                    </block>
+                    <block wx:else>
+                        <navigator url="#" class="product {{content[it.value] === item.parm ? 'active' :''}} {{item.flag ? '' : 'disabled'}}" bindtap="changeItemno" data-valuename="{{it.value}}" data-value="{{item}}">{{item.parm=='custom'?'自定义':item.parm}}</navigator>
+                    </block>
                 </block>
             </view>
         </block>
@@ -55,7 +60,7 @@
             </view>
         </customMade>
     </view>
-    
+
     <view class="label">
         数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}}，包装量:{{detail.packageqty}})</text>
     </view>