完成

pages/gongyujieshao/css/gongyuxiangqing.css

@@ -1,87 +1,95 @@
 .content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background-color: #F2F3F5;
-	}
-	.xuzhi{
-		display: revert;
-		margin-top: 20rpx;
-		width: 750rpx;
-		height: 664rpx;
-		background: rgba(255, 255, 255, 1);
-		color: rgba(102, 102, 102, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	.xiang_title{
-		margin-left: 50rpx;
-		margin-top: 15rpx;
-		color: rgba(0, 0, 0, 1);
-		font-size: 32rpx;
-		font-weight: 700;
-		font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-	}
-	.xiang_txt{
-		margin-left: 50rpx;
-		margin-top: 15rpx;
-		margin-right: 15rpx;
-		color: rgba(128, 128, 128, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-		display: block;
-		text-indent: 56rpx;
-	}
-	/* 第二部分公寓设施 */
-	.sheshi{
-		display: revert;
-		margin-top: 37rpx;
-		width: 750rpx;
-		height: 535rpx;
-		background: rgba(255, 255, 255, 1);
-		color: rgba(128, 128, 128, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	.sheshi_title{
-		margin-left: 50rpx;
-		margin-top: 15rpx;
-		color: rgba(0, 0, 0, 1);
-		font-size: 32rpx;
-		font-weight: 700;
-		font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-	}
-	/* .sheshi_txt{
-		margin-left: 90rpx;
-		margin-top: 30rpx;
-		margin-right: 15rpx;
-		color: rgba(128, 128, 128, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-	} */
-	.sheshi_txt_left{
-		position: absolute;
-		float: left;
-		margin-left: 90rpx;
-		/* margin-top: -430rpx; */
-		margin-right: 15rpx;
-		color: rgba(128, 128, 128, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	.sheshi_txt_right{
-		position: absolute;
-		float: right;
-		margin-left: 420rpx;
-		/* margin-top: -430rpx; */
-		margin-right: 15rpx;
-		color: rgba(128, 128, 128, 1);
-		font-size: 28rpx;
-		font-weight: 400;
-	}
-	.sheshi_icon{
-		width: 26rpx;
-		height: 26rpx;
-		margin-right: 5px;
-	}
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+
+.xuzhi {
+	display: revert;
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 480rpx;
+	background: rgba(255, 255, 255, 1);
+	color: rgba(102, 102, 102, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+
+.xiang_title {
+	margin-left: 50rpx;
+	margin-top: 30rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-weight: 700;
+	font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+.xiang_txt {
+	margin-left: 50rpx;
+	margin-top: 15rpx;
+	margin-right: 28rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	display: block;
+	text-indent: 2rem;
+}
+
+/* 第二部分公寓设施 */
+.sheshi {
+	/* display: revert; */
+	margin-top: 37rpx;
+	width: 750rpx;
+	height: 580rpx;
+	background: rgba(255, 255, 255, 1);
+	color: rgba(128, 128, 128, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+
+.sheshi_title {
+	margin-left: 50rpx;
+	margin-top: 30rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-weight: 700;
+	font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+.sheshi_txt {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-around;
+	margin: 30rpx 15rpx 0 90rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+
+/* .sheshi_txt_left {
+	position: absolute;
+	float: left;
+	margin-left: 90rpx;
+	margin-right: 15rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+
+.sheshi_txt_right {
+	position: absolute;
+	float: right;
+	margin-left: 420rpx;
+	margin-right: 15rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+} */
+
+.sheshi_icon {
+	width: 26rpx;
+	height: 26rpx;
+	margin-right: 5px;
+}

pages/gongyujieshao/gongyujieshao.vue

@@ -3,23 +3,14 @@
 		<view class="xuzhi">
 			<view class="xiang_title">公寓介绍</view>
 			<view class="xiang_txt">
-				         我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊「社交分享」的那些事儿。<br>
-				<text style="display: block;text-indent: 56rpx;">所以监听用户的截图操作，提示用户进行分享，既缩短了以前分享截图的操作路径，避免了在之前长路径中的行为流失（比如截图完成后忘记分享或觉得麻烦放弃分享等等），也让用户觉得更加贴心。</text>
-				         <text style="display: block;text-indent: 56rpx;">用户分享内容到社交媒体或好友，不应该是一种粗暴的强制行为，我们应该在保证产品本身内容有吸引力的核心前提下，仔细揣摩用户心理，结合产品本身的特色，在不同情境下提供给用户最合适的分享平台及方式，让用户分享成为一种水到渠。</text>
-				        <text style="display: block;text-indent: 56rpx;">营业时间：24小时</text>
-				         <text style="display: block;text-indent: 56rpx;">联系电话：<text @click="telphone(phone)" style="color:rgba(41, 109, 227, 1);">{{phone}}</text></text>
+				南昌交通学院研究生公寓由江西诚欣传统文化产业集团公司投资兴理，位于江西省靖安县墨轩湖大道1号南昌交通学院墨轩湖校区。研究生公寓实行酒店宾馆式服务管理理念。全天候24小时设有专人值班，目前设有豪华公寓、高级公寓和标准公寓三种房型共计220余套，各项生活设施一应俱全，欢迎新生和家长入住！<br>
 			</view>
 		</view>
 		<!-- 第二部分，公寓设施 -->
 		<view class="sheshi">
 			<view class="sheshi_title">公寓设施</view>
-			<view class="sheshi_txt_left">
-				<view style="margin-top: 30rpx;" class="sheshi_txt" v-for="(item,index) in sheshiList" :key="index">
-					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
-				</view>
-			</view>
-			<view class="sheshi_txt_right">
-				<view style="margin-top: 30rpx;" v-for="(item,index) in sheshiList2" :key="index">
+			<view class="sheshi_txt">
+				<view style="margin-top: 30rpx;flex-grow: 1; width: 300rpx;" v-for="(item, index) in sheshiList" :key="index">
 					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
 				</view>
 			</view>
@@ -31,33 +22,66 @@
 	export default {
 		data() {
 			return {
-				sheshiList:[
-					{id:1,list:'免费洗刷用品'},
-					{id:2,list:'24小时热水'},
-					{id:3,list:'客房wifi覆盖'},
-					{id:4,list:'电视'},
-					{id:5,list:'电吹风'},
-					{id:6,list:'分体式空调'},
+				sheshiList: [{
+						id: 1,
+						list: '免费洗刷用品'
+					},
+					{
+						id: 2,
+						list: '24小时热水'
+					},
+					{
+						id: 3,
+						list: '客房wifi覆盖'
+					},
+					{
+						id: 4,
+						list: '电视'
+					},
+					{
+						id: 5,
+						list: '电吹风'
+					},
+					{
+						id: 6,
+						list: '空调'
+					},
+					{
+						id: 7,
+						list: '吹风机'
+					},
+					{
+						id: 8,
+						list: '宽带上网接口'
+					},
+					{
+						id: 9,
+						list: '独立卫生间'
+					},
+					{
+						id: 10,
+						list: '拖鞋'
+					},
+					{
+						id: 11,
+						list: '电水壶'
+					},
+					{
+						id: 12,
+						list: '免费瓶装水'
+					},
 				],
-				sheshiList2:[
-					{id:1,list:'吹风机'},
-					{id:2,list:'宽带上网接口'},
-					{id:3,list:'独立卫生间'},
-					{id:4,list:'拖鞋'},
-					{id:5,list:'电水壶'},
-					{id:6,list:'免费瓶装水'},
-				],
-				phone:'0791-82293574'
+				phone: '0791-82293574'
 			}
 		},
 		onLoad() {
-			
+
 		},
 		methods: {
 			//拨打电话
-			telphone(phone){
-				uni.makePhoneCall({ 
-					phoneNumber: phone ,
+			telphone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone,
 				}) // 传参带入号码即可
 			},
 		}

pages/index/css/index.css

@@ -36,7 +36,7 @@
 
 /* <!-- 第一层公寓名称卡片 --> */
 .uni-ka {
-	width: 710rpx;
+	width: 730rpx;
 	height: 254rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 10px;
@@ -261,7 +261,7 @@
 }
 
 .room-mark {
-	width: 250rpx;
+	width: 288rpx;
 	line-height: 1.3em;
 	position: absolute;
 	margin-left: 260rpx;

pages/index/index.vue

@@ -8,7 +8,7 @@
 		</view>
 		<!-- 第一层公寓名称卡片 -->
 		<view class="uni-ka" style="margin-top: -40px;margin-bottom:0px;">
-			<text class="uni-title">墨轩湖姬子公寓（南昌交通学院）</text>
+			<text class="uni-title">研究生公寓（南昌交通学院）</text>
 			<text class="uni-sub-title">2021年装修 | 智能门锁 | 房间wifi | 免费停车</text>
 			<text class="uni-extra" @click="navigateToXiangqing">设施/详情＞</text>
 			<text class="uni-body">江西省宜春市靖安县墨轩湖大道1号</text>
@@ -19,24 +19,24 @@
 			<br><text class="uni-body2">距离我{{distance}}km</text>
 		</view>
 		<!-- 第二层工具 -->
-		<view class="item-list">
+		<!-- <view class="item-list">
 			<view class="item-list-one" @click="navigateToXuzhi">
 				<image src="../../static/index/xuzhi.png" class="img-btn" height="100%" width="100%"></image>
 				<text class="list-txt">入住须知</text>
 			</view>
-			<!-- <view class="item-list-one" @click="navigateToDairuzhu('warn')">
-		    <image src="../../static/index/ruzhu.png" class="img-btn"></image>
-		    <text class="list-txt">办理入住</text>
-		  </view> -->
-			<!-- <view class="item-list-one" @click="navigateToXuzhu">
-		    <image src="../../static/index/index_xuzhu.svg" class="img-btn"></image>
-		    <text class="list-txt">办理续住</text>
-		  </view> -->
+			<view class="item-list-one" @click="navigateToDairuzhu('warn')">
+				<image src="../../static/index/ruzhu.png" class="img-btn"></image>
+				<text class="list-txt">办理入住</text>
+			</view>
+			<view class="item-list-one" @click="navigateToXuzhu">
+				<image src="../../static/index/index_xuzhu.svg" class="img-btn"></image>
+				<text class="list-txt">办理续住</text>
+			</view>
 			<view class="item-list-one" @click="navigateToTuifang('warn')">
 				<image src="../../static/index/tuifang.png" class="img-btn"></image>
 				<text class="list-txt">办理退房</text>
 			</view>
-		</view>
+		</view> -->
 		<!-- 退房失败时弹框 -->
 		<!-- <uni-popup ref="popup_tui" type="center" width="300rpx" height="300rpx" background-color="#fff">
 			<view class="kuang_txt_tui">
@@ -78,14 +78,14 @@
 					<!-- <image v-if="item.h_type.indexOf('标准') !== -1" class="room-image" src="../../static/index/std.jpg" @click="inputDialogToggle(item.id)"></image> -->
 					<image v-if="item.h_type.indexOf('标准') !== -1" class="room-image" src="../../static/index/std.jpg" @click="inputDialogToggle(item.h_type)">
 					</image>
-					<image v-else-if="item.h_type.indexOf('高级') !== -1" class="room-image" src="../../static/index/adv.jpg"
+					<image v-else-if="item.h_type.indexOf('高级') !== -1" class="room-image" src="../../static/index/adv1.jpg"
 						@click="inputDialogToggle(item.h_type)"></image>
 					<image v-else="item.h_type.indexOf('豪华') !== -1" class="room-image" src="../../static/index/lux.jpg"
 						@click="inputDialogToggle(item.h_type)"></image>
 					<view class="room-name">{{ item.h_type }}</view>
-					<view v-if="item.h_type.indexOf('标准') !== -1" class="room-mark">描述：标准公寓套内面积约20平方米。详情请点击左侧图片。</view>
-					<view v-else-if="item.h_type.indexOf('高级') !== -1" class="room-mark">描述：高级公寓套内面积约28平方米。详情请点击左侧图片。</view>
-					<view v-else="item.h_type.indexOf('豪华') !== -1" class="room-mark">描述：豪华公寓套内面积约40平方米。详情请点击左侧图片。</view>
+					<view v-if="item.h_type.indexOf('标准') !== -1" class="room-mark">描述：面积约20平方米，配置1.5米大床房一张，点击左侧图片查看更多。</view>
+					<view v-else-if="item.h_type.indexOf('高级') !== -1" class="room-mark">描述：面积约28平方米，配置1.5米大床房一张，点击左侧图片查看更多。</view>
+					<view v-else="item.h_type.indexOf('豪华') !== -1" class="room-mark">描述：面积约40平方米，配置1.5米大床房一张，点击左侧图片查看更多。</view>
 					<view class="room-icon">
 						<image src="../../static/index/index_wifi.svg" style="width: 30rpx;height: 30rpx;"></image>
 						<image src="../../static/index/index_kongtiao.svg" style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
@@ -216,7 +216,7 @@
 				typeText: '', //房型详细描述
 				indicatorDots: true, //滚动图片提示条默认出现
 				img: [], //轮播图里图片
-				phone: '0791-82293574', //电话
+				phone: '19807957890', //电话
 				latitude: '', // 默认当前纬度
 				longitude: '',
 				scale: 12, // 默认16
@@ -283,12 +283,13 @@
 			// TODO 模拟请求异步同步数据
 			setTimeout(() => {
 				const now = new Date();
+				const theEndDate = new Date('2023-09-15');
 				// console.log('date:'+getDate(new Date()).fullDate)
 				// console.log('startDate:'+getDate(new Date()).fullDate)
 				// console.log('startWeek:'+getDate(new Date()).eWeek)
 				var arrDate = that.$utils.getDateComponents(now, 'date', 'time', 'weekday_cn', 'monthday_cn');
 				var arrDate_1 = that.$utils.getDateComponents(that.$utils.addDaysToDate(now, 1), 'date', 'time', 'weekday_cn', 'monthday_cn');
-				var arrDate_6 = that.$utils.getDateComponents(that.$utils.addDaysToDate(now, 6), 'date', 'time', 'weekday_cn', 'monthday_cn');
+				var arrDate_6 = that.$utils.getDateComponents(theEndDate, 'date', 'time', 'weekday_cn', 'monthday_cn');
 
 				that.info.date = arrDate.date
 				that.info.startDate = arrDate.date
@@ -368,6 +369,7 @@
 				that.$myRequest({
 					url: '/hotelReservation/zhotel/apphouse_list.action',
 				}).then(res => {
+					// console.log(res.data);
 					if (res.data.code === 200) {
 						let data = res.data.data;
 						data.forEach(item => {
@@ -420,13 +422,13 @@
 				_self.typeText = ''
 				_self.img = []
 				if (id === 1) {
-					_self.typeText = '一室一卫，内有沙发、茶几、空调、电视、衣柜、24小时热水、阳台房间朝南面。'
-					_self.img = ['/static/index/std.jpg', '/static/index/std.jpg', '/static/index/std.jpg']
+					_self.typeText = '一室一卫，内有沙发、茶几、空调、电视、衣柜、24小时热水、阳台房间朝南面，1.5米双人床一张。'
+					_self.img = ['/static/index/std0.jpg', '/static/index/std.jpg']
 				} else if (id === 2) {
-					_self.typeText = '一室一厅一卫，有标准公寓所有设施，客厅配有空调、3座沙发、书桌。卧室、阳台均朝北面。'
-					_self.img = ['/static/index/adv.jpg', '/static/index/adv1.jpg', '/static/index/adv2.jpg']
+					_self.typeText = '一室一厅一卫，有标准公寓所有设施，客厅配有空调、3座沙发、书桌。卧室、阳台均朝北面，1.5米双人床一张。'
+					_self.img = ['/static/index/adv1.jpg', '/static/index/adv.jpg', '/static/index/adv2.jpg']
 				} else {
-					_self.typeText = '一室一厅一卫，有标准公寓所有设施，大客厅配落地空调、5座沙发、书桌。卧室、大阳台均朝南面。'
+					_self.typeText = '一室一厅一卫，有标准公寓所有设施，大客厅配落地空调、5座沙发、书桌。卧室、大阳台均朝南面，1.5米双人床一张。'
 					_self.img = ['/static/index/lux.jpg', '/static/index/lux1.jpg', '/static/index/lux2.jpg']
 				}
 			},
@@ -456,12 +458,12 @@
 					}
 				});
 			},
-			// 跳转到入住须知
-			navigateToXuzhi() {
-				uni.navigateTo({
-					url: "/pages/ruzhuxuzhi/ruzhuxuzhi",
-				});
-			},
+			// // 跳转到入住须知
+			// navigateToXuzhi() {
+			// 	uni.navigateTo({
+			// 		url: "/pages/ruzhuxuzhi/ruzhuxuzhi",
+			// 	});
+			// },
 			// 跳转到公寓详情
 			navigateToXiangqing() {
 				uni.navigateTo({
@@ -541,7 +543,7 @@
 				} else if (h_type.indexOf('豪华') !== -1) {
 					this.getRoomTypeInfo(3)
 				} else {
-					
+
 				}
 			},
 			popupClose() {

pages/my_orderlist/css/my_orderlist.css

@@ -343,4 +343,14 @@
 	line-height: 150rpx;
 	text-align: center;
 	background-color: #fff;
+}
+
+.cancel-rule {
+	width: 750rpx;
+	box-sizing: border-box;
+	padding: 20rpx 0 20rpx 20rpx;
+	color: rgba(153, 153, 153, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	color: #ff0000;
 }

pages/my_orderlist/my_orderlist.vue

@@ -13,6 +13,7 @@
 		</scroll-view>
 		<!-- 订单样式 -->
 		<view class="room-kuang">
+			<view v-if="Inv == 2" class="cancel-rule">取消规则：未办理入住的订单在09月06号之前可以办理退款，09月06号凌晨后均不允许退款操作。</view>
 			<view class="room-xinxi" v-for="(item, index) in troom" :key="index">
 				<!-- <view @click="navigateToOrderMark(item.id)"> -->
 				<view>

pages/myself/css/myself.css

@@ -96,6 +96,18 @@
 	box-sizing: border-box;
 }
 
+.item-list-service {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	width: 710rpx;
+	padding: 20rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10px;
+	box-sizing: border-box;
+}
+
 .item-list-one {
 	display: flex;
 	flex-direction: column;

pages/myself/myself.vue

@@ -48,11 +48,15 @@
 		<!-- 第三部分，我的服务 -->
 		<view class="my_help">
 			<view class="help_title">我的服务</view>
-			<view class="item-list">
+			<view class="item-list-service">
 				<view class="item-list-one" @tap="telphone()">
 					<image src="../../static/my/person_phone.svg" class="img-btn"></image>
 					<text class="list-txt">人工热线</text>
 				</view>
+				<view class="item-list-one" @tap="navigateToXuzhi">
+					<image src="../../static/my/xuzhi.svg" class="img-btn"></image>
+					<text class="list-txt">入住须知</text>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -62,7 +66,7 @@
 	export default {
 		data() {
 			return {
-				phone: '0791-82293574', //客服热线电话
+				phone: '19807957890', //客服热线电话
 				cardName: '', //用户名
 				cardIdentity: '', //身份
 				cardNum: '', //卡号
@@ -74,6 +78,12 @@
 			this.getUserInfo()
 		},
 		methods: {
+			// 跳转到入住须知
+			navigateToXuzhi() {
+				uni.navigateTo({
+					url: "/pages/ruzhuxuzhi/ruzhuxuzhi",
+				});
+			},
 			// 获取用户信息
 			getUserInfo() {
 				var that = this

pages/order_room/css/order_room.css

@@ -11,7 +11,7 @@
 	width: 750rpx;
 	height: 320rpx;
 	margin: 0 auto;
-	background-image: url(../../static/order_room/order_bg.jpg);
+	background-image: url(../../static/index/index_bg.jpg);
 	background-size: 100% 100%;
 	background-attachment: inherit;
 	background-repeat: no-repeat;
@@ -322,6 +322,16 @@
 	border-radius: 6rpx;
 }
 
+.cancel-rule {
+	width: 750rpx;
+	box-sizing: border-box;
+	padding: 20rpx 0 20rpx 20rpx;
+	color: rgba(153, 153, 153, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	color: #ff0000;
+}
+
 /* uni-calendar选中背景色 */
 
 >>>.uni-calendar-item--isDay[data-v-6097fd5b] {

pages/order_room/order_room.vue

@@ -8,7 +8,7 @@
 		</view>
 		<!-- 第一层标题 -->
 		<view class="touming_bg">
-			<view class="touming_title">墨轩湖姬子公寓（南昌交通学院）</view>
+			<view class="touming_title">研究生公寓（南昌交通学院）</view>
 			<view class="touming_txt">您辛苦了，欢迎入住！</view>
 		</view>
 		<!-- 第二层表单 -->
@@ -35,18 +35,19 @@
 				</view>
 			</uni-popup>
 			<view class="form_bg">
-				<view class="form_title">房型：{{ typeName }}</view>
+				<view class="form_title">房型：{{ h_type }}，1.5米双人床一张。</view>
 				<view class="form-text">姓名：{{ cardName }}</view>
 				<view class="form-text">手机：{{ cardPhone }}</view>
 				<view class="form-text">身份：{{ cardIdentity }}</view>
 			</view>
 		</view>
 		<!-- 注释 -->
-		<view class="zhushi">
+		<!-- <view class="zhushi">
 			<text class="zhushi-mark"><text class="zhushi-circle"></text>低价保证</text>
 			<text class="zhushi-mark"><text class="zhushi-circle"></text>入住免房费</text>
 			<text class="zhushi-mark"><text class="zhushi-circle"></text>提前选好房</text>
-		</view>
+		</view> -->
+		<view class="cancel-rule">取消规则：未办理入住的订单在09月06号之前可以办理退款，09月06号凌晨后均不允许退款操作。</view>
 		<!-- 支付框 -->
 		<view class="fukuan">
 			<view class="fu-price"><text style="font-size: 28rpx;">总计：</text>¥{{ payMount }}</view>
@@ -95,6 +96,7 @@
 				// roomTypeId: '', //房间类型id
 				remark: '', //备注要求
 				payMount: 0, //应付金额
+				price: 0,
 				freeRoom: 0, //剩余房间
 				ruzhu_num: 1, //入住夜晚
 				order_txt: '', //提交订单时信息
@@ -106,7 +108,8 @@
 		onLoad(option) {
 			// console.log('option', option)
 			this.ruzhu_num = option.ruzhu_num
-			this.payMount = Number(option.price) //应付金额
+			this.price = option.price
+			this.payMount = Number(option.price * option.ruzhu_num) //应付金额
 			this.freeRoom = option.freeRoom //剩余房间
 			// this.roomTypeId = option.roomTypeId //房间类型id
 			this.h_type = option.typeName //户型名
@@ -132,7 +135,8 @@
 			setTimeout(() => {
 				that.info.date = that.$utils.getDate(new Date()).fullDate
 				that.info.startDate = that.$utils.getDate(new Date()).fullDate
-				that.info.endDate = that.$utils.getDate(new Date(), 6).fullDate
+				// that.info.endDate = that.$utils.getDate(new Date(), 6).fullDate
+				that.info.endDate = that.$utils.getDate(new Date('2023-09-15')).fullDate
 				if (that.$utils.isEmpty(that.startTime)) {
 					that.startTime = that.$utils.getDate(new Date()).fullTime
 				}
@@ -324,6 +328,7 @@
 					this.startDate = before + ' 14:00:00'
 					this.endDate = after + ' 12:00:00'
 					this.ruzhu_num = parseInt(((new Date(after).getTime()) - (new Date(before).getTime())) / 1000 / 60 / 60 / 24)
+					this.payMount = this.ruzhu_num * this.price
 				}
 			},
 			//选择器

pages/ruzhuxuzhi/ruzhuxuzhi.vue

@@ -21,35 +21,35 @@
 					},
 					{
 						id: 3,
-						list: '一、新生家长入住，须出示有效证件，核对预定信息，办理登记手续。'
+						list: '1、新生家长入住，须出示有效证件，核对预定信息，办理登记手续。'
 					},
 					{
 						id: 4,
-						list: '二、入住期间公寓不提供早餐，如有需要可到选择到学校食堂或商业街用餐。'
+						list: '2、入住期间公寓不提供早餐，如有需要可到选择到学校食堂或商业街用餐。'
 					},
 					{
 						id: 5,
-						list: '三、为保障入住环境，公寓每天会安排保洁人员对各房间和楼层进行卫生保洁，并配置一次性洗漱用品。'
+						list: '3、为保障入住环境，公寓每天会安排保洁人员对各房间和楼层进行卫生保洁，并配置一次性洗漱用品。'
 					},
 					{
 						id: 6,
-						list: '四、外出时，请注意门是否锁上，切勿将贵重物品留在房间内，如有遗失，概不负责。'
+						list: '4、外出时，请注意门是否锁上，切勿将贵重物品留在房间内，如有遗失，概不负责。'
 					},
 					{
 						id: 7,
-						list: '五、公寓退房时间为次日中午12点前，超过十二点增收半天房费，晚上六点以后离开收取一天的房费。'
+						list: '5、公寓退房时间为次日中午12:00前，超过中午12:00增收半天房费，晚上(下午)18:00以后离开收取1天的房费。'
 					},
 					{
 						id: 8,
-						list: '六、为了您的健康和平安，请勿卧床吸烟，烟蒂请投入烟灰缸内。'
+						list: '6、为了您的健康和平安，请勿卧床吸烟，烟蒂请投入烟灰缸内。'
 					},
 					{
 						id: 9,
-						list: '七、请保持室内外卫生，不要随地吐痰，乱扔废弃物，更不要在洗脸池内乱扔脏物，以免堵塞管道。'
+						list: '7、请保持室内外卫生，不要随地吐痰，乱扔废弃物，更不要在洗脸池内乱扔脏物，以免堵塞管道。'
 					},
 					{
 						id: 10,
-						list: '八、入住时需缴纳押金200元，如有遗失钥匙或把被单、被罩染上油渍、污渍、血渍或被单烧坏将扣除押金或照价赔偿。'
+						list: '8、入住时需缴纳押金200元，如有遗失钥匙或把被单、被罩染上油渍、污渍、血渍或被单烧坏将扣除押金或照价赔偿。'
 					},{
 						id: 11,
 						list: '感谢您的支持与配合！'
@@ -89,7 +89,7 @@
 
 	.items {
 		width: 750rpx;
-		height: calc(100vh - 100rpx);
+		height: auto;
 		background: rgba(255, 255, 255, 1);
 		color: rgba(102, 102, 102, 1);
 		font-size: 28rpx;