Merge branch 'dev' into 'test'

预售使用优惠券的问题 See merge request !801

Merge branch 'dev' into 'test'
预售使用优惠券的问题 See merge request !801
后端研发-苏明海
2 parents 52adf9d4 5ee78126
Showing 1 changed file with 8 additions and 7 deletions
packageC/pages/presell/cart/cart2.js
@@ -472,13 +472,7 @@ Page({
                         wx.showToast({title: "未找到商品", icon: 'none', duration: 3000});
                         return false;
                     }
-
-                    if(act.is_usecoupon==1){
-                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
-                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
-                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
-                    }
-
+                    
                     //这个位置要拿活动的预售价
                     t.data.data.shop_price = prelist.presell_money;
                     th.setData({
@@ -492,6 +486,13 @@ Page({
                         act:act
                     });
  
+                    if(act.is_usecoupon==1){
+                        th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
+                        th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
+                        th.data.check_quan_ware_list = t.data.data.erpwareid + "";
+                    }
+
+
                     //计算价格
                     th.calculatePrice2();
                     //获取优惠券,如果有券的钱，就调用