Merge branch 'dev' into 'test'

Dev See merge request !1069

Merge branch 'dev' into 'test'
Dev See merge request !1069
后端研发-苏明海
2 parents 04dc9e7c 99905464
Showing 7 changed files with 22 additions and 17 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
@@ -625,11 +625,11 @@ Page({
                         }
                     })
                     if(!is_ok){
+						wx.hideLoading();
                         wx.showToast({
                             title: "计算物流错误", icon: 'none',duration: 2000
                         })
-                        th.setData({ show_submit:0,sub:0 });
-                        wx.hideLoading();
+						return false;
                     }
  
  
@@ -1925,11 +1925,11 @@ Page({
                             }
                         })
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
-                            th.setData({ show_submit:0 });
-                            wx.hideLoading();
+                            //th.setData({ show_submit:0 });
                             return false;
                         }
  
@@ -785,11 +785,12 @@ Page({
                             }
                         })
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
-                            th.setData({ show_submit:0 });
-                            wx.hideLoading();
+                            //th.setData({ show_submit:0 });
+
                             return false;
                         }
  
@@ -1892,11 +1892,13 @@ Page({
                         })
  
                         if(!is_ok){
+                            wx.hideLoading();
                             wx.showToast({
                                 title: "计算物流错误", icon: 'none',duration: 2000
                             })
-                            th.setData({ show_submit:0 });
-                            wx.hideLoading();
+                            //th.setData({ show_submit:0, });
+
+                            return false;
                         }
  
                         if (!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby != 1) {
@@ -2394,11 +2396,13 @@ Page({
                             })
  
                             if(!is_ok){
+                                wx.hideLoading();
                                 wx.showToast({
                                     title: "计算物流错误", icon: 'none',duration: 2000
                                 })
-                                th.setData({ show_submit:0 });
-                                wx.hideLoading();
+                                //th.setData({ show_submit:0 });
+
+                                return false;
                             }
  
                             if (shipping_price <= 0) {
@@ -541,10 +541,11 @@ Page({
             })
  
             if(!is_ok){
+                wx.hideLoading();
                 wx.showToast({
                     title: "计算物流错误", icon: 'none',duration: 2000
                 })
-                wx.hideLoading();
+
                 return false;
             }
  
@@ -527,11 +527,12 @@ Page({
                 }
             })
             if(!is_ok){
+                wx.hideLoading();
                 wx.showToast({
                     title: "计算物流错误", icon: 'none',duration: 2000
                 })
-                th.setData({ show_submit:0 });
-                wx.hideLoading();
+                //th.setData({ show_submit:0 });
+
                 return false;
             }
  
@@ -609,13 +609,11 @@ 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){
-                th.setData({ submit:0,show_submit:1 });
+                th.setData({ show_submit:1 });
                 wx.hideLoading();
                 return false;
             }