预售切换包邮券和优惠券时的bug

yvan.ni
1 parent c9f02dcc
Showing 2 changed files with 22 additions and 10 deletions
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart.wxml
@@ -655,8 +655,12 @@ Page({
                     }
                 })
             }else{
-                var txt="using_quan["+bn_pick+"]";
-                th.setData({[txt]:{}});
+                th.setData({quan_price:0});
+                if(th.data.using_quan[bn_pick].isby==1){
+                    var txt="using_quan["+bn_pick+"]";
+                    th.setData({[txt]:{}});
+                }
+
             }
  
             if(quan_price>0){
@@ -1724,15 +1728,17 @@ Page({
                             }
                         })
  
-                        if(quan_price>0) {
-                            if (quan_price <th.data.tail_pay) th.setData({quan_price:quan_price})
+                        if (quan_price > 0) {
+                            if (quan_price < th.data.tail_pay) th.setData({quan_price: quan_price})
                             else {
-                                th.setData({quan_price:  th.data.tail_pay})
-								quan_price=th.data.tail_pay;
+                                th.setData({quan_price: th.data.tail_pay})
+                                quan_price = th.data.tail_pay;
                             }
-                        }else{
+                        } else {
                             th.setData({quan_price: 0})
                         }
+                    }else{
+                        th.setData({quan_price: 0})
                     }
                 }else{
                     th.setData({quan_price: 0})
@@ -1906,7 +1912,13 @@ Page({
  
     //显示支付选择
     show_pay: function () {
-        this.setData({show_pay_type: 1});
+        //不用钱直接支付
+        if(this.data.order_m<=0){
+            this.to_pay_type(1);
+        }else{
+            this.setData({show_pay_type: 1});
+        }
+
     },
     //关闭支付
     close_show_pay: function () {
@@ -340,8 +340,8 @@
                     <text class="co-red"> <text class="fs24">￥</text>{{filters.toFix(order_m,2)}}</text>
                 </view>
             </view>
-            <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">提交订单</button>
-            <button wx:else class="tips-btn" bindtap="show_pay">提交订单</button>
+            <button wx:if="{{no_start || is_end || is_complete}}" class="tips-btn gray">支付尾款</button>
+            <button wx:else class="tips-btn" bindtap="show_pay">支付尾款</button>
             <!-- 预售 -->
             <!-- <button  class="tips-btn" formType="submit" id="submitOrder">立即支付</button> -->
         </view>