Commit 2185135944b94a06e3679b5c4c65c2e1f89cb88a
1 parent
85e8740f
普通购买要用等级卡价
Showing
2 changed files
with
10 additions
and
3 deletions
pages/cart/cart2/cart2.js
... | ... | @@ -3196,10 +3196,17 @@ Page({ |
3196 | 3196 | } |
3197 | 3197 | |
3198 | 3198 | //积分购,先要带is_integral_normal=1 |
3199 | - if (gg.is_integral_normal) goods.is_integral_normal = 1; | |
3199 | + if (gg.is_integral_normal){ | |
3200 | + goods.is_integral_normal = 1; item.is_normal=1; | |
3201 | + } | |
3200 | 3202 | |
3201 | 3203 | //先要带is_pd_normal=1 |
3202 | - if (gg.is_pd_normal) goods.is_pd_normal = 1; | |
3204 | + if (gg.is_pd_normal){ | |
3205 | + goods.is_pd_normal = 1; item.is_normal=1; | |
3206 | + } | |
3207 | + | |
3208 | + | |
3209 | + | |
3203 | 3210 | |
3204 | 3211 | //如果不立即购买或者秒杀,如果是线下库存购买的时候 |
3205 | 3212 | if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2 && th.data.sales_rules == 2 && !th.data.bn_goods.whsle_id) { | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
... | ... | @@ -1769,7 +1769,7 @@ Page({ |
1769 | 1769 | add_cart_next(e, t, a, o, newd, CanOutQty) { |
1770 | 1770 | var th = this, i = getApp().request; |
1771 | 1771 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
1772 | - 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)) { | |
1772 | + if ((o.prom_type != 6 && o.prom_type != 4 && o.prom_type != 2 && o.prom_type != 1 ) || th.data.is_normal) { | |
1773 | 1773 | var conf = th.data.bconfig; |
1774 | 1774 | if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { |
1775 | 1775 | var s_list = JSON.parse(conf.switch_list); | ... | ... |