Merge branch 'dev_pay_select' into dev

WXD-SEASON\season
2 parents ee0f50ba 46547ce6
Showing 1 changed file with 8 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -3885,7 +3885,7 @@ Page({
     var coupon_price = quan_price; //优惠券优惠了多少钱
     if (order_m < 0) {
       order_m = 0;
-      coupon_price = parseFloat(order_m).toFixed(2);
+      coupon_price = parseFloat(allpice - cut_price).toFixed(2);
     }
     //--看一下有没有订单优惠--
     var o_condition = parseFloat(order_m);
@@ -5325,6 +5325,13 @@ Page({
               th.setData({
                 submit: 0,
               })
+              if(data.code==-2){
+                 setTimeout(()=>{
+                   getApp().re_to('/pages/user/order_list/order_list')
+                 },1300)
+
+              }
+
             }