订单促销，优惠券使用的优化

yvan.ni
1 parent ec472586
Showing 4 changed files with 42 additions and 1 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -2241,6 +2241,13 @@ Page({
       good.prom_type=0;
       good.prom_id=0;
       good.discount_field=discount_field;
+
+      //把优惠券的使用还原
+      th.setData({
+        selected_quan_list: null,
+        using_quan: {}
+      })
+
     }else{
       good=ut.deep_cp(th.data.old_bn_goods);
       param.goods_price=good.goods_price;
@@ -2255,6 +2262,10 @@ Page({
       mark:true
     })
     th.calculatePrice2()
+
+    if(!th.data.can_use_ord_prom[pickid]){
+      th.get_buy_now_quan();
+    }
   }
  
  
@@ -3332,6 +3332,12 @@ Page({
             good.integral=0;
             good.discount_field=discount_field;
  
+            //把优惠券的使用还原
+            th.setData({
+                selected_quan_list: null,
+                using_quan: {}
+            })
+
         }else{
             good=ut.deep_cp(th.data.old_bn_goods);
         }
@@ -3344,6 +3350,10 @@ Page({
             mark:true
         })
         th.calculatePrice2()
+
+        if(!th.data.can_use_ord_prom[pickid]){
+            th.get_buy_now_quan();
+        }
     }
  
  
@@ -4031,7 +4031,7 @@ Page({
     //---如果有选择优惠券的情况下---
     var quan_price = 0, bn_pick = th.data.bn_pick;
     var quan_no = null;
-    if (th.data.using_quan[bn_pick] != null && th.data.using_quan[bn_pick] != undefined)
+    if (th.data.using_quan && th.data.using_quan[bn_pick] != null && th.data.using_quan[bn_pick] != undefined)
       quan_no = th.data.using_quan[bn_pick].coupon_no;
  
     if (quan_no) {
@@ -9085,6 +9085,12 @@ Page({
         //-- 转成普通商品 ---
         good.prom_type=0;
         good.prom_id=0;
+
+        th.setData({
+          selected_quan_list: null,
+          using_quan:{}
+        })
+
     }else{
       good=ut.deep_cp(th.data.old_bn_goods);
     }
@@ -9097,6 +9103,10 @@ Page({
       mark:true
     })
     th.calculatePrice2()
+
+    if(!th.data.can_use_ord_prom[pickid]){
+      th.get_buy_now_quan();
+    }
   }
  
  
@@ -2407,6 +2407,12 @@ Page({
       good.prom_type=0;
       good.prom_id=0;
       good.discount_field=discount_field;
+
+      //把优惠券的使用还原
+      th.setData({
+        selected_quan_list: null,
+        using_quan: {}
+      })
     }else{
       good=ut.deep_cp(th.data.old_bn_goods);
     }
@@ -2419,6 +2425,10 @@ Page({
       mark:true
     })
     th.calculatePrice2()
+
+    if(!th.data.can_use_ord_prom[pickid]){
+      th.get_buy_now_quan();
+    }
   }