Merge branch '增加包装数量' into 楚楚/2.5.0

packageA/activity/selectProduct/cart/index.wxml

@@ -29,7 +29,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
 				</view>
 				<van-stepper value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>

packageA/activity/selectProduct/index.wxml

@@ -1,7 +1,7 @@
 <van-search class="search" value="{{ params.content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' />
 <custom id="Custom" isOldPrice='{{true}}' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
-	<navigator url="#" wx:for="{{list}}" wx:key="itemid" class="item-box">
+	<navigator url="#" wx:for="{{list}}" wx:key="sa_promotion_itemsid" class="item-box">
 		<view class="top" bindtap="changeResults" data-id="{{item[idname]}}" data-item="{{item}}" bindtap="{{item.groupqty!=0 && item.maxQty<=0?'':'changeResult'}}">
 			<view class="image">
 				<van-image width="100%" height="100%" fit="cover" src="{{item.attinfos[0].subfiles[0].url||item.attinfos[0].url||item.cover||123123}}" use-loading-slot use-error-slot lazy-load>
@@ -12,7 +12,7 @@
 			<view class="content">
 				<view class="title">
 					<text class="line-1">{{item.itemname}}</text>
-					<van-checkbox wx:if="{{!(item.groupqty!=0 && item.maxQty<=0)}}" custom-class="iconfont" shape='square' icon-size='24rpx' value="{{ decide.checked(item.itemid,result) }}" />
+					<van-checkbox wx:if="{{!(item.groupqty!=0 && item.maxQty<=0)}}" custom-class="iconfont" shape='square' icon-size='24rpx' value="{{ decide.checked(item.sa_promotion_itemsid,result) }}" />
 				</view>
 				<view class="exp">编号：{{item.itemno}}</view>
 				<view class="exp">规格：{{item.standards ||" --"}}</view>
@@ -24,7 +24,7 @@
 				</view>
 				<view class="exp">特征码：{{item.signaturecode ||" --"}}</view>
 				<view class="exp">
-					包装数量：{{item.packageqty}} ({{item.unitname}})
+					包装数量：{{item.packageqty}} ({{item.unit || item.unitname}})
 				</view>
 				<view class="exp">可购数量：{{item.groupqty==0?'不限购':(item.groupqty-item.saledqty)<=0?'已售罄':item.maxQty}} </view>
 				</view>

packageA/favorites/index.wxml

@@ -28,7 +28,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
 				</view>
 				<van-stepper value="{{ item.favoritesqty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>

pages/index/collect/index.wxml

@@ -28,7 +28,7 @@
 			</view>
 			<view class="bottom">
 				<view class="check label-class">
-					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}
+					起订量:{{item.orderminqty}}，增减量:{{item.orderaddqty}}，包装数量:{{item.packageqty}}
 				</view>
 				<van-stepper button-size='{{32}}' value="{{ item.qty }}" min="{{item.orderminqty}}" step="{{item.orderaddqty||1}}" input-class='input-class' data-index="{{index}}" bind:minus='stepperChange' bind:plus='stepperChange' bind:blur='inputBlur' />
 			</view>