From 3f0780d10d4f636ebaaea775e9ff676cc8d71fae 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:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/item.vue |  2 +-
 src/core/apis.js              |  8 ++++++--
 src/pages/order/detail.vue    | 18 +++++++++++++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/order/item.vue b/src/components/order/item.vue
index 1130491..0bfd7e2 100644
--- a/src/components/order/item.vue
+++ b/src/components/order/item.vue
@@ -32,7 +32,7 @@
             <view class="order-desc-row">
                 <text class="title">服务时间：</text>
                 <text class="text">{{ order.serviceTime }}</text>
-                <block v-if="order.listType == 't2'">
+                <block v-if="order.state == 0 || order.state == 1 || order.state == 2">
                     <view class="btn" @click.stop="changeTime">
                         <text class="iconfont icon-bianji"></text>
                         <text class="btn-desc">修改时间</text>
diff --git a/src/core/apis.js b/src/core/apis.js
index 54a85a0..ff25b4f 100644
--- a/src/core/apis.js
+++ b/src/core/apis.js
@@ -287,7 +287,9 @@ export default {
         },
         changeServiceTime: {
             t1: {
-                url: "",
+                url: "/a",
+                showLoading: true,
+                auth: true,
             },
             t2: {
                 url: "/wxapp/orderb/saveordrbyid",
@@ -295,7 +297,9 @@ export default {
                 auth: true,
             },
             t3: {
-                url: ""
+                url: "/b",
+                showLoading: true,
+                auth: true,
             }
         },
         chooseWorker: {
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 346bf5d..c879409 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -79,7 +79,7 @@
                             <view class="info-row">
                                 <text class="title">服务时间：</text>
                                 <text class="text">{{ order.serviceTime }}</text>
-                                <block v-if="order.listType == 't2'">
+                                <block v-if="order.state == 0 || order.state == 1 || order.state == 2">
                                     <view class="btn" @click.stop="changeTime(order)">
                                         <text class="iconfont icon-bianji"></text>
                                         <text class="btn-desc">修改时间</text>
@@ -137,6 +137,14 @@
                             <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 == 1 ? "先生" : "女士"
+                                            }})
+                                        </text>
+                                        <text class="mobile">{{ order.pickupAddress.mobile }}</text>
+                                    </view>
                                     <view class="detail">
                                         <text>{{ order.pickupAddress.address }}{{ order.pickupAddress.detail }}</text>
                                     </view>
@@ -148,6 +156,14 @@
                             <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 == 1 ? "先生" : "女士"
+                                            }})
+                                        </text>
+                                        <text class="mobile">{{ order.unloadAddress.mobile }}</text>
+                                    </view>
                                     <view class="detail">
                                         <text>{{ order.unloadAddress.address }}{{ order.unloadAddress.detail }}</text>
                                     </view>