Commit b34056d574d4ff4a445abc77537030c2afd437d9

Authored by yvan.ni
1 parent f3299e1a

必须的商品赠品优化

packageE/pages/cart/cart2/cart2.js
@@ -6620,7 +6620,7 @@ Page({ @@ -6620,7 +6620,7 @@ Page({
6620 if (a_limit_num >= t_zp_num && a_stock_num >= t_zp_num) { 6620 if (a_limit_num >= t_zp_num && a_stock_num >= t_zp_num) {
6621 send_gf[pickid].push({ 6621 send_gf[pickid].push({
6622 pickup_id: pickid, giftsinfo: get_data.giftsinfo, zp_num: get_data.zp_num * get_data.bs, 6622 pickup_id: pickid, giftsinfo: get_data.giftsinfo, zp_num: get_data.zp_num * get_data.bs,
6623 - gf_pr_name: prom.name, prom_id: prom.prom_id 6623 + gf_pr_name: prom.name, prom_id: prom.prom_id,bs:get_data.bs
6624 }); 6624 });
6625 } 6625 }
6626 th.setData({ send_gf: send_gf }); 6626 th.setData({ send_gf: send_gf });
packageE/pages/cart/cart2/cart2.wxml
@@ -1066,8 +1066,7 @@ @@ -1066,8 +1066,7 @@
1066 {{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view> 1066 {{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view>
1067 <view wx:else>规格1</view> 1067 <view wx:else>规格1</view>
1068 </view> 1068 </view>
1069 - <text class="c-red" wx:if="{{items.must_num>0 && items.limit_num>0 && items.must_num>items.can_num}}">(超量不足)</text>  
1070 - <text class="c-red" wx:elif="{{items.must_num>0}}">必选{{items.must_num}}件</text> 1069 + <text class="c-red" wx:if="{{items.must_num>0}}">必选{{items.must_num*gf_bs}}件</text>
1071 1070
1072 </view> 1071 </view>
1073 1072