From c1c8ff412e6f0afc5c27bcbb7fb69d673ba84735 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Thu, 2 Dec 2021 00:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=BA=97=E5=92=8C=E9=A4=90=E5=8E=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=9D=E6=82=A8XXkm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goodsDetail/index.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index 9e7772b..4b874fa 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -159,7 +159,10 @@
 						<view class="lf-row-between">
 							<view class="lf-line-2 lf-font-28 lf-color-333">
 								{{goods_detail.product.extends.field_3_address}}</view>
-							<view class="lf-iconfont lf-icon-dizhi lf-color-blue"></view>
+							<view class="lf-flex-column lf-row-center">
+								<view class="lf-iconfont lf-icon-dizhi lf-color-blue"></view>
+								<view class="lf-font-24 lf-color-222 lf-m-t-10" v-if="$isRight(shop_distance)">距您{{shop_distance}}</view>
+							</view>
 						</view>
 					</view>
 					<view class="goods-detail">
@@ -196,7 +199,10 @@
 						<view class="lf-row-between" v-if="goods_detail.product.extends.field_1_address">
 							<view class="lf-line-2 lf-font-28 lf-color-333">
 								{{goods_detail.product.extends.field_1_address}}</view>
-							<view class="lf-iconfont lf-icon-dizhi lf-color-blue"></view>
+							<view class="lf-flex-column lf-row-center">
+								<view class="lf-iconfont lf-icon-dizhi lf-color-blue"></view>
+								<view class="lf-font-24 lf-color-222 lf-m-t-10" v-if="$isRight(shop_distance)">距您{{shop_distance}}</view>
+							</view>
 						</view>
 					</view>
 					<!-- <zwyCalendar class="lf-m-t-20" type="sign" :startTime="'2021-10-01'" :endTime="'2021-11-01'"/> -->
@@ -597,8 +603,8 @@
 				   const self_longitude = res.longitude
 				   console.log('当前经纬度',self_latitude,self_longitude,res);
 				   if(that.goods_detail.product && that.$isRight(that.goods_detail.product.extends)) {
-						const shop_latitude = that.goods_detail.product.extends.field_2_latitude;
-						const shop_longitude = that.goods_detail.product.extends.field_2_longitude;
+						const shop_latitude = that.goods_detail.latitude;
+						const shop_longitude = that.goods_detail.longitude;
 						console.log('商家经纬度',shop_latitude,shop_longitude);
 						//计算
 						var radLat1 = self_latitude* Math.PI / 180.0;