diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 646295d..8d2de1f 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -3196,10 +3196,17 @@ Page({ } //积分购,先要带is_integral_normal=1 - if (gg.is_integral_normal) goods.is_integral_normal = 1; + if (gg.is_integral_normal){ + goods.is_integral_normal = 1; item.is_normal=1; + } //先要带is_pd_normal=1 - if (gg.is_pd_normal) goods.is_pd_normal = 1; + if (gg.is_pd_normal){ + goods.is_pd_normal = 1; item.is_normal=1; + } + + + //如果不立即购买或者秒杀,如果是线下库存购买的时候 if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2 && th.data.sales_rules == 2 && !th.data.bn_goods.whsle_id) { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 520bc55..4238887 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1769,7 +1769,7 @@ Page({ add_cart_next(e, t, a, o, newd, CanOutQty) { var th = this, i = getApp().request; //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ - if ((o.prom_type != 1 || o.prom_id <= 0) && ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 ) || th.data.is_normal)) { + if ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 && o.prom_type != 1 ) || th.data.is_normal) { var conf = th.data.bconfig; if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { var s_list = JSON.parse(conf.switch_list);