From e4f18a08ace9a36ca00d3451dbb6fef109bc62bc Mon Sep 17 00:00:00 2001
From: kuaileWu <1432334894@qq.com>
Date: Tue, 30 Apr 2024 16:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/preBookList.vue | 12 ++++++------
 pages/index/index.vue      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/preBookList.vue b/components/preBookList.vue
index 045fc2e..7b46513 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -3,13 +3,13 @@
 	<view class="list btPadding" v-if="dataList.length>0">
 			<view :class="'item '+item" v-for="(item, key) in dataList" @click="toBookDetail(item)">
 				<view class="left">
-					<view class="title PfScMedium"><text v-if="item.real_name || item.username">{{item.real_name ? item.real_name:item.username}}</text><text v-else>无</text></view>
-					<view class="date">{{item.date}} {{getDayOfWeek(item.date)}}  {{item.start_time}}-{{item.end_time}}</view>
-					<view class="loction">{{item.visit_hospital.hospital_name}} {{item.visit_hospital.hospital_dept_name}}</view>
+					<view class="title PfScMedium"><text v-if="item.visitor_name">{{item.visitor_name}}</text><text v-else>无</text></view>
+					<view class="date">{{item.visit_date}} {{getDayOfWeek(item.visit_date)}}  {{item.visit_time}}</view>
+					<view class="loction">{{item.h_name}} {{item.depart_name}}</view>
 				</view>
 				<view class="right">
 					<view :class="statusList[item.status]+' status'"><view class="over">{{statusDescList[item.status]}}</view></view>
-					<view class="queue-num" v-if="statusList[item.status]=='status_wait' && item.wait_count"><view>前方<text class="PfScSemibold">{{item.wait_count}}</text>人</view> </view>
+					<view class="queue-num" v-if="statusList[item.status]=='status_wait' && item.wait_visit_cout && item.wait_visit_cout>0"><view>前方<text class="PfScSemibold">{{item.wait_visit_cout}}</text>人</view> </view>
 				</view>
 			</view>
 		</view>
@@ -31,8 +31,8 @@ export default {
   data() {
     return {
 		cssUrl:this.cssUrl,
-		statusList:['status_wait', 'status_ing', 'status_out_num', 'status_expire', 'status_down'],
-		statusDescList:['候诊', '就诊中', '过号', '已过期', '已完成']
+		statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire'],
+		statusDescList:['候诊', '就诊中', '已完成', '过号', '已过期']
     }
   },
   methods: {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ccfdf34..f9962b0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -71,7 +71,7 @@
 			</view>
 		</view>
 		<pre-book-list class="preg-books" :dataList="recentAppoint"></pre-book-list>
-		
+
 		<tabbar current="1"></tabbar>
 	</view>
 </template>