From 6aca38b7d6b959a97fb341ccd84ab701eedfa8e2 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 12 Oct 2023 14:19:42 +0800 Subject: [PATCH] 读取物流失败的bug优化 --- packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js | 17 ++++++++++------- packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 1 + packageC/pages/payForAnother/payForAnother.js | 18 ++++++++++++------ packageC/pages/presell/cart/cart.js | 1 + packageC/pages/presell/cart/cart2.js | 17 ++++++++++------- packageE/pages/cart/cart2/cart2.js | 22 +++++++++++----------- packageE/pages/cart/cart2_inte/cart2_inte.js | 1 + packageE/pages/cart/cart2_pt/cart2_pt.js | 1 + packageE/pages/cart/cart_wk/cart_wk.js | 2 +- 9 files changed, 48 insertions(+), 32 deletions(-) diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 4c94c78..2c491ca 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.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, diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index 1c50a1d..cb3adf2 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -977,6 +977,7 @@ Page({ wx.showToast({ title: "计算物流错误", icon: 'none', duration: 2000 }) + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index 882a400..75046cf 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -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, diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index e852b1d..06fd175 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -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; } diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 5a61a31..dd7e077 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -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, diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index d1cbbc8..37e116e 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -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, diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index ee83012..146fba0 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -855,6 +855,7 @@ Page({ wx.showToast({ title: "计算物流错误", icon: 'none',duration: 2000 }) + th.setData({show_submit:1, submit: 0,same_ok:0 }) return false; } diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index fa83cd9..57dc3b3 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -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; } diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index 42d238d..2970eb5 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -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; } -- libgit2 0.21.4