From 999054648f95f5b5e0c2368b1dc26ac441e257b6 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 21 Jun 2022 10:45:34 +0800
Subject: [PATCH] 计算运费错误的弹框和 hideloading()要调整位置

---
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 2 +-
 packageC/pages/presell/cart/cart.js                       | 2 +-
 packageC/pages/presell/cart/cart2.js                      | 3 ++-
 pages/cart/cart2/cart2.js                                 | 6 ++++--
 pages/cart/cart2_inte/cart2_inte.js                       | 3 ++-
 pages/cart/cart2_pt/cart2_pt.js                           | 3 ++-
 pages/cart/cart_wk/cart_wk.js                             | 4 +---
 7 files changed, 13 insertions(+), 10 deletions(-)

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 077339b..4e0986b 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -625,10 +625,10 @@ Page({
                         }
                     })
                     if(!is_ok){
+						wx.hideLoading();
                         wx.showToast({
                             title: "计算物流错误", icon: 'none',duration: 2000
                         })
-                        wx.hideLoading();
 						return false;
                     }
 
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 5de5d00..89164c0 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -1925,11 +1925,11 @@ Page({
                             }
                         })
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
                             //th.setData({ show_submit:0 });
-                            wx.hideLoading();
                             return false;
                         }
 
diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index 4dbaf1d..20474ca 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -785,11 +785,12 @@ Page({
                             }
                         })
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
                             //th.setData({ show_submit:0 });
-                            wx.hideLoading();
+
                             return false;
                         }
 
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 2661724..477b30d 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1892,11 +1892,12 @@ Page({
                         })
 
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
                             //th.setData({ show_submit:0, });
-                            wx.hideLoading();
+
                             return false;
                         }
 
@@ -2395,11 +2396,12 @@ Page({
                             })
 
                             if(!is_ok){
+                                wx.hideLoading();
                                 wx.showToast({
                                     title: "计算物流错误", icon: 'none',duration: 2000
                                 })
                                 //th.setData({ show_submit:0 });
-                                wx.hideLoading();
+
                                 return false;
                             }
 
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index 07b8ec1..17daa97 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -541,10 +541,11 @@ Page({
             })
 
             if(!is_ok){
+                wx.hideLoading();
                 wx.showToast({
                     title: "计算物流错误", icon: 'none',duration: 2000
                 })
-                wx.hideLoading();
+
                 return false;
             }
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 12ecfa8..386d868 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -527,11 +527,12 @@ Page({
                 }
             })
             if(!is_ok){
+                wx.hideLoading();
                 wx.showToast({
                     title: "计算物流错误", icon: 'none',duration: 2000
                 })
                 //th.setData({ show_submit:0 });
-                wx.hideLoading();
+
                 return false;
             }
 
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 0f1939e..890ad62 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -609,9 +609,7 @@ Page({
                 if(res.data.code==0){
                     shipping_price=res.data.data; is_ok=1;
                 }else{
-                    wx.showToast({
-                        title: "计算物流错误:"+res.data.msg, icon: 'none',duration: 2000
-                    })
+                    getApp().confirmBox("计算物流错误:"+res.data.msg);
                 }
             })
             if(!is_ok){
--
libgit2 0.21.4