预约

static/ancss/an.css

@@ -694,10 +694,11 @@ s首页菜单
 .yue_dgimg_size{width: 30rpx; height: 30rpx; }
 .yue_jq_box .yue_dgimg_size{ margin-right:10rpx }
 
-.btn_unke, .btn_ke, .btn_man, .btn_jing{margin-left: 30rpx; padding: 10rpx 20rpx; line-height: normal; background: #aaa; font-size: 28rpx; color: #fff;}
-.btn_ke{ background-color:rgb(70,132,255) ; }
-.btn_man{background-color:rgb(255, 77, 71) ; }
-.btn_jing{background-color:#fe9900 ; }
+.btn_unke, .btn_ke, .btn_man, .btn_jing{margin-left: 30rpx; padding: 10rpx 20rpx; line-height: normal; background: #ccc; font-size: 28rpx; color: #fff;}
+.btn_ke{ background-color:rgb(70,132,255) ;width: 150rpx; }
+.btn_man{background-color:rgb(255, 77, 71) ; width: 150rpx;}
+.btn_jing{background-color:#fe9900 ; width: 150rpx;}
+.btn_unke{display: inline-block; width: 150rpx;}
 
 .xqi_2{padding-top:360rpx; margin: 0 30rpx;}
 .an_box_4 .yue_jq_box:last-child{ border:none}
@@ -708,8 +709,10 @@ s首页菜单
 .yue_jq_dji, .yue_jq_type{ display: inline-block; padding: 5rpx 15rpx; margin-right: 10rpx;  font-size: 24rpx; color: #333; background: #ffaa00; border-radius: 5rpx;}
 .yue_jq_type{ background: none; border:1px solid #eee}
 .yue_btn_2{ margin-top:20rpx; text-align: right;}
-.yue_btn_2 .btn_ke{ display: inline-block; padding-left: 20rpx; padding-right: 20rpx; border-radius: 10rpx;}
 
+.yue_btn_2 .btn_ke{ display: inline-block; padding-left: 20rpx; padding-right: 20rpx; border-radius: 10rpx;}
+.yue_tip_text{font-size: 28rpx; color: #999;}
+.yue_tip_text text{margin-right: 30rpx;}
 .erm_bx{position: absolute; z-index: 13; top:30rpx; right: 30rpx;}
 .shef_img{ width: 100%; height: 304rpx;}
 .yue_ipt_zj{ background: #f5f5f5; margin-top:15rpx}

sunPackIndex/scenic/subscribe/yuyue/yue_time_js.vue

@@ -44,11 +44,11 @@
 									<image src="../../../../static/images/icon_time.png" class="yue_dgimg_size"></image>
 									<text class="at_t">预约时间：{{item.startTime}}-{{item.endTime}}</text>
 								</view>
-								<view class="an_t_2">已预约：{{item.reservedQuantity}} 可预约：{{item.reservableQuantity}}
+								<view class="yue_tip_text"><text>已预约：{{item.reservedQuantity}}</text><text>可预约：{{item.reservableQuantity-item.reservedQuantity}}</text>
 								</view>
 							</view>
 							<view v-if="item.yState == 'OVERDUE'"><button class="btn_unke">已过时间</button></view>
-							<view v-if="item.yState == 'FULL'"><button class="btn_man">已满</button></view>
+							<view v-if="item.yState == 'FULL'"><button class="btn_man">预约已满</button></view>
 							<view v-if="item.yState == 'YES'" @tap="gotoDetail(item)"><button
 									class="btn_ke">可预约</button></view>
 						</view>
@@ -73,7 +73,6 @@
 			};
 		},
 		onLoad(options) {
-			// uni.setStorageSync("userid",64)
 			var scenicId = this.$param.scenicId;
 			this.scenicId = scenicId;
 			this.getDetail(scenicId);
@@ -128,17 +127,18 @@
 								reservableQuantity: item.reservableQuantity,
 								reservedQuantity: item.reservedQuantity,
 								yState: this.getDataState(getData, item),
-								externalId:item.externalId
+								externalId: item.externalId
 							}
 						})
-
 					}
 				});
 			},
+			//预约日期 切换
 			getDateIndex(data, index) {
 				this.changeIndex = index;
 				this.getDateList(data)
 			},
+			//预约日期 状态
 			getDataState(getData, data) {
 				let newToday = this.formatData(new Date())
 				let today = this.numData(newToday)
@@ -174,6 +174,7 @@
 				}
 				return newYear + '-' + newMonth + '-' + newDate
 			},
+			//时间格式化
 			formatTime(time) {
 				var hour = time.split(":")[0];
 				var min = time.split(":")[1];
@@ -199,7 +200,6 @@
 				}
 				return state
 			},
-
 			//将时分秒转为时间戳
 			time_to_sec(time) {
 				if (time !== null) {
@@ -210,7 +210,6 @@
 					return s;
 				}
 			},
-
 			//预约详情
 			gotoDetail(item) {
 				let data = {