From ee91e684b606b51978d30a8d5b24e3890b42a2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com>
Date: Sat, 1 Apr 2023 17:29:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=BC=80=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/models/get.js     | 20 ++++++++++++++++++--
 src/core/models/order.js   | 20 ++++++++++++++++++--
 src/pages/get/detail.vue   | 16 +++++++++++-----
 src/pages/order/detail.vue | 18 ++++++++++++------
 4 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/core/models/get.js b/src/core/models/get.js
index a10d5e6..1b5c822 100644
--- a/src/core/models/get.js
+++ b/src/core/models/get.js
@@ -74,6 +74,8 @@ export default {
                                 detail: response.data.address.doorplate,
                                 name: response.data.address.name,
                                 mobile: response.data.address.mobil,
+                                lng: response.data.address.lng,
+                                lat: response.data.address.lat,
                             },
                         };
                         if (options.listType == "t1") {
@@ -89,8 +91,22 @@ export default {
                             cate: "配送订单",
                             createTime: response.data.times,
                             serviceTime: response.data.starttime,
-                            pickupAddress: response.data.address,
-                            unloadAddress: response.data.addressb,
+                            pickupAddress: {
+                                address: response.data.address_a.address,
+                                detail: response.data.address_a.doorplate,
+                                name: response.data.address_a.name,
+                                mobile: response.data.address_a.mobil,
+                                lng: response.data.address_a.lng,
+                                lat: response.data.address_a.lat,
+                            },
+                            unloadAddress: {
+                                address: response.data.address_b.address,
+                                detail: response.data.address_b.doorplate,
+                                name: response.data.address_b.name,
+                                mobile: response.data.address_b.mobil,
+                                lng: response.data.address_b.lng,
+                                lat: response.data.address_b.lat,
+                            },
                             state: response.data.status,
                             price: response.data.money,
                         };
diff --git a/src/core/models/order.js b/src/core/models/order.js
index 4f7a9a5..f68fd28 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -117,6 +117,8 @@ export default {
                                 detail: response.data.address.doorplate,
                                 name: response.data.address.name,
                                 mobile: response.data.address.mobil,
+                                lng: response.data.address.lng,
+                                lat: response.data.address.lat,
                             },
                         };
                         if (options.listType == "t1") {
@@ -132,8 +134,22 @@ export default {
                             cate: "货运订单",
                             createTime: response.data.times,
                             serviceTime: response.data.starttime,
-                            pickupAddress: response.data.address,
-                            unloadAddress: response.data.addressb,
+                            pickupAddress: {
+                                address: response.data.address_a.address,
+                                detail: response.data.address_a.doorplate,
+                                name: response.data.address_a.name,
+                                mobile: response.data.address_a.mobil,
+                                lng: response.data.address_a.lng,
+                                lat: response.data.address_a.lat,
+                            },
+                            unloadAddress: {
+                                address: response.data.address_b.address,
+                                detail: response.data.address_b.doorplate,
+                                name: response.data.address_b.name,
+                                mobile: response.data.address_b.mobil,
+                                lng: response.data.address_b.lng,
+                                lat: response.data.address_b.lat,
+                            },
                             state: response.data.status,
                             price: response.data.money,
                         };
diff --git a/src/pages/get/detail.vue b/src/pages/get/detail.vue
index 3728ce7..54453b9 100644
--- a/src/pages/get/detail.vue
+++ b/src/pages/get/detail.vue
@@ -54,7 +54,7 @@
                 </view>
                 <view class="detail-section">
                     <view class="section-title">上门地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.address.lng, order.address.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="contact limit-line clamp-1">
@@ -86,22 +86,22 @@
                 </view>
                 <view class="detail-section">
                     <view class="section-title">取货地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.pickupAddress.lng, order.pickupAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="detail">
-                                <text>{{ order.pickupAddress }}</text>
+                                <text>{{ order.pickupAddress.address }}{{ order.pickupAddress.detail }}</text>
                             </view>
                         </view>
                     </view>
                 </view>
                 <view class="detail-section">
                     <view class="section-title">卸货地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.unloadAddress.lng, order.unloadAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="detail">
-                                <text>{{ order.unloadAddress }}</text>
+                                <text>{{ order.unloadAddress.address }}{{ order.unloadAddress.detail }}</text>
                             </view>
                         </view>
                     </view>
@@ -177,6 +177,12 @@ export default {
     onReachBottom() {},
     onPullDownRefresh() {},
     methods: {
+        openLocation(lng, lat) {
+            uni.openLocation({
+                longitude: parseFloat(lng),
+                latitude: parseFloat(lat),
+            });
+        },
         copyOrderId(orderId) {
             const that = this;
             uni.setClipboardData({
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 50cd4a3..101e4ea 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -53,7 +53,7 @@
                 </view>
                 <view class="detail-section">
                     <view class="section-title">上门地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.address.lng, order.address.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="contact limit-line clamp-1">
@@ -61,7 +61,7 @@
                                     {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
                                 </text>
                                 <text class="mobile">{{ order.address.mobile }}</text>
-                                <text class="call" @click="utils.callPhone(order.address.mobile)">拨号</text>
+                                <text class="call" @click.stop="utils.callPhone(order.address.mobile)">拨号</text>
                             </view>
                             <view class="detail">
                                 <text>{{ order.address.address }}{{ order.address.detail }}</text>
@@ -87,22 +87,22 @@
                 </view>
                 <view class="detail-section">
                     <view class="section-title">取货地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.pickupAddress.lng, order.pickupAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="detail">
-                                <text>{{ order.pickupAddress }}</text>
+                                <text>{{ order.pickupAddress.address }}{{ order.pickupAddress.detail }}</text>
                             </view>
                         </view>
                     </view>
                 </view>
                 <view class="detail-section">
                     <view class="section-title">卸货地址</view>
-                    <view class="address-box">
+                    <view class="address-box" @click="openLocation(order.unloadAddress.lng, order.unloadAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
                             <view class="detail">
-                                <text>{{ order.unloadAddress }}</text>
+                                <text>{{ order.unloadAddress.address }}{{ order.unloadAddress.detail }}</text>
                             </view>
                         </view>
                     </view>
@@ -175,6 +175,12 @@ export default {
     onReachBottom() {},
     onPullDownRefresh() {},
     methods: {
+        openLocation(lng, lat) {
+            uni.openLocation({
+                longitude: parseFloat(lng),
+                latitude: parseFloat(lat),
+            });
+        },
         copyOrderId(orderId) {
             const that = this;
             uni.setClipboardData({