Commit b8384a981b32a32927e45bdc8fc6b20498b3ca04
Merge branch 'dev' into 'test'
商品详细 See merge request !923
Showing
1 changed file
with
10 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -3704,7 +3704,16 @@ Page({ |
| 3704 | 3704 | //如果是秒杀的时候 |
| 3705 | 3705 | if(th.data.prom_type==0 && gd.prom_type == 1 ){ |
| 3706 | 3706 | gd.prom_type= 0; |
| 3707 | - } | |
| 3707 | + } | |
| 3708 | + //如果全场优惠，商品做了秒杀 | |
| 3709 | + if(th.data.prom_type==3 && gd.prom_type == 1 ){ | |
| 3710 | + gd.prom_type= 0; | |
| 3711 | + } | |
| 3712 | + //如果全场阶梯优惠，商品做了秒杀 | |
| 3713 | + if(th.data.prom_type==10 && gd.prom_type == 1 ){ | |
| 3714 | + gd.prom_type= 0; | |
| 3715 | + } | |
| 3716 | + | |
| 3708 | 3717 | |
| 3709 | 3718 | if (!th.data.is_normal && ( gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6)) { |
| 3710 | 3719 | //----获取活动购买数---- | ... | ... |