diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index bf16dac..82ba04d 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -2231,6 +2231,13 @@ Page({ if (kitem.act.is_orderyh) o_price_no_zh -= kitem.cut_price; } + }else{ + //找到那些可以订单优惠叠加的 + for (let ij in zh_prom_goods) { + let kitem_z = zh_prom_goods[ij]; + if (!kitem_z.act.is_orderyh) + no_order_yh+=kitem_z.actual_price; + } } } @@ -2244,6 +2251,13 @@ Page({ if (th.data.ladder_map[ij].is_useorderyh) o_price_no_zh -= kitem.cut_price; } + }else{ + //找到那些可以订单优惠叠加的不参与的要减掉 + for (let ij in ladder_prom_goods) { + let kitem_l = ladder_prom_goods[ij]; + if (!th.data.ladder_map[ij].is_useorderyh) + no_order_yh+=kitem_l.actual_price; + } } } @@ -2270,8 +2284,10 @@ Page({ var ord_prom_condition=0; + + //如果有组合购 if(o_price_no_zh){ - ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num; + ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num- no_order_yh; }else{ ord_prom_condition=o_price - quan_price - whsle_goods_price - no_order_yh; }