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

前端开发-罗建龙
2 parents 18d5182b d4670853
Showing 1 changed file with 1 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -2965,7 +2965,7 @@ Page({
  
     var order_prom_amount = 0;
     var order_prom_id = 0;
-    if (ord_prom) {
+    if (ord_prom && o_condition>0) {
       //么有使用券，或者活动没有限制使用优惠券
       if (coupon_price <= 0 || !ord_prom.is_xz_yh) {
         order_prom_id = ord_prom['id'];