Commit 136f912a872a4ba0aab982665213fa9ccfd2d48b
1 parent
cee15c91
读取物流失败的bug优化
经纬度的优化
Showing
9 changed files
with
17 additions
and
13 deletions
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
... | ... | @@ -2608,7 +2608,7 @@ Page({ |
2608 | 2608 | if (th.data.is_all_zt == 1) addr = null; |
2609 | 2609 | var val_arr = t.detail.value; |
2610 | 2610 | |
2611 | - if (th.data.is_all_zt != 1) | |
2611 | + if (th.data.is_all_zt != 1 && t_item.exp_type==0) | |
2612 | 2612 | if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { |
2613 | 2613 | th.data.is_summit_ing = 0; |
2614 | 2614 | getApp().confirmBox("读取物流失败"); | ... | ... |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
... | ... | @@ -1003,7 +1003,7 @@ Page({ |
1003 | 1003 | var lon = 0; var lat = 0; |
1004 | 1004 | //-- 获取距离 -- |
1005 | 1005 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
1006 | - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } | |
1006 | + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } | |
1007 | 1007 | }).then(res => { |
1008 | 1008 | if (res.data.code == 0) { |
1009 | 1009 | var data = JSON.parse(res.data.data); | ... | ... |
packageC/pages/payForAnother/payForAnother.js
... | ... | @@ -2283,7 +2283,7 @@ Page({ |
2283 | 2283 | var val_arr = t.detail.value; |
2284 | 2284 | |
2285 | 2285 | |
2286 | - if (th.data.is_all_zt != 1) | |
2286 | + if (th.data.is_all_zt != 1 && t_item.exp_type==0) | |
2287 | 2287 | if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { |
2288 | 2288 | th.data.is_summit_ing = 0; |
2289 | 2289 | getApp().confirmBox("读取物流失败"); | ... | ... |
packageC/pages/presell/cart/cart.js
... | ... | @@ -2247,7 +2247,7 @@ Page({ |
2247 | 2247 | var lat = 0; |
2248 | 2248 | //-- 获取距离 -- |
2249 | 2249 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
2250 | - is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address} | |
2250 | + is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid} | |
2251 | 2251 | }).then(res => { |
2252 | 2252 | if (res.data.code == 0) { |
2253 | 2253 | var data = JSON.parse(res.data.data); |
... | ... | @@ -2333,7 +2333,7 @@ Page({ |
2333 | 2333 | var lat = 0; |
2334 | 2334 | //-- 获取距离 -- |
2335 | 2335 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
2336 | - is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address} | |
2336 | + is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid} | |
2337 | 2337 | }).then(res => { |
2338 | 2338 | if (res.data.code == 0) { |
2339 | 2339 | var data = JSON.parse(res.data.data); | ... | ... |
packageC/pages/presell/cart/cart2.js
... | ... | @@ -1038,7 +1038,7 @@ Page({ |
1038 | 1038 | var lon=0;var lat=0; |
1039 | 1039 | //-- 获取距离 -- |
1040 | 1040 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
1041 | - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | |
1041 | + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} | |
1042 | 1042 | }).then(res=>{ |
1043 | 1043 | if(res.data.code==0){ |
1044 | 1044 | var data= JSON.parse(res.data.data); |
... | ... | @@ -1442,7 +1442,7 @@ Page({ |
1442 | 1442 | if (th.data.is_all_zt == 1) addr = null; |
1443 | 1443 | var val_arr = t.detail.value; |
1444 | 1444 | |
1445 | - if (th.data.is_all_zt != 1) | |
1445 | + if (th.data.is_all_zt != 1 && t_item.exp_type==0) | |
1446 | 1446 | if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { |
1447 | 1447 | th.data.is_summit_ing = 0; |
1448 | 1448 | getApp().confirmBox("读取物流失败"); | ... | ... |
packageE/pages/cart/cart2/cart2.js
... | ... | @@ -3306,7 +3306,7 @@ Page({ |
3306 | 3306 | if (!lon) { |
3307 | 3307 | //-- 获取距离 -- |
3308 | 3308 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
3309 | - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } | |
3309 | + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } | |
3310 | 3310 | }).then(res => { |
3311 | 3311 | if (res.data.code == 0) { |
3312 | 3312 | var data = JSON.parse(res.data.data); |
... | ... | @@ -4108,7 +4108,7 @@ Page({ |
4108 | 4108 | |
4109 | 4109 | //-- 获取距离 -- |
4110 | 4110 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
4111 | - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } | |
4111 | + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } | |
4112 | 4112 | }).then(res => { |
4113 | 4113 | if (res.data.code == 0) { |
4114 | 4114 | var data = JSON.parse(res.data.data); |
... | ... | @@ -4760,12 +4760,16 @@ Page({ |
4760 | 4760 | if (th.data.is_all_zt == 1) addr = null; |
4761 | 4761 | var val_arr = th.data.user_note; |
4762 | 4762 | |
4763 | - if (th.data.is_all_zt != 1) | |
4763 | + if (th.data.is_all_zt != 1 && t_item.exp_type==0) | |
4764 | + { | |
4765 | + | |
4764 | 4766 | if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { |
4765 | 4767 | th.data.is_summit_ing = 0; |
4766 | 4768 | getApp().confirmBox("读取物流失败"); |
4767 | 4769 | return false; |
4768 | 4770 | } |
4771 | + } | |
4772 | + | |
4769 | 4773 | |
4770 | 4774 | var order_prom_list_cart = th.data.order_prom_list_cart; |
4771 | 4775 | ... | ... |
packageE/pages/cart/cart2_inte/cart2_inte.js
... | ... | @@ -1032,7 +1032,7 @@ Page({ |
1032 | 1032 | var lon=0;var lat=0; |
1033 | 1033 | //-- 获取距离 -- |
1034 | 1034 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
1035 | - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | |
1035 | + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} | |
1036 | 1036 | }).then(res=>{ |
1037 | 1037 | if(res.data.code==0){ |
1038 | 1038 | var data= JSON.parse(res.data.data); | ... | ... |
packageE/pages/cart/cart2_pt/cart2_pt.js
... | ... | @@ -897,7 +897,7 @@ Page({ |
897 | 897 | var lat = 0; |
898 | 898 | //-- 获取距离 -- |
899 | 899 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
900 | - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } | |
900 | + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } | |
901 | 901 | }).then(res => { |
902 | 902 | if (res.data.code == 0) { |
903 | 903 | var data = JSON.parse(res.data.data); | ... | ... |
packageE/pages/cart/cart_wk/cart_wk.js
... | ... | @@ -1037,7 +1037,7 @@ Page({ |
1037 | 1037 | var lon=0;var lat=0; |
1038 | 1038 | //-- 获取距离 -- |
1039 | 1039 | await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { |
1040 | - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | |
1040 | + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} | |
1041 | 1041 | }).then(res=>{ |
1042 | 1042 | if(res.data.code==0){ |
1043 | 1043 | var data= JSON.parse(res.data.data); | ... | ... |