From b34056d574d4ff4a445abc77537030c2afd437d9 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 29 Aug 2023 18:14:52 +0800
Subject: [PATCH] 必须的商品赠品优化

---
 packageE/pages/cart/cart2/cart2.js   | 2 +-
 packageE/pages/cart/cart2/cart2.wxml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 5f51b0f..f6f64ba 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -6620,7 +6620,7 @@ Page({
           if (a_limit_num >= t_zp_num && a_stock_num >= t_zp_num) {
             send_gf[pickid].push({
               pickup_id: pickid, giftsinfo: get_data.giftsinfo, zp_num: get_data.zp_num * get_data.bs,
-              gf_pr_name: prom.name, prom_id: prom.prom_id
+              gf_pr_name: prom.name, prom_id: prom.prom_id,bs:get_data.bs
             });
           }
           th.setData({ send_gf: send_gf });
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 98f06f7..ec499ea 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -1066,8 +1066,7 @@
               {{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view>
             <view wx:else>规格1</view>
           </view>
-          <text class="c-red" wx:if="{{items.must_num>0 && items.limit_num>0 && items.must_num>items.can_num}}">(超量不足)</text>
-          <text class="c-red" wx:elif="{{items.must_num>0}}">必选{{items.must_num}}件</text>
+          <text class="c-red" wx:if="{{items.must_num>0}}">必选{{items.must_num*gf_bs}}件</text>
 
         </view>
 
--
libgit2 0.21.4