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

season
2 parents 7ff7aa7f c9c50d19
Showing 1 changed file with 1 additions and 1 deletions
packageC/pages/presell/cart/cart2.js
@@ -912,7 +912,7 @@ Page({
                 }
  
                 //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费----------
-                if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 &&  act.goods_type==0) {
+                if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 &&  th.data.act.goods_type==0) {
                     //看是不是有调用过包邮券
                     if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) {
                         var condition = allpice - cut_price - quan_price;