diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 98ed7ac1..a3638674 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -708,14 +708,26 @@ }, // 地址选择事件 - address_event(e) { + address_event(e) { + // 带上参数 + var json = this.params || null; + if(json != null) { + var params = '&'+Object.keys(json).map(function(key) { + var temp_val = (json[key] === undefined || json[key] === null) ? '' : json[key]; + return encodeURIComponent(key) + '=' + encodeURIComponent(temp_val); + }).join('&'); + } else { + var params = ''; + } + + // 仅自提和快递需要选择地址 if (this.common_site_type == 0 || this.common_site_type == 4 && this.site_model == 0) { uni.navigateTo({ - url: '/pages/user-address/user-address?is_back=1' + url: '/pages/user-address/user-address?is_back=1'+params }); } else if (this.common_site_type == 2 || this.common_site_type == 4 && this.site_model == 2) { uni.navigateTo({ - url: '/pages/extraction-address/extraction-address?is_back=1&is_buy=1' + url: '/pages/extraction-address/extraction-address?is_back=1&is_buy=1'+params }); } else { app.globalData.showToast('当前模式不允许使用地址'); diff --git a/pages/extraction-address/extraction-address.vue b/pages/extraction-address/extraction-address.vue index 4bbae556..4f1a786b 100644 --- a/pages/extraction-address/extraction-address.vue +++ b/pages/extraction-address/extraction-address.vue @@ -167,7 +167,7 @@ }); // 获取数据 - var data = {}; + var data = this.params || {}; // 是否有坐标 if ((this.user_location || null) != null) { diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue index 35bbad17..19a7af3f 100644 --- a/pages/user-address/user-address.vue +++ b/pages/user-address/user-address.vue @@ -12,7 +12,8 @@ - {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}} + {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}} + 距离{{item.distance_value}}{{item.distance_unit}} @@ -132,7 +133,7 @@ uni.request({ url: app.globalData.get_request_url("index", "useraddress"), method: "POST", - data: {}, + data: this.params, dataType: "json", success: res => { uni.hideLoading();