Commit 4599ce51b28a4849149fcedda5cf3f8b6788521b
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
1 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -2965,7 +2965,7 @@ Page({ | @@ -2965,7 +2965,7 @@ Page({ | ||
| 2965 | 2965 | ||
| 2966 | var order_prom_amount = 0; | 2966 | var order_prom_amount = 0; |
| 2967 | var order_prom_id = 0; | 2967 | var order_prom_id = 0; |
| 2968 | - if (ord_prom) { | 2968 | + if (ord_prom && o_condition>0) { |
| 2969 | //么有使用券，或者活动没有限制使用优惠券 | 2969 | //么有使用券，或者活动没有限制使用优惠券 |
| 2970 | if (coupon_price <= 0 || !ord_prom.is_xz_yh) { | 2970 | if (coupon_price <= 0 || !ord_prom.is_xz_yh) { |
| 2971 | order_prom_id = ord_prom['id']; | 2971 | order_prom_id = ord_prom['id']; |