From 1fb2110d4c17a6c686e57e2cc84fce83b7d30db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=B5=E5=96=B5=E5=96=B51234?= <396316021@qq.com>
Date: Mon, 16 Oct 2023 23:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8D=E7=A7=B0=20=E4=BF=AE=E6=94=B9=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80=E9=A1=B5=E9=9D=A2=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=AA=E4=BD=BF=E7=94=A8=E7=9C=81=E5=B8=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Address/edit.vue  | 15 ++++++++++++++-
 pages/Index/index.vue   |  1 +
 pages/Service/index.vue | 10 +++++-----
 utils/functions.js      |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pages/Address/edit.vue b/pages/Address/edit.vue
index b96f717..dcb0a2c 100644
--- a/pages/Address/edit.vue
+++ b/pages/Address/edit.vue
@@ -292,7 +292,20 @@ export default {
             success: (res) => {
               that.lat = res.latitude;
               that.lng = res.longitude;
-              that.model.address.area = res.address;
+              console.log(res)
+              // that.model.address.area = res.address;
+              api.getloction({activedeta:{
+                  city:res.address,
+                  address:res.name
+                }}).then(data => {
+                let address = data.address_components;
+                console.log('address',address)
+                // that.address.province = address.province;
+                // that.address.city = address.city;
+                // that.address.district = address.district;
+                that.model.address.area = address.province+address.city+address.district;
+                console.log()
+              });
             },
             fail: (err) => {
               console.log(err)
diff --git a/pages/Index/index.vue b/pages/Index/index.vue
index 602760e..14d7921 100644
--- a/pages/Index/index.vue
+++ b/pages/Index/index.vue
@@ -50,6 +50,7 @@
       </view>
     </view>
   </uv-popup>
+  <uv-parse content="<div></div>"></uv-parse>
 </template>
 
 <script>
diff --git a/pages/Service/index.vue b/pages/Service/index.vue
index a6fd144..80bac5e 100644
--- a/pages/Service/index.vue
+++ b/pages/Service/index.vue
@@ -100,7 +100,7 @@
             <u-text :text="mapData.address" color="#AFB5BE" size="28"></u-text>
           </view>
           <view class="button" style="width:50rpx;height:50rpx;">
-            <u-image mode="widthFix" width="=50" height="50"  :src="staticImage.position" @click="callPostion"></u-image>
+            <u-image mode="widthFix" width="=50" height="50"  :src="staticImage.position" @click="callPosition"></u-image>
           </view>
         </view>
         <view class="pop-add"></view>
@@ -137,7 +137,7 @@
                 <view class="icon" style="margin-right:20rpx;">
                   <u-image mode="widthFix" width="32" height="32" :src="staticImage.listPosition"></u-image>
                 </view>
-                <view class="value col " @click="callLocal(item.lat,item.lng)">
+                <view class="value col " @click="callLocal(item.lat,item.lng,item.name)">
                   <u-text :text="item.address" color="#AFB5BE" size="28" custom-style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; "></u-text>
                 </view>
               </view>
@@ -506,7 +506,7 @@ export default {
     afterCreateMap(){
       this.getServiceList(true);
     },
-    callPostion(){
+    callPosition(){
       const latitude=parseFloat(this.mapData.lat);
       const longitude=parseFloat(this.mapData.lng);
       uni.openLocation({
@@ -515,13 +515,13 @@ export default {
         name:this.mapData.name,
       })
     },
-    callLocal(lat,lng){
+    callLocal(lat,lng,name = ''){
       const latitude=parseFloat(lat);
       const longitude=parseFloat(lng);
       uni.openLocation({
         latitude:latitude,
         longitude:longitude,
-        name:this.mapData.name,
+        name:name,
       })
     },
     callPhone(phone){
diff --git a/utils/functions.js b/utils/functions.js
index 97deead..2a86565 100644
--- a/utils/functions.js
+++ b/utils/functions.js
@@ -76,7 +76,7 @@ const api = {
 			      address: details.activedeta.city+details.activedeta.address, //地址参数，例：固定地址，address: '北京市海淀区彩和坊路海淀西大街74号'
 			      success: function(res) {//成功后的回调
 					console.log(res);
-					relove(res.result.location)
+					relove(res.result)
 			      },
 			      fail: function(error) {
 			        console.error(error);