指定商品库存，订单列表的bug优化

yvan.ni
1 parent 76666975
Showing 3 changed files with 10 additions and 6 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -3478,6 +3478,7 @@ Page({
  
                     if (res.data.data.pageData && res.data.data.pageData.length > 0) {
  
+                        var def_pick_store = th.data.def_pick_store;
                         var plist = res.data.data.pageData;
                         if(th.data.sales_rules==3) {
                             var lock_num = 0;
@@ -3494,7 +3495,7 @@ Page({
                                 if (th.data.fir_def_store  && 
                                   (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 ||  (th.data.def_pick_store && th.data.def_pick_store.distr_type == g_distr_type))) {
                                     th.data.fir_def_store.Qty;
-                                    if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
+                                    if (def_pick_store && def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
                                         th.setData({def_pick_store: th.data.fir_def_store})
                                     is_find_def_store = 1;
                                 }
@@ -3506,7 +3507,7 @@ Page({
  
                         }else {
  
-                            var def_pick_store = th.data.def_pick_store;
+                          
                             //以原来的数组为外循环，保证距离的顺序
                             for (var kk in o_plist) {
                                 for (var ii in plist) {
@@ -3523,7 +3524,7 @@ Page({
                                             //--如果找到默认门店,同时也应该判断配送方式对不对--
                                             if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) {
                                                 th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num;
-                                                if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
+                                                if (def_pick_store && def_pick_store.pickup_id == th.data.fir_def_store.pickup_id)
                                                     th.setData({def_pick_store: th.data.fir_def_store})
                                                 is_find_def_store = 1;
                                             }
@@ -600,9 +600,12 @@ Page({
     async jumpToCart4(t) {
  
         if(this.data.paying) return false;
-        this.setData({paying:1});
-
+        //this.setData({paying:1});
         var o_index = t.currentTarget.dataset.idx;
+        var txt="paying["+o_index+"]";
+        this.setData({[txt]:1});
+
+
         var e = this.data.orderList[o_index];
         var th = this;
         var order = e;
@@ -273,7 +273,7 @@
  
 	          <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
 	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
-				<text wx:if="{{paying}}">支付中</text>
+				<text wx:if="{{paying && paying[index]}}">支付中</text>
 				<text wx:else>立即支付</text>
 			  </navigator>