Merge branch '商城唯一解锁' into 测试

packageA/activity/selectProduct/index.js

@@ -84,7 +84,6 @@ Page({
         "content": {
           sa_promotionid: this.data.params.content.sa_promotionid,
           items: this.data.resultList.map(v => {
-            console.log(v)
             return {
               "sa_brandid": this.data.params.content.sa_brandid,
               "sa_promotionid": this.data.params.content.sa_promotionid,

packageA/market/detail.js

@@ -2,10 +2,6 @@ const _Http = getApp().globalData.http;
 let sa_brandid = null,
 	sys_enterpriseid = null;
 
-import {
-	getLabelList
-} from "../../utils/customItemType";
-
 import {
 	fileList
 } from "../../utils/FormatTheAttachment";
@@ -15,7 +11,6 @@ Page({
 	data: {
 		itemCount: 0,
 		selectCount: 0,
-		labelList: getLabelList(),
 		hidePrice: wx.getStorageSync('hidePrice'),
 		badge: getApp().globalData.collectCount,
 		favoriteCount: getApp().globalData.favoriteCount,
@@ -27,6 +22,7 @@ Page({
 			material: "", //材质
 			cheek: "" //边框
 		},
+		itmes: [],
 		detail: {
 			spec: ""
 		},
@@ -82,7 +78,7 @@ Page({
 			item.gradeprice = CNY(item.gradeprice);
 			item.marketprice = CNY(item.marketprice);
 			item.qty = item.orderaddqty;
-			let ros = {
+			let row = {
 				specRows: res.data.specRows.reverse(),
 				cheekRows: res.data.cheekRows,
 				materialRows: res.data.materialRows,
@@ -92,7 +88,7 @@ Page({
 			let obj = {},
 				auto = true,
 				UniqueLine = true;
-			['spec', 'cheek', 'material', 'color'].forEach(key => obj[key] = ros[key + 'Rows'].filter(v => v.flag))
+			res.data.customschemeItems.map(v => v.value).forEach(key => obj[key] = row[key + 'Rows'].filter(v => v.flag))
 			for (const key in obj) {
 				if (obj[key].length > 1) {
 					auto = false
@@ -104,15 +100,18 @@ Page({
 					if (obj[key].length) content[key] = obj[key][0].parm;
 				}
 			}
+
 			this.setData({
 				content,
 				detail: item,
-				...ros,
+				row,
+				customschemeItems: res.data.customschemeItems,
 				loading: false,
 				itemCount: ['specRows', 'cheekRows', 'materialRows', 'colorRows'].filter(v => res.data[v].length).length,
 				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);
 		})

packageA/market/detail.wxml

@@ -34,42 +34,18 @@
         <text>包装数量:{{detail.packageqty||' --'}}</text>
     </view>
 </view>
-<!-- 选择规格 -->
 <view class="model">
-    <block wx:if="{{materialRows.length}}">
-        <view class="label">
-            {{labelList.material}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.material===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{materialRows}}" wx:key="index" bindtap="changeItemno" data-valuename="material" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{colorRows.length}}">
-        <view class="label">
-            {{labelList.color}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.color===item.parm?'active':''}} {{item.flag?'':'disabled'}}" wx:for="{{colorRows}}" wx:key="index" bindtap="changeItemno" data-valuename="color" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{cheekRows.length}}">
-        <view class="label">
-            {{labelList.cheek}}
-        </view>
-        <view class="product-box">
-            <navigator url="#" class="product {{content.cheek===item.parm?'active':''}}  {{item.flag?'':'disabled'}}" wx:for="{{cheekRows}}" wx:key="index" bindtap="changeItemno" data-valuename="cheek" data-value="{{item}}">{{item.parm}}</navigator>
-        </view>
-    </block>
-
-    <block wx:if="{{specRows.length}}">
-        <view class="label">
-            {{labelList.spec}}
-        </view>
-        <view class="product-box">
-            <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 wx:for="{{customschemeItems}}" wx:key="value" wx:for-item="it">
+        <block wx:if="{{row[it.value+'Rows'].length}}">
+            <view class="label">
+                {{it.description}}
+            </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>
+            </view>
+        </block>
     </block>
     <!-- 定制项 -->
     <view wx:if="{{detail.iscustomsize==1}}" style="padding-bottom: 20rpx;">
@@ -79,13 +55,13 @@
             </view>
         </customMade>
     </view>
+    
     <view class="label">
         数量 <text style="font-size: 24rpx;font-weight: 400;">(起订量:{{detail.orderminqty}}，增减量:{{detail.orderaddqty}}，包装量:{{detail.packageqty}})</text>
     </view>
     <view class="product-box" style="margin-top: 20rpx;">
         <van-stepper value="{{ detail.qty }}" min="{{detail.orderminqty}}" step="{{detail.orderaddqty||1}}" input-class='input-class' data-iscatch="catch" catch:minus='stepperChange' catch:plus='stepperChange' catch:blur='inputBlur' />
     </view>
-
     <block wx:if="{{detail.canuseactivity.length}}">
         <view class="label" style="border: none;">
             此商品正在促销