Browse Source

no message

xiaoxin 2 years ago
parent
commit
0209411f02

+ 5 - 2
pages/detail/detail.vue

@@ -70,7 +70,7 @@
 				end-text="离店"
 				end-text="离店"
 				color="#096562"
 				color="#096562"
 				confirmColor="#096562"
 				confirmColor="#096562"
-				:startDate="startTime"
+				:startDate="earlyTime"
 				@confirm="handleConfirm"
 				@confirm="handleConfirm"
 			/>
 			/>
 
 
@@ -192,7 +192,9 @@ export default {
 			// 入住时间 YYYY-MM-DD
 			// 入住时间 YYYY-MM-DD
 			startTime: '',
 			startTime: '',
 			// 离店时间 YYYY-MM-DD
 			// 离店时间 YYYY-MM-DD
-			endTime: ''
+			endTime: '',
+			// 日历可以选择的最早日期
+			earlyTime: ''
 		}
 		}
 	},
 	},
 	onLoad(options) {
 	onLoad(options) {
@@ -367,6 +369,7 @@ export default {
 			this.startTime = `${today.getFullYear()}-${(today.getMonth() + 1).toString().padStart(2, 0)}-${today.getDate().toString().padStart(2, 0)}`
 			this.startTime = `${today.getFullYear()}-${(today.getMonth() + 1).toString().padStart(2, 0)}-${today.getDate().toString().padStart(2, 0)}`
 			this.endTime = `${tomorrow.getFullYear()}-${(tomorrow.getMonth() + 1).toString().padStart(2, 0)}-${tomorrow.getDate().toString().padStart(2, 0)}`
 			this.endTime = `${tomorrow.getFullYear()}-${(tomorrow.getMonth() + 1).toString().padStart(2, 0)}-${tomorrow.getDate().toString().padStart(2, 0)}`
 			this.dayList = [this.startTime, this.endTime]
 			this.dayList = [this.startTime, this.endTime]
+			this.earlyTime = this.startTime
 		}
 		}
 	}
 	}
 }
 }

+ 10 - 7
pages/detailInfo/detailInfo.vue

@@ -13,7 +13,7 @@
 			<!-- 民宿名称区域 -->
 			<!-- 民宿名称区域 -->
 			<view class="header_name">{{ detailInfo.hotel_name }}</view>
 			<view class="header_name">{{ detailInfo.hotel_name }}</view>
 			<!-- 开业时间区域 -->
 			<!-- 开业时间区域 -->
-			<view class="header_info">{{ detailInfo.openTime }}开业 I {{ detailInfo.fitupTime }}装修 I {{ detailInfo.roomNumber }}间客房</view>
+			<view class="header_info">{{ detailInfo.openTime }}开业 I {{ detailInfo.fitupTime }}装修 I {{ detailInfo.room_number_calc }}间客房</view>
 			<!-- 类型区域 -->
 			<!-- 类型区域 -->
 			<view class="header_types">
 			<view class="header_types">
 				<view class="types_item">{{ detailInfo.hTypeName }}</view>
 				<view class="types_item">{{ detailInfo.hTypeName }}</view>
@@ -26,7 +26,7 @@
 			<view class="body_towns">所属乡镇:{{ detailInfo.hotelTownshipName }}</view>
 			<view class="body_towns">所属乡镇:{{ detailInfo.hotelTownshipName }}</view>
 			<view class="body_address">
 			<view class="body_address">
 				<view class="address_text">地址:</view>
 				<view class="address_text">地址:</view>
-				<view>
+				<view class="address_info">
 					{{ detailInfo.hposition }}
 					{{ detailInfo.hposition }}
 					<img src="../../static/index/address.png" @click="handleMap" />
 					<img src="../../static/index/address.png" @click="handleMap" />
 				</view>
 				</view>
@@ -228,7 +228,6 @@ export default {
 		.body_address {
 		.body_address {
 			display: flex;
 			display: flex;
 			padding-right: 20rpx;
 			padding-right: 20rpx;
-			height: auto;
 			line-height: 55rpx;
 			line-height: 55rpx;
 			font-size: 28rpx;
 			font-size: 28rpx;
 
 
@@ -236,10 +235,14 @@ export default {
 				width: 105rpx;
 				width: 105rpx;
 			}
 			}
 
 
-			img {
-				margin-left: 20rpx;
-				width: 28rpx;
-				height: 28rpx;
+			.address_info {
+				flex: 1;
+
+				img {
+					margin-left: 20rpx;
+					width: 28rpx;
+					height: 28rpx;
+				}
 			}
 			}
 		}
 		}
 
 

+ 1 - 1
pages/orderDetail/orderDetail.vue

@@ -103,7 +103,7 @@
 					<view class="time_line"></view>
 					<view class="time_line"></view>
 					<view class="time_num">{{ info.orderLiveTime }}</view>
 					<view class="time_num">{{ info.orderLiveTime }}</view>
 					<view class="time_line"></view>
 					<view class="time_line"></view>
-					<view class="gap">{{ (info.orderStartTime || '').slice(5, 7) }}月{{ (info.checkOutTime || '').slice(8, 10) }}日</view>
+					<view class="gap">{{ (info.orderEndTime || '').slice(5, 7) }}月{{ (info.orderEndTime || '').slice(8, 10) }}日</view>
 				</view>
 				</view>
 				<view class="info_msg">{{ info.houseName }}</view>
 				<view class="info_msg">{{ info.houseName }}</view>
 				<view class="info_type">
 				<view class="info_type">

+ 2 - 7
pages/search/search.vue

@@ -67,7 +67,6 @@
 						<text class="techan_price">{{item.price}}</text>
 						<text class="techan_price">{{item.price}}</text>
 					</view>
 					</view>
 					<img src="../../static/search/gouwuche.png" class="techan_jiagou" @click="handleTip"></img>
 					<img src="../../static/search/gouwuche.png" class="techan_jiagou" @click="handleTip"></img>
-					<view class="techan_line"></view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -329,10 +328,12 @@ export default {
 			flex-wrap: wrap;
 			flex-wrap: wrap;
 			margin-left: 30rpx;
 			margin-left: 30rpx;
 			height: 110%;
 			height: 110%;
+			
 			.techan_list{
 			.techan_list{
 				display: flex;
 				display: flex;
 				height: 231rpx;
 				height: 231rpx;
 				margin-top: 30rpx;
 				margin-top: 30rpx;
+				border-bottom: 1px solid #e6e6e6;
 				
 				
 				.techan_img{
 				.techan_img{
 					width: 200rpx;
 					width: 200rpx;
@@ -378,12 +379,6 @@ export default {
 					width: 62rpx;
 					width: 62rpx;
 					height: 62rpx;
 					height: 62rpx;
 				}
 				}
-				.techan_line{
-					position: absolute;
-					margin: 230rpx 0 0 0;
-					width: 690px;
-					border: 1px solid #e6e6e6;
-				}
 			}
 			}
 		}
 		}
 	}
 	}