From 1ea416f0156e751778b8e9b4d01690c22cfbc568 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 18:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9D=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/models/get.js     |  3 +++
 src/core/models/order.js   |  3 +++
 src/pages/get/detail.vue   | 14 +++++++++++++-
 src/pages/order/detail.vue | 16 +++++++++++++++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/core/models/get.js b/src/core/models/get.js
index 1b5c822..b70f7d2 100644
--- a/src/core/models/get.js
+++ b/src/core/models/get.js
@@ -73,6 +73,7 @@ export default {
                                 address: response.data.address.address,
                                 detail: response.data.address.doorplate,
                                 name: response.data.address.name,
+                                gender: response.data.address.sex,
                                 mobile: response.data.address.mobil,
                                 lng: response.data.address.lng,
                                 lat: response.data.address.lat,
@@ -95,6 +96,7 @@ export default {
                                 address: response.data.address_a.address,
                                 detail: response.data.address_a.doorplate,
                                 name: response.data.address_a.name,
+                                gender: response.data.address_a.sex,
                                 mobile: response.data.address_a.mobil,
                                 lng: response.data.address_a.lng,
                                 lat: response.data.address_a.lat,
@@ -103,6 +105,7 @@ export default {
                                 address: response.data.address_b.address,
                                 detail: response.data.address_b.doorplate,
                                 name: response.data.address_b.name,
+                                gender: response.data.address_b.sex,
                                 mobile: response.data.address_b.mobil,
                                 lng: response.data.address_b.lng,
                                 lat: response.data.address_b.lat,
diff --git a/src/core/models/order.js b/src/core/models/order.js
index f68fd28..f0ac15e 100644
--- a/src/core/models/order.js
+++ b/src/core/models/order.js
@@ -116,6 +116,7 @@ export default {
                                 address: response.data.address.address,
                                 detail: response.data.address.doorplate,
                                 name: response.data.address.name,
+                                gender: response.data.address.sex,
                                 mobile: response.data.address.mobil,
                                 lng: response.data.address.lng,
                                 lat: response.data.address.lat,
@@ -138,6 +139,7 @@ export default {
                                 address: response.data.address_a.address,
                                 detail: response.data.address_a.doorplate,
                                 name: response.data.address_a.name,
+                                gender: response.data.address_a.sex,
                                 mobile: response.data.address_a.mobil,
                                 lng: response.data.address_a.lng,
                                 lat: response.data.address_a.lat,
@@ -146,6 +148,7 @@ export default {
                                 address: response.data.address_b.address,
                                 detail: response.data.address_b.doorplate,
                                 name: response.data.address_b.name,
+                                gender: response.data.address_b.sex,
                                 mobile: response.data.address_b.mobil,
                                 lng: response.data.address_b.lng,
                                 lat: response.data.address_b.lat,
diff --git a/src/pages/get/detail.vue b/src/pages/get/detail.vue
index 54453b9..dbbb008 100644
--- a/src/pages/get/detail.vue
+++ b/src/pages/get/detail.vue
@@ -59,7 +59,7 @@
                         <view>
                             <view class="contact limit-line clamp-1">
                                 <text class="name">
-                                    {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
+                                    {{ order.address.name }}({{ order.address.gender == "男" ? "先生" : "女士" }})
                                 </text>
                                 <text class="mobile">{{ order.address.mobile }}</text>
                             </view>
@@ -89,6 +89,12 @@
                     <view class="address-box" @click="openLocation(order.pickupAddress.lng, order.pickupAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
+                            <view class="contact limit-line clamp-1">
+                                <text class="name">
+                                    {{ order.pickupAddress.name }}({{ order.pickupAddress.gender == "男" ? "先生" : "女士" }})
+                                </text>
+                                <text class="mobile">{{ order.pickupAddress.mobile }}</text>
+                            </view>
                             <view class="detail">
                                 <text>{{ order.pickupAddress.address }}{{ order.pickupAddress.detail }}</text>
                             </view>
@@ -100,6 +106,12 @@
                     <view class="address-box" @click="openLocation(order.unloadAddress.lng, order.unloadAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
+                            <view class="contact limit-line clamp-1">
+                                <text class="name">
+                                    {{ order.unloadAddress.name }}({{ order.unloadAddress.gender == "男" ? "先生" : "女士" }})
+                                </text>
+                                <text class="mobile">{{ order.unloadAddress.mobile }}</text>
+                            </view>
                             <view class="detail">
                                 <text>{{ order.unloadAddress.address }}{{ order.unloadAddress.detail }}</text>
                             </view>
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 101e4ea..93cced1 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -58,7 +58,7 @@
                         <view>
                             <view class="contact limit-line clamp-1">
                                 <text class="name">
-                                    {{ order.address.name }}({{ order.address.sex == "男" ? "先生" : "女士" }})
+                                    {{ order.address.name }}({{ order.address.gender == "男" ? "先生" : "女士" }})
                                 </text>
                                 <text class="mobile">{{ order.address.mobile }}</text>
                                 <text class="call" @click.stop="utils.callPhone(order.address.mobile)">拨号</text>
@@ -90,6 +90,13 @@
                     <view class="address-box" @click="openLocation(order.pickupAddress.lng, order.pickupAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
+                            <view class="contact limit-line clamp-1">
+                                <text class="name">
+                                    {{ order.pickupAddress.name }}({{ order.pickupAddress.gender == "男" ? "先生" : "女士" }})
+                                </text>
+                                <text class="mobile">{{ order.pickupAddress.mobile }}</text>
+                                <text class="call" @click.stop="utils.callPhone(order.pickupAddress.mobile)">拨号</text>
+                            </view>
                             <view class="detail">
                                 <text>{{ order.pickupAddress.address }}{{ order.pickupAddress.detail }}</text>
                             </view>
@@ -101,6 +108,13 @@
                     <view class="address-box" @click="openLocation(order.unloadAddress.lng, order.unloadAddress.lat)">
                         <text class="iconfont icon-dingwei"></text>
                         <view>
+                            <view class="contact limit-line clamp-1">
+                                <text class="name">
+                                    {{ order.unloadAddress.name }}({{ order.unloadAddress.gender == "男" ? "先生" : "女士" }})
+                                </text>
+                                <text class="mobile">{{ order.unloadAddress.mobile }}</text>
+                                <text class="call" @click.stop="utils.callPhone(order.unloadAddress.mobile)">拨号</text>
+                            </view>
                             <view class="detail">
                                 <text>{{ order.unloadAddress.address }}{{ order.unloadAddress.detail }}</text>
                             </view>