Commit c9c50d19f2e9027b392ee8b4990b5e7dbedbd42a
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
1 changed file
with
1 additions
and
1 deletions
packageC/pages/presell/cart/cart2.js
| @@ -912,7 +912,7 @@ Page({ | @@ -912,7 +912,7 @@ Page({ | ||
| 912 | } | 912 | } |
| 913 | 913 | ||
| 914 | //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费---------- | 914 | //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费---------- |
| 915 | - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 && act.goods_type==0) { | 915 | + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 && th.data.act.goods_type==0) { |
| 916 | //看是不是有调用过包邮券 | 916 | //看是不是有调用过包邮券 |
| 917 | if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) { | 917 | if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) { |
| 918 | var condition = allpice - cut_price - quan_price; | 918 | var condition = allpice - cut_price - quan_price; |