From 4b2157c82d48d6a2b7e0da9a6f0e58e2a936b737 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 6 Apr 2022 00:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=8F=82=E6=95=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=A0=E9=80=92=E4=BC=98=E5=8C=96=E3=80=81=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E5=86=85=E5=AE=B9=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/buy/buy.vue                              | 18 +++++++++++++++---
 .../extraction-address/extraction-address.vue  |  2 +-
 pages/user-address/user-address.vue            |  5 +++--
 3 files changed, 19 insertions(+), 6 deletions(-)

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 @@
                         <view class="address oh padding-bottom-lg">
                             <image class="item-icon fl margin-top-xs" :src="common_static_url+'map-icon.png'" mode="widthFix"></image>
                             <view class="text fr">
-                                {{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}
+                                <text>{{item.province_name || ''}}{{item.city_name || ''}}{{item.county_name || ''}}{{item.address || ''}}</text>
+                                <text v-if="((item.distance_value || null) != null && (item.distance_unit || null) != null)" class="cr-grey margin-left-lg fr">距离<text class="cr-base">{{item.distance_value}}</text>{{item.distance_unit}}</text>
                             </view>
                         </view>
                     </view>
@@ -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();