Commit f1a29054e4b5048ee23fbdf3918adb8a85b485ec
1 parent
f9782f73
秒杀修改
Showing
2 changed files
with
3 additions
and
3 deletions
pages/cart/cart2/cart2.js
@@ -779,10 +779,10 @@ Page({ | @@ -779,10 +779,10 @@ Page({ | ||
779 | } | 779 | } |
780 | } | 780 | } |
781 | 781 | ||
782 | - if(gg.prom_type){ | 782 | + |
783 | gd.prom_type=gg.prom_type; | 783 | gd.prom_type=gg.prom_type; |
784 | gd.prom_id=gg.prom_id; | 784 | gd.prom_id=gg.prom_id; |
785 | - } | 785 | + |
786 | switch (gd.prom_type) { | 786 | switch (gd.prom_type) { |
787 | case 0: | 787 | case 0: |
788 | case 2: | 788 | case 2: |
pages/goods/goodsInfo/goodsInfo.js
@@ -1399,7 +1399,7 @@ Page({ | @@ -1399,7 +1399,7 @@ Page({ | ||
1399 | add_cart_next(e, t, a, o, newd, CanOutQty) { | 1399 | add_cart_next(e, t, a, o, newd, CanOutQty) { |
1400 | var th = this, i = getApp().request; | 1400 | var th = this, i = getApp().request; |
1401 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ | 1401 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
1402 | - if (o.prom_type != 1 && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) { | 1402 | + if ((o.prom_type != 1 || o.prom_id<=0) && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) { |
1403 | var conf = th.data.bconfig; | 1403 | var conf = th.data.bconfig; |
1404 | if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { | 1404 | if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { |
1405 | var s_list = JSON.parse(conf.switch_list); | 1405 | var s_list = JSON.parse(conf.switch_list); |