From 3233576b46a06ed33b4be47026f58f68c4d6b01b Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Sun, 27 Oct 2024 14:16:10 +0800
Subject: [PATCH] 1

---
 components/bookingOrderCard.vue           | 10 +++++-----
 pages-order/appointOrder/appointOrder.vue |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/bookingOrderCard.vue b/components/bookingOrderCard.vue
index 6a21048..653cb4c 100644
--- a/components/bookingOrderCard.vue
+++ b/components/bookingOrderCard.vue
@@ -32,13 +32,13 @@
 <!--      </view>-->
       <view class="baseInfo">
         <view>
-          客户信息：{{ order.userName }} {{ order.userPhone }}
+          客户信息：{{ order.userName }} {{ order.userMobile }}
         </view>
-        <view v-if="order.appointDate">
-          预约时间：{{ order.appointDate }}
+        <view v-if="order.bookingTime">
+          预约时间：{{ order.bookingTime }}
         </view>
-        <view v-if="order.counselorName">
-          服务顾问：{{ order.counselorName }}
+        <view v-if="order.adviserName">
+          服务顾问：{{ order.adviserName }}
         </view>
       </view>
 <!--      <view class="footer">-->
diff --git a/pages-order/appointOrder/appointOrder.vue b/pages-order/appointOrder/appointOrder.vue
index 467a2b1..1e4571b 100644
--- a/pages-order/appointOrder/appointOrder.vue
+++ b/pages-order/appointOrder/appointOrder.vue
@@ -34,6 +34,7 @@ import VNavigationBar from '@/components/VNavigationBar.vue'
 import OrderCard from "@/components/orderCard.vue";
 import request from "@/utils/request";
 import BookingOrderCard from "@/components/bookingOrderCard.vue";
+import {formatTimestamp, formatTimestampCustom} from "@/utils/utils";
 
 export default {
   components: {
@@ -78,8 +79,7 @@ export default {
               console.log(res);
               this.orderList = res.data
               this.orderList.map((item) => {
-                item.userPhone = item.userMobile
-                item.appointDate = item.bookingTime
+               item.bookingTime = formatTimestamp( item.bookingTime)
               })
             })
           }