Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

前端开发-罗建龙
2 parents 193a388a b242840b
Showing 1 changed file with 2 additions and 7 deletions
packageE/pages/cart/cart2/cart2.js
@@ -913,7 +913,7 @@ Page({
       item1.is_post_temp=1;
  
       //如果是秒杀,团购的时候
-      if([1,2,6].indexOf(item1.prom_type)>-1){
+      if([1,2,3,6].indexOf(item1.prom_type)>-1){
         var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
             + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
         await app.request.promiseGet(url,{}).then(res=>{
@@ -2882,12 +2882,7 @@ Page({
           })
         }
  
-
-
-
-
-
-
+        
         //-- 如果没有订单优惠，或者订单优惠中有勾选包邮模板 --
         if (!ord_prom || ord_prom.is_post_temp) {
           var user_addr = th.data.user_addr;