Commit 9856a11160149949e3e7deb15a1f53ccbef3900f
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
2 additions
and
7 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -913,7 +913,7 @@ Page({ | @@ -913,7 +913,7 @@ Page({ | ||
| 913 | item1.is_post_temp=1; | 913 | item1.is_post_temp=1; |
| 914 | 914 | ||
| 915 | //如果是秒杀,团购的时候 | 915 | //如果是秒杀,团购的时候 |
| 916 | - if([1,2,6].indexOf(item1.prom_type)>-1){ | 916 | + if([1,2,3,6].indexOf(item1.prom_type)>-1){ |
| 917 | var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid | 917 | var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid |
| 918 | + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id; | 918 | + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id; |
| 919 | await app.request.promiseGet(url,{}).then(res=>{ | 919 | await app.request.promiseGet(url,{}).then(res=>{ |
| @@ -2882,12 +2882,7 @@ Page({ | @@ -2882,12 +2882,7 @@ Page({ | ||
| 2882 | }) | 2882 | }) |
| 2883 | } | 2883 | } |
| 2884 | 2884 | ||
| 2885 | - | ||
| 2886 | - | ||
| 2887 | - | ||
| 2888 | - | ||
| 2889 | - | ||
| 2890 | - | 2885 | + |
| 2891 | //-- 如果没有订单优惠，或者订单优惠中有勾选包邮模板 -- | 2886 | //-- 如果没有订单优惠，或者订单优惠中有勾选包邮模板 -- |
| 2892 | if (!ord_prom || ord_prom.is_post_temp) { | 2887 | if (!ord_prom || ord_prom.is_post_temp) { |
| 2893 | var user_addr = th.data.user_addr; | 2888 | var user_addr = th.data.user_addr; |