diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index ec06322..49fa4f2 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1441,6 +1441,28 @@ Page({ } } + //如果是立即购买的时候,item_j.promgoodsbuynum + if(carr[0].state==1 && item1.prom_type>0){ + item1.promgoodsbuynum=0; + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: { + store_id: oo.stoid, + user_id: getApp().globalData.user_id, + goods_id: item1.goods_id, + prom_type: item1.prom_type, + prom_id: item1.prom_id, + isnew:1 + }, + }).then(res => { + debugger + if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){ + item1.promgoodsbuynum = res.data.data.promgoodsbuynum; + } + }) + } + + + //要把优惠活动加入,prom_goods_map中,赠品不要运算,代发商品不算优惠 if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) { // th.check_is_youhui(item1.goods_id, item1.pick_id); diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js index 67160a6..8f63326 100644 --- a/packageE/pages/cart/cart2/zh_calculate.js +++ b/packageE/pages/cart/cart2/zh_calculate.js @@ -55,7 +55,7 @@ module.exports = { act_goos[j].num = item_j.goods_num; act_goos[j].goods_price = item_j.goods_price; var cart_num = item.cart_num = item_j.goods_num; - var zh_b_num = item_j.promgoodsbuynum; + var zh_b_num = item_j.promgoodsbuynum || 0; if (item.buyqty > 0) { var key = item.goods_id + "." + act.id; diff --git a/utils/more_cx.js b/utils/more_cx.js index e1f2e3c..89445fa 100644 --- a/utils/more_cx.js +++ b/utils/more_cx.js @@ -74,7 +74,7 @@ module.exports = { need_ck0=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0; } var min_can_buy0=0; - if(need_ck+item_act_map.buyed>=act.buy_limit){ + if(need_ck0+item_act_map.buyed>=act.buy_limit){ if(!need_ok) { item_act_map.is_no_ok = 1; }else{