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 @@
上午预约
- {{item}}
- ({{time2remain[item]>0?time2remain[item]:'满'}})
+ {{item.split('-')[0]}}
+ {{time2remain[item]>0?("(名额余"+time2remain[item]+")"):(time2remainExpire[item]?'':'(名额已满)')}}
@@ -35,8 +35,8 @@
下午预约
- {{item}}
- ({{time2remain[item]?time2remain[item]:'满'}})
+ {{item.split('-')[0]}}
+ {{time2remain[item]>0?("(名额余"+time2remain[item]+")"):(time2remainExpire[item]?'':'(名额已满)')}}
@@ -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 @@
看诊时间:
- {{times.date}} {{times.time_desc}} {{times.time_interval}}
+ {{times.date}} {{times.time_desc}} {{times.time_interval?(times.time_interval.split('-')[0]) :'' }}