From 2cc690563362b0c8a7f01f99729c448ed99c8d6a Mon Sep 17 00:00:00 2001
From: kuaileWu <1432334894@qq.com>
Date: Wed, 5 Mar 2025 18:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AB=AF=E7=BA=A6=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/bookBox.vue    | 24 +++++++++++++++++++-----
 pages/prebook/prebook.vue |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/components/bookBox.vue b/components/bookBox.vue
index 63eac5c..1b4b8e9 100644
--- a/components/bookBox.vue
+++ b/components/bookBox.vue
@@ -20,8 +20,8 @@
 			<view class="title PfScMedium">上午预约</view>
 			<view class="inner-wrapper" v-if="timeList.am.length>0">
 				<view v-for="(item,key) in timeList.am" :class="'son PfScMedium'+( time2remain[item] <=0?' disable':'')" @click="confirmSubmit(item, 1)" :hover-class="time2remain[item]>0?'hover2':''">
-					{{item}}
-					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">（{{time2remain[item]>0?time2remain[item]:'满'}}）</text>
+					{{item.split('-')[0]}}
+					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">{{time2remain[item]>0?("（名额余"+time2remain[item]+"）"):(time2remainExpire[item]?'':'（名额已满）')}}</text>
 				</view>
 			</view>
 
@@ -35,8 +35,8 @@
 			<view class="title PfScMedium">下午预约</view>
 			<view class="inner-wrapper" v-if="timeList.pm.length>0">
 				<view :class="'son PfScMedium'+(time2remain[item]<=0?' disable':'')" @click="confirmSubmit(item, 2)" :hover-class="time2remain[item]>0?'hover2':''" v-for="(item,key) in timeList.pm">
-					{{item}}
-					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">（{{time2remain[item]?time2remain[item]:'满'}}）</text>
+					{{item.split('-')[0]}}
+					<text v-if="visitorList.length > time2remain[item] || time2remain[item]<=0">{{time2remain[item]>0?("（名额余"+time2remain[item]+"）"):(time2remainExpire[item]?'':'（名额已满）')}}</text>
 				</view>
 			</view>
 			<view class="empty" v-else>
@@ -80,7 +80,9 @@ export default {
 		timeList:true,
 		disable:true,
 		selectDay:-1,
-		RegistrationTimeList:[]
+		RegistrationTimeList:[],
+		nowtime:'',
+		time2remainExpire:[],
     }
   },
   methods: {
@@ -88,7 +90,19 @@ export default {
 	// dataInit(firstRegistrationTime,time2remain,chooseDate) {//上下午时间
 		let firstRegistrationTime = allDate['date2time']
 		this.RegistrationTimeList = allDate['date2work']
+		this.nowtime = allDate['nowtime']
 		this.time2remain = allDate['time2remain'];
+		for (var key in this.time2remain) {
+			if (this.time2remain.hasOwnProperty(key)) {
+				var element = this.time2remain[key];
+				var times = key.split('-')
+				var start_times = chooseDate+' '+times[0]
+				var end_times = chooseDate+' '+times[1]
+				this.time2remainExpire[key] = 0
+				if(this.nowtime >= end_times) this.time2remainExpire[key] = 1
+			}
+		}
+
 		if(chooseDate){
 			this.selectDay = chooseDate;
 		}else{
diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue
index 59b63a3..ba3d03a 100644
--- a/pages/prebook/prebook.vue
+++ b/pages/prebook/prebook.vue
@@ -35,7 +35,7 @@
 			</view>
 			<view class="item">
 				<view class="left">看诊时间：</view>
-				<view class="right orange">{{times.date}} {{times.time_desc}} {{times.time_interval}}</view>
+				<view class="right orange">{{times.date}} {{times.time_desc}} {{times.time_interval?(times.time_interval.split('-')[0]) :'' }}</view>
 			</view>
 
 			<view class="btns-box flex">