Commit a1b7e67c43fd9700e29f69b99a057401248986a2
Merge branch 'qa' into 'master'
Qa See merge request !1071
Showing
7 changed files
with
22 additions
and
17 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
... | ... | @@ -625,11 +625,11 @@ Page({ |
625 | 625 | } |
626 | 626 | }) |
627 | 627 | if(!is_ok){ |
628 | + wx.hideLoading(); | |
628 | 629 | wx.showToast({ |
629 | 630 | title: "计算物流错误", icon: 'none',duration: 2000 |
630 | 631 | }) |
631 | - th.setData({ show_submit:0,sub:0 }); | |
632 | - wx.hideLoading(); | |
632 | + return false; | |
633 | 633 | } |
634 | 634 | |
635 | 635 | ... | ... |
packageC/pages/presell/cart/cart.js
... | ... | @@ -1925,11 +1925,11 @@ Page({ |
1925 | 1925 | } |
1926 | 1926 | }) |
1927 | 1927 | if(!is_ok){ |
1928 | + wx.hideLoading(); | |
1928 | 1929 | wx.showToast({ |
1929 | 1930 | title: "计算物流错误", icon: 'none',duration: 2000 |
1930 | 1931 | }) |
1931 | - th.setData({ show_submit:0 }); | |
1932 | - wx.hideLoading(); | |
1932 | + //th.setData({ show_submit:0 }); | |
1933 | 1933 | return false; |
1934 | 1934 | } |
1935 | 1935 | ... | ... |
packageC/pages/presell/cart/cart2.js
... | ... | @@ -785,11 +785,12 @@ Page({ |
785 | 785 | } |
786 | 786 | }) |
787 | 787 | if(!is_ok){ |
788 | + wx.hideLoading(); | |
788 | 789 | wx.showToast({ |
789 | 790 | title: "计算物流错误", icon: 'none',duration: 2000 |
790 | 791 | }) |
791 | - th.setData({ show_submit:0 }); | |
792 | - wx.hideLoading(); | |
792 | + //th.setData({ show_submit:0 }); | |
793 | + | |
793 | 794 | return false; |
794 | 795 | } |
795 | 796 | ... | ... |
pages/cart/cart2/cart2.js
... | ... | @@ -1892,11 +1892,13 @@ Page({ |
1892 | 1892 | }) |
1893 | 1893 | |
1894 | 1894 | if(!is_ok){ |
1895 | + wx.hideLoading(); | |
1895 | 1896 | wx.showToast({ |
1896 | 1897 | title: "计算物流错误", icon: 'none',duration: 2000 |
1897 | 1898 | }) |
1898 | - th.setData({ show_submit:0 }); | |
1899 | - wx.hideLoading(); | |
1899 | + //th.setData({ show_submit:0, }); | |
1900 | + | |
1901 | + return false; | |
1900 | 1902 | } |
1901 | 1903 | |
1902 | 1904 | if (!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby != 1) { |
... | ... | @@ -2394,11 +2396,13 @@ Page({ |
2394 | 2396 | }) |
2395 | 2397 | |
2396 | 2398 | if(!is_ok){ |
2399 | + wx.hideLoading(); | |
2397 | 2400 | wx.showToast({ |
2398 | 2401 | title: "计算物流错误", icon: 'none',duration: 2000 |
2399 | 2402 | }) |
2400 | - th.setData({ show_submit:0 }); | |
2401 | - wx.hideLoading(); | |
2403 | + //th.setData({ show_submit:0 }); | |
2404 | + | |
2405 | + return false; | |
2402 | 2406 | } |
2403 | 2407 | |
2404 | 2408 | if (shipping_price <= 0) { | ... | ... |
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
... | ... | @@ -527,11 +527,12 @@ Page({ |
527 | 527 | } |
528 | 528 | }) |
529 | 529 | if(!is_ok){ |
530 | + wx.hideLoading(); | |
530 | 531 | wx.showToast({ |
531 | 532 | title: "计算物流错误", icon: 'none',duration: 2000 |
532 | 533 | }) |
533 | - th.setData({ show_submit:0 }); | |
534 | - wx.hideLoading(); | |
534 | + //th.setData({ show_submit:0 }); | |
535 | + | |
535 | 536 | return false; |
536 | 537 | } |
537 | 538 | ... | ... |
pages/cart/cart_wk/cart_wk.js
... | ... | @@ -609,13 +609,11 @@ Page({ |
609 | 609 | if(res.data.code==0){ |
610 | 610 | shipping_price=res.data.data; is_ok=1; |
611 | 611 | }else{ |
612 | - wx.showToast({ | |
613 | - title: "计算物流错误:"+res.data.msg, icon: 'none',duration: 2000 | |
614 | - }) | |
612 | + getApp().confirmBox("计算物流错误:"+res.data.msg); | |
615 | 613 | } |
616 | 614 | }) |
617 | 615 | if(!is_ok){ |
618 | - th.setData({ submit:0,show_submit:1 }); | |
616 | + th.setData({ show_submit:1 }); | |
619 | 617 | wx.hideLoading(); |
620 | 618 | return false; |
621 | 619 | } | ... | ... |