diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index d850b6a..4c94c78 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -2608,7 +2608,7 @@ Page({ if (th.data.is_all_zt == 1) addr = null; var val_arr = t.detail.value; - if (th.data.is_all_zt != 1) + if (th.data.is_all_zt != 1 && t_item.exp_type==0) if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { th.data.is_summit_ing = 0; getApp().confirmBox("读取物流失败"); 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 0a98fb4..1c50a1d 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1003,7 +1003,7 @@ Page({ var lon = 0; var lat = 0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); diff --git a/packageC/pages/payForAnother/payForAnother.js b/packageC/pages/payForAnother/payForAnother.js index 721bc94..882a400 100644 --- a/packageC/pages/payForAnother/payForAnother.js +++ b/packageC/pages/payForAnother/payForAnother.js @@ -2283,7 +2283,7 @@ Page({ var val_arr = t.detail.value; - if (th.data.is_all_zt != 1) + if (th.data.is_all_zt != 1 && t_item.exp_type==0) if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { th.data.is_summit_ing = 0; getApp().confirmBox("读取物流失败"); diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index eb814b0..e852b1d 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2247,7 +2247,7 @@ Page({ var lat = 0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address} + is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid} }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -2333,7 +2333,7 @@ Page({ var lat = 0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address} + is_json: 1, data: {address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid} }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 96502ef..5a61a31 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -1038,7 +1038,7 @@ Page({ var lon=0;var lat=0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} }).then(res=>{ if(res.data.code==0){ var data= JSON.parse(res.data.data); @@ -1442,7 +1442,7 @@ Page({ if (th.data.is_all_zt == 1) addr = null; var val_arr = t.detail.value; - if (th.data.is_all_zt != 1) + if (th.data.is_all_zt != 1 && t_item.exp_type==0) if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { th.data.is_summit_ing = 0; getApp().confirmBox("读取物流失败"); diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 58f8b81..d1cbbc8 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -3306,7 +3306,7 @@ Page({ if (!lon) { //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -4108,7 +4108,7 @@ Page({ //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); @@ -4760,12 +4760,16 @@ Page({ if (th.data.is_all_zt == 1) addr = null; var val_arr = th.data.user_note; - if (th.data.is_all_zt != 1) + if (th.data.is_all_zt != 1 && t_item.exp_type==0) + { + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { th.data.is_summit_ing = 0; getApp().confirmBox("读取物流失败"); return false; } + } + var order_prom_list_cart = th.data.order_prom_list_cart; diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index 322d2d5..ee83012 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -1032,7 +1032,7 @@ Page({ var lon=0;var lat=0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} }).then(res=>{ if(res.data.code==0){ var data= JSON.parse(res.data.data); diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js index 3c08d91..fa83cd9 100644 --- a/packageE/pages/cart/cart2_pt/cart2_pt.js +++ b/packageE/pages/cart/cart2_pt/cart2_pt.js @@ -897,7 +897,7 @@ Page({ var lat = 0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address } + is_json: 1, data: { address: th.data.user_addr.more_address + th.data.user_addr.address,store_id:os.stoid } }).then(res => { if (res.data.code == 0) { var data = JSON.parse(res.data.data); diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js index 84160b0..42d238d 100644 --- a/packageE/pages/cart/cart_wk/cart_wk.js +++ b/packageE/pages/cart/cart_wk/cart_wk.js @@ -1037,7 +1037,7 @@ Page({ var lon=0;var lat=0; //-- 获取距离 -- await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid} }).then(res=>{ if(res.data.code==0){ var data= JSON.parse(res.data.data);