up

pages/index/index.vue

@@ -91,7 +91,7 @@
 										<view class="book-box-row-timeitem-txt" v-if="item.remain_count>0">
 											{{item.remain_count}}张
 										</view>
-										<view class="book-box-row-timeitem-txt" v-else>不可预约</view>
+										<view class="book-box-row-timeitem-txt" v-else>已约满</view>
 									</block>
 									<block v-else>
 										<view class="book-box-row-timeitem-txt" >不可预约</view>
@@ -301,7 +301,7 @@
 					return false
 				}
 				if (mod.remain_count == 0) {
-					this.util.toast("该时段已不可预约");
+					this.util.toast("该时段已约满了");
 					return false
 				}
 				for (var m of this.currentDate.rules) {

pages/park/book.vue

@@ -8,7 +8,7 @@
 				<u--form labelPosition="top" labelWidth="120px" :model="form" ref="form">
 					<u-form-item label="预约入场时间" labelPosition="top" borderBottom>
 
-						<view @click="handleSelectTime" style="color: #EF9525;font-size: 24rpx;">
+						<view  style="color: #EF9525;font-size: 24rpx;">
 							{{(form.time?$u.timeFormat(_formTime, 'yyyy年mm月dd日 hh:MM'):'请选择入场时间>')}}
 						</view>
 						<u-datetime-picker :show="showSelecttime" closeOnClickOverlay @close="cancelTime"

pages/park/index.vue

@@ -52,16 +52,25 @@
 
 										</view>
 										<text style="font-size: 24rpx;color: #828282;">（充电桩空闲0）</text>
+									</view>
+									<view class="parkbox-item  flex-row align-center" style=""
+										@click="handleSelectPark(3)" :class="(currentPark==3?'parkbox-item-on':'')"
+										v-if="remain_special_park>0">
+										<view class="parkbox-item-status" v-if="currentPark==3">
+											<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
+										</view>
+										<text class="iconfont icon-tingchechang1" style="font-size: 28rpx;"></text>
+										<view>
+											<text>残疾人车位：{{remain_special_park}}</text>
+										</view>
 									</view>
+									
 									<view class="parkbox-item  flex-row align-center" style=""
-										@click="handleSelectPark(3)" :class="(currentPark==3?'parkbox-item-on':'')"
-										v-if="remain_special_park>0">
-										<view class="parkbox-item-status" v-if="currentPark==3">
-											<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
-										</view>
+										v-if="remain_special_park<=0&&remain_big_park<=0&&remain_small_park<=0">
+										
 										<text class="iconfont icon-tingchechang1" style="font-size: 28rpx;"></text>
 										<view>
-											<text>残疾人车位：{{remain_special_park}}</text>
+											<text>暂无可选停车位</text>
 										</view>
 									</view>
 								</view>
@@ -140,7 +149,7 @@
 				distance: 0,
 				info: {},
 				covers: [],
-				currentPark: 1,
+				currentPark: 0,
 				btnDisabled: false,
 				showSelectorder: false,
 				listOrder: [],
@@ -153,8 +162,8 @@
 					userlongitude: 120.626022
 				},
 				remain_big_park: 0,
-				remain_small_park: 0,
-				remain_special_park:0
+				remain_small_park: 0,
+				remain_special_park: 0
 			}
 		},
 		onLoad() {
@@ -285,7 +294,7 @@
 						that.info.latitude = parseFloat(res.detail.latitude);
 						that.info.longitude = parseFloat(res.detail.longitude);
 						that.remain_big_park = res.remain_big_park;
-						that.remain_small_park = res.remain_small_park;
+						that.remain_small_park = res.remain_small_park;
 						that.remain_special_park = res.remain_special_park;
 						var mod = {
 							latitude: that.info.latitude,
@@ -309,6 +318,9 @@
 				if (this.selectInfo.orderid === 0) {
 					this.util.toast("请选择预约的活动或者预约的参观");
 					return false;
+				} else if (this.currentPark === 0) {
+					this.util.toast("请选择停车位");
+					return false;
 				} else {
 					var json = escape(JSON.stringify(this.selectInfo));
 					uni.navigateTo({

pages/visit/book.vue

@@ -48,7 +48,7 @@
 
 							<view class="book-box-timerow">
 								<view class="book-box-row-timeitem" v-for="(item,index) in currentDate.rules"
-									:class="{'book-box-row-timeitem-on':item.checked,'timeitem-none':item.remain_count==0}"
+									:class="{'book-box-row-timeitem-on':item.checked,'timeitem-none':item.remain_count==0,'timeitem-none':item.isCanbook==false}"
 									:key="index" @click="handleSelectTime(index)">
 									<view class="book-box-row-timeitem-status" v-if="item.checked">
 										<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
@@ -57,7 +57,7 @@
 									<view class="book-box-row-timeitem-txt" v-if="item.remain_count>0">
 										{{item.remain_count}}张
 									</view>
-									<view class="book-box-row-timeitem-txt" v-else>不可预约</view>
+									<view class="book-box-row-timeitem-txt" v-else>已约满</view>
 								</view>
 							</view>
 						</view>
@@ -1001,6 +1001,7 @@
 			},
 			loadDefaultTime(rules) {
 				var that = this;
+				var nt = new Date();
 				that.currentTime = {};
 				let isDefault = false;
 				for (var mod of rules) {
@@ -1011,11 +1012,15 @@
 							mod.checked = true;
 							that.currentTime = that.bcurrentTime;
 						}
-					} else {
-						if (!isDefault && mod.remain_count > 0) {
-							isDefault = true;
-							mod.checked = true;
-							that.currentTime = mod;
+					} else {
+						
+						mod.endtime = that.currentDate.date + " " + mod.end_time;
+						var isCanbook = that.$moment(nt).isBefore(mod.endtime);
+						mod.isCanbook = isCanbook;
+						if (!isDefault && mod.remain_count > 0 && isCanbook) {
+							isDefault = true;
+							mod.checked = true;
+							that.currentTime = mod;
 						}
 					}