读取物流失败的bug优化

yvan.ni
1 parent 136f912a
Showing 9 changed files with 48 additions and 32 deletions
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
packageE/pages/cart/cart_wk/cart_wk.js
@@ -2608,18 +2608,21 @@ Page({
             if (th.data.is_all_zt == 1) addr = null;
             var val_arr = t.detail.value;
-            if (th.data.is_all_zt != 1 && t_item.exp_type==0)
-                if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-                    th.data.is_summit_ing = 0;
-                    getApp().confirmBox("读取物流失败");
-                    return false;
-                }
-
             var order_prom_list_cart = th.data.order_prom_list_cart;
             //--组装推送数据--
             for (var i = 0; i < order_prom_list_cart.length; i++) {
                 var t_item = order_prom_list_cart[i];
+
+                if(t_item.exp_type==0) {
+                    if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
+                        th.data.is_summit_ing = 0;
+                        getApp().confirmBox("读取物流失败");
+                        return false;
+                    }
+                }
+
+
                 var item = {
                     'user_id': to.globalData.user_id,
                     'consignee': addr == null ? th.data.userinfo.mobile : addr.consignee,
@@ -977,6 +977,7 @@ Page({
           wx.showToast({
             title: "计算物流错误", icon: 'none', duration: 2000
           })
+          th.setData({show_submit:1, submit: 0,same_ok:0 })
           return false;
         }
@@ -2283,18 +2283,24 @@ Page({
             var val_arr = t.detail.value;
-            if (th.data.is_all_zt != 1 &&  t_item.exp_type==0)
-                if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-                    th.data.is_summit_ing = 0;
-                    getApp().confirmBox("读取物流失败");
-                    return false;
-                }
+
+
             var order_prom_list_cart = th.data.order_prom_list_cart;
             //--组装推送数据--
             for (var i = 0; i < order_prom_list_cart.length; i++) {
                 var t_item = order_prom_list_cart[i];
+
+                if (t_item.exp_type==0){
+                    if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
+                        th.data.is_summit_ing = 0;
+                        getApp().confirmBox("读取物流失败");
+                        return false;
+                    }
+                }
+
+
                 var item = {
                     'user_id': to.globalData.user_id,
                     'consignee': addr == null ? th.data.userinfo.mobile : addr.consignee,
@@ -2107,6 +2107,7 @@ Page({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
                             //th.setData({ show_submit:0 });
+                            th.setData({show_submit:1, submit: 0,same_ok:0 })
                             return false;
                         }
@@ -967,6 +967,7 @@ Page({
                                     title: "计算物流错误", icon: 'none', duration: 2000
                                 })
                                 //th.setData({ show_submit:0 });
+                                th.setData({show_submit:1, submit: 0,same_ok:0 })
                                 return false;
                             }
@@ -1442,18 +1443,20 @@ Page({
             if (th.data.is_all_zt == 1) addr = null;
             var val_arr = t.detail.value;
-            if (th.data.is_all_zt != 1 && t_item.exp_type==0)
-                if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-                    th.data.is_summit_ing = 0;
-                    getApp().confirmBox("读取物流失败");
-                    return false;
-                }
-
             var order_prom_list_cart = th.data.order_prom_list_cart;
             //--组装推送数据--
             for (var i = 0; i < order_prom_list_cart.length; i++) {
                 var t_item = order_prom_list_cart[i];
+
+                if (t_item.exp_type==0){
+                    if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
+                        th.data.is_summit_ing = 0;
+                        getApp().confirmBox("读取物流失败");
+                        return false;
+                    }
+                }
+
                 var item = {
                     'user_id': to.globalData.user_id,
                     'consignee': addr == null ? th.data.userinfo.mobile : addr.consignee,
@@ -3216,6 +3216,7 @@ Page({
             title: "计算物流错误", icon: 'none', duration: 2000
           })
           //th.setData({ show_submit:0, });
+          th.setData({show_submit:1, submit: 0,same_ok:0 })
           return false;
         }
@@ -3911,6 +3912,7 @@ Page({
             title: "计算物流错误", icon: 'none', duration: 2000
           })
           //th.setData({ show_submit:0 });
+          th.setData({show_submit:1, submit: 0,same_ok:0 })
           return false;
         }
@@ -4760,17 +4762,6 @@ Page({
       if (th.data.is_all_zt == 1) addr = null;
       var val_arr = th.data.user_note;
-      if (th.data.is_all_zt != 1 && t_item.exp_type==0)
-      {
-
-        if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-          th.data.is_summit_ing = 0;
-          getApp().confirmBox("读取物流失败");
-          return false;
-        }
-      }
-
-
       var order_prom_list_cart = th.data.order_prom_list_cart;
       //优惠商品限购的优化
@@ -4778,6 +4769,15 @@ Page({
       //--组装推送数据--
       for (var i = 0; i < order_prom_list_cart.length; i++) {
         var t_item = order_prom_list_cart[i];
+
+        if (t_item.exp_type==0){
+          if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
+            th.data.is_summit_ing = 0;
+            getApp().confirmBox("读取物流失败");
+            return false;
+          }
+        }
+
         var item = {
           "keyid": t_item.sto ? t_item.sto.keyid : '',
           'user_id': to.globalData.user_id,
@@ -855,6 +855,7 @@ Page({
           wx.showToast({
             title: "计算物流错误", icon: 'none',duration: 2000
           })
+          th.setData({show_submit:1, submit: 0,same_ok:0 })
           return false;
         }
@@ -878,6 +878,7 @@ Page({
                     title: "计算物流错误", icon: 'none', duration: 2000
                   })
                   //th.setData({ show_submit:0 });
+                  th.setData({show_submit:1, submit: 0,same_ok:0 })
                   return false;
                 }
@@ -892,7 +892,7 @@ Page({
         }
       })
       if (!is_ok) {
-        th.setData({show_submit: 1});
+        th.setData({show_submit:1, submit: 0,same_ok:0 })
         wx.hideLoading();
         return false;
       }