Commit 8f28f3856085706f432ac7ebb9c3adcf9a81adfb
1 parent
c8412b4a
商品详情解决冲突
Showing
1 changed file
with
1 additions
and
5 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -3657,16 +3657,12 @@ Page({ | @@ -3657,16 +3657,12 @@ Page({ | ||
| 3657 | success: function (t) { | 3657 | success: function (t) { |
| 3658 | if (t.data.code == 0) { | 3658 | if (t.data.code == 0) { |
| 3659 | var g_buy_num = t.data.data.goodsbuynum; | 3659 | var g_buy_num = t.data.data.goodsbuynum; |
| 3660 | -<<<<<<< HEAD | ||
| 3661 | 3660 | ||
| 3662 | //如果是秒杀的时候 | 3661 | //如果是秒杀的时候 |
| 3663 | if(th.data.prom_type==0 && gd.prom_type == 1 ){ | 3662 | if(th.data.prom_type==0 && gd.prom_type == 1 ){ |
| 3664 | gd.prom_type= 0; | 3663 | gd.prom_type= 0; |
| 3665 | } | 3664 | } |
| 3666 | - | ||
| 3667 | -======= | ||
| 3668 | - | ||
| 3669 | ->>>>>>> dev_group | 3665 | + |
| 3670 | if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) { | 3666 | if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) { |
| 3671 | //----获取活动购买数---- | 3667 | //----获取活动购买数---- |
| 3672 | getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", { | 3668 | getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", { |