diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index e66c369..6b21bc1 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1480,6 +1480,22 @@ Page({ goods.is_integral_normal=1; goods.prom_type=0; goods.prom_id=0; + + //如果是指定门店，就要判断 + if (th.data.bn_goods.pick_group_ids) { + var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) { + return e.pickup_id == th.data.bn_pick; + }) + if (idx0 < 0) { + getApp().my_warnning(th.data.bn_goods.goods_name + "的门店不可售", 0, th); + th.data.is_summit_ing = 0; + th.setData({ + submit: 0 + }) + return false; + } + } + } if (getApp().globalData.skinface_id) { @@ -2242,11 +2258,6 @@ Page({ good.prom_id=0; good.discount_field=discount_field; - //把优惠券的使用还原 - th.setData({ - selected_quan_list: null, - using_quan: {} - }) }else{ good=ut.deep_cp(th.data.old_bn_goods); @@ -2263,9 +2274,6 @@ Page({ }) th.calculatePrice2() - if(!th.data.can_use_ord_prom[pickid]){ - th.get_buy_now_quan(); - } } diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 738d23d..1bb61cb 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -1590,6 +1590,22 @@ Page({ //如果有参与非实收的订单促销，那么就相当于是普通购买 if(th.data.can_use_ord_prom[th.data.bn_pick]){ goods.is_integral_normal=1; + //如果是指定门店，就要判断 + if (th.data.bn_goods.pick_group_ids) { + var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) { + return e.pickup_id == th.data.bn_pick; + }) + if (idx0 < 0) { + getApp().my_warnning(th.data.bn_goods.goods_name + "的门店不可售", 0, th); + th.data.is_summit_ing = 0; + th.setData({ + submit: 0 + }) + return false; + } + } + + } diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 76869ba..e7874ce 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1388,6 +1388,26 @@ Page({ //-- 如果初始活动在计算的时候，是不满足的时候，就要把活动清理掉 -- var is_no_ok=arr[k].show_can_cx[key_o].cur_act.is_no_ok; if(is_no_ok==1){ + + let temp_id=arr[k].show_can_cx[key_o].cur_act.prom_id; + switch (parseInt(arr[k].show_can_cx[key_o].cur_act.prom_type+'')){ + case 3: + var yhcx_act_map=th.data.yhcx_act_map?th.data.yhcx_act_map[temp_id]:null; + if(yhcx_act_map && !yhcx_act_map.is_order_yh){ + item1.is_no_order_yh=1; + } + break; + case 7: + var zhhe_act=th.data.zhhe_act_map?th.data.zhhe_act_map[temp_id]:null; + if(zhhe_act && !zhhe_act.is_orderyh){ + item1.is_no_order_yh=1; + } + break; + } + + debugger; + + item1.prom_id = 0; item1.prom_type = 0; @@ -3061,6 +3081,7 @@ Page({ } + //调用函数计算每件商品的单价 await th.calc_per(c_arr); @@ -3174,8 +3195,9 @@ Page({ //--------循环计算总价----------- for (var jc = 0; jc < item.length; jc++) { - - if (item[jc].prom_type == 0 && !item[jc].whsle_id) { //如果item的prom_type==0，没有如果活动的时候 + //如果item的prom_type==0，没有如果活动的时候,如果是优惠促销和组合促销不满足的时候 + //或者是组合购和阶梯购多出来的商品 + if (item[jc].prom_type == 0 && !item[jc].whsle_id && !item[jc].is_no_order_yh) { th.get_order_prom_map_ck(item[jc],pickid); } @@ -4983,9 +5005,9 @@ Page({ return false; } } + } - } if (th.data.bn_goods.whsle_id) { item.is_whsle = 1; diff --git a/packageE/pages/cart/cart2/ladder_calculate.js b/packageE/pages/cart/cart2/ladder_calculate.js index 6beb282..d0a066c 100644 --- a/packageE/pages/cart/cart2/ladder_calculate.js +++ b/packageE/pages/cart/cart2/ladder_calculate.js @@ -115,6 +115,11 @@ module.exports = { }) //goods[idx].goods_num -= num; let new_g = JSON.parse(JSON.stringify(goods[idx])); + + //多余的商品如果活动不参与订单促销，那么变成普通商品的也不能参与订单促销，2024-2-26 + if(!ladder_map.is_useorderyh){ + new_g.is_no_order_yh=1; + } new_g.goods_num = num; new_g.prom_type = 0; new_g.prom_id = 0; diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js index 3b89844..f240e6f 100644 --- a/packageE/pages/cart/cart2/zh_calculate.js +++ b/packageE/pages/cart/cart2/zh_calculate.js @@ -270,6 +270,11 @@ module.exports = { let new_g = JSON.parse(JSON.stringify(goods[idx])); if(new_g.more_cx) delete new_g.more_cx; + + //多余的商品如果活动不参与订单促销，那么变成普通商品的也不能参与订单促销，2024-2-26 + if(!act.is_orderyh){ + new_g.is_no_order_yh=1; + } new_g.goods_num = num; new_g.prom_type = 0; new_g.prom_id = 0; @@ -331,6 +336,11 @@ module.exports = { offline_price += item.goods_price - item.offline_price; offline_num += 1; } + + //多余的商品如果活动不参与订单促销，那么变成普通商品的也不能参与订单促销，2024-2-26 + if(!act.is_orderyh){ + item.is_no_order_yh=1; + } item.prom_type = 0; item.prom_id = 0; } diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index 587f162..7dad782 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -1343,6 +1343,22 @@ Page({ //如果有参与非实收的订单促销，那么就相当于是普通购买 if(th.data.can_use_ord_prom[th.data.bn_pick]){ goods.is_integral_normal=1; + + //如果是指定门店，就要判断 + if (th.data.bn_goods.pick_group_ids) { + var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) { + return e.pickup_id == th.data.bn_pick; + }) + if (idx0 < 0) { + getApp().my_warnning(th.data.bn_goods.goods_name + "的门店不可售", 0, th); + th.data.is_summit_ing = 0; + th.setData({ + submit: 0 + }) + return false; + } + } + } if(getApp().globalData.skinface_id){ diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 302324e..23d1d5c 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -1491,6 +1491,22 @@ Page({ //如果有参与非实收的订单促销，那么就相当于是普通购买 if(th.data.can_use_ord_prom[th.data.bn_pick]){ goods.is_integral_normal=1; + + //如果是指定门店，就要判断 + if (th.data.bn_goods.pick_group_ids) { + var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) { + return e.pickup_id == th.data.bn_pick; + }) + if (idx0 < 0) { + getApp().my_warnning(th.data.bn_goods.goods_name + "的门店不可售", 0, th); + th.data.is_summit_ing = 0; + th.setData({ + submit: 0 + }) + return false; + } + } + } if (getApp().globalData.skinface_id) { diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index 450cbbf..e55b4b3 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -541,7 +541,7 @@ Page({ ord_prom = res.data.data; //如果订单促销的取价不是实收，清空订单促销 - if(prom_ord && prom_ord.discount_field>0) prom_ord=null; + if(ord_prom && ord_prom.discount_field>0) ord_prom=null; } }) } diff --git a/utils/more_cx.js b/utils/more_cx.js index 05b3afe..e1f2e3c 100644 --- a/utils/more_cx.js +++ b/utils/more_cx.js @@ -36,6 +36,7 @@ module.exports = { } return 0; } + var goods =gdlist; var all_num=0; var need_to_buy=0;