Commit fb803415d8f8a730e813a4c5cea109dd1587f2d4
1 parent
c7efa747
物流配置未启用物流公司
Showing
6 changed files
with
74 additions
and
1 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| @@ -949,6 +949,17 @@ Page({ | @@ -949,6 +949,17 @@ Page({ | ||
| 949 | if (out_of_weight >= 0) out_of_weight = -cut_good_weight; | 949 | if (out_of_weight >= 0) out_of_weight = -cut_good_weight; |
| 950 | else out_of_weight = -back_data.weight_free * 1000; | 950 | else out_of_weight = -back_data.weight_free * 1000; |
| 951 | 951 | ||
| 952 | + | ||
| 953 | + if(!th.data.wu_arr){ | ||
| 954 | + wx.hideLoading(); | ||
| 955 | + wx.showToast({ | ||
| 956 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 957 | + }) | ||
| 958 | + //th.setData({ show_submit:0, }); | ||
| 959 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 960 | + return false; | ||
| 961 | + } | ||
| 962 | + | ||
| 952 | var code = th.data.wu_arr[th.data.index].code; | 963 | var code = th.data.wu_arr[th.data.index].code; |
| 953 | var shipping_price = 0; | 964 | var shipping_price = 0; |
| 954 | // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, | 965 | // ut.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight, |
packageC/pages/presell/cart/cart.js
| @@ -2075,6 +2075,16 @@ Page({ | @@ -2075,6 +2075,16 @@ Page({ | ||
| 2075 | else out_of_weight = -back_data.weight_free * 1000; | 2075 | else out_of_weight = -back_data.weight_free * 1000; |
| 2076 | 2076 | ||
| 2077 | 2077 | ||
| 2078 | + if(!th.data.wu_arr){ | ||
| 2079 | + wx.hideLoading(); | ||
| 2080 | + wx.showToast({ | ||
| 2081 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 2082 | + }) | ||
| 2083 | + //th.setData({ show_submit:0, }); | ||
| 2084 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 2085 | + return false; | ||
| 2086 | + } | ||
| 2087 | + | ||
| 2078 | var code = th.data.wu_arr[th.data.index].code; | 2088 | var code = th.data.wu_arr[th.data.index].code; |
| 2079 | th.data.is_no_by[th.data.bn_pick] = 0; | 2089 | th.data.is_no_by[th.data.bn_pick] = 0; |
| 2080 | 2090 |
packageE/pages/cart/cart2/cart2.js
| @@ -3180,6 +3180,17 @@ Page({ | @@ -3180,6 +3180,17 @@ Page({ | ||
| 3180 | else out_of_weight = -back_data.weight_free * 1000; | 3180 | else out_of_weight = -back_data.weight_free * 1000; |
| 3181 | 3181 | ||
| 3182 | var code = ""; | 3182 | var code = ""; |
| 3183 | + | ||
| 3184 | + if(!th.data.wu_arr){ | ||
| 3185 | + wx.hideLoading(); | ||
| 3186 | + wx.showToast({ | ||
| 3187 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 3188 | + }) | ||
| 3189 | + //th.setData({ show_submit:0, }); | ||
| 3190 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 3191 | + return false; | ||
| 3192 | + } | ||
| 3193 | + | ||
| 3183 | if (th.data.wu_arr && th.data.wu_arr[cart_item.wind]) | 3194 | if (th.data.wu_arr && th.data.wu_arr[cart_item.wind]) |
| 3184 | code = th.data.wu_arr[cart_item.wind].code; | 3195 | code = th.data.wu_arr[cart_item.wind].code; |
| 3185 | 3196 | ||
| @@ -3877,6 +3888,17 @@ Page({ | @@ -3877,6 +3888,17 @@ Page({ | ||
| 3877 | else out_of_weight = -back_data.weight_free * 1000; | 3888 | else out_of_weight = -back_data.weight_free * 1000; |
| 3878 | 3889 | ||
| 3879 | var code = ""; | 3890 | var code = ""; |
| 3891 | + if(!th.data.wu_arr){ | ||
| 3892 | + wx.hideLoading(); | ||
| 3893 | + wx.showToast({ | ||
| 3894 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 3895 | + }) | ||
| 3896 | + //th.setData({ show_submit:0, }); | ||
| 3897 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 3898 | + return false; | ||
| 3899 | + } | ||
| 3900 | + | ||
| 3901 | + | ||
| 3880 | if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; | 3902 | if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; |
| 3881 | th.data.is_no_by[th.data.bn_pick] = 0; | 3903 | th.data.is_no_by[th.data.bn_pick] = 0; |
| 3882 | th.data.is_by[th.data.bn_pick] = 0; | 3904 | th.data.is_by[th.data.bn_pick] = 0; |
packageE/pages/cart/cart2_inte/cart2_inte.js
| @@ -825,6 +825,17 @@ Page({ | @@ -825,6 +825,17 @@ Page({ | ||
| 825 | else out_of_weight = -back_data.weight_free * 1000; | 825 | else out_of_weight = -back_data.weight_free * 1000; |
| 826 | 826 | ||
| 827 | var code = ""; | 827 | var code = ""; |
| 828 | + if(!th.data.wu_arr){ | ||
| 829 | + wx.hideLoading(); | ||
| 830 | + wx.showToast({ | ||
| 831 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 832 | + }) | ||
| 833 | + //th.setData({ show_submit:0, }); | ||
| 834 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 835 | + return false; | ||
| 836 | + } | ||
| 837 | + | ||
| 838 | + | ||
| 828 | if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; | 839 | if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code; |
| 829 | //--------------开始计算物流------------------ | 840 | //--------------开始计算物流------------------ |
| 830 | var shipping_price=0; | 841 | var shipping_price=0; |
packageE/pages/cart/cart2_pt/cart2_pt.js
| @@ -843,7 +843,17 @@ Page({ | @@ -843,7 +843,17 @@ Page({ | ||
| 843 | else out_of_weight = -back_data.weight_free * 1000; | 843 | else out_of_weight = -back_data.weight_free * 1000; |
| 844 | 844 | ||
| 845 | 845 | ||
| 846 | - var code = th.data.wu_arr[th.data.index].code; | 846 | + if(!th.data.wu_arr){ |
| 847 | + wx.hideLoading(); | ||
| 848 | + wx.showToast({ | ||
| 849 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 850 | + }) | ||
| 851 | + //th.setData({ show_submit:0, }); | ||
| 852 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 853 | + return false; | ||
| 854 | + } | ||
| 855 | + | ||
| 856 | + var code = th.data.wu_arr[th.data.index].code; | ||
| 847 | 857 | ||
| 848 | //--------------开始计算物流------------------ | 858 | //--------------开始计算物流------------------ |
| 849 | var shipping_price = 0; | 859 | var shipping_price = 0; |
packageE/pages/cart/cart_wk/cart_wk.js
| @@ -860,6 +860,15 @@ Page({ | @@ -860,6 +860,15 @@ Page({ | ||
| 860 | if (out_of_weight >= 0) out_of_weight = -cut_good_weight; | 860 | if (out_of_weight >= 0) out_of_weight = -cut_good_weight; |
| 861 | else out_of_weight = -back_data.weight_free * 1000; | 861 | else out_of_weight = -back_data.weight_free * 1000; |
| 862 | 862 | ||
| 863 | + if(!th.data.wu_arr){ | ||
| 864 | + wx.hideLoading(); | ||
| 865 | + wx.showToast({ | ||
| 866 | + title: "物流配置未启用物流公司", icon: 'none', duration: 2000 | ||
| 867 | + }) | ||
| 868 | + //th.setData({ show_submit:0, }); | ||
| 869 | + th.setData({show_submit:1, submit: 0,same_ok:0 }) | ||
| 870 | + return false; | ||
| 871 | + } | ||
| 863 | var code = th.data.wu_arr[th.data.index].code; | 872 | var code = th.data.wu_arr[th.data.index].code; |
| 864 | 873 | ||
| 865 | //--------------开始计算物流------------------ | 874 | //--------------开始计算物流------------------ |