界面完成

App.vue

@@ -1,16 +1,16 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			// console.log('App Launch')
 			// console.log(localStorage.getItem('token')=='null')
-			if(localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='null') {
-				window.location.href ='https://open.wecard.qq.com/connect/oauth/authorize?app_key=4FD5599032819781&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth&state=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth';
-			} else if (localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='获取用户信息失败') {
+			if (localStorage.getItem('token') == 'null' && localStorage.getItem('errorMsg') == 'null') {
+				window.location.href =
+					'https://open.wecard.qq.com/connect/oauth/authorize?app_key=4FD5599032819781&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth&state=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth';
+			} else if (localStorage.getItem('token') == 'null' && localStorage.getItem('errorMsg') == '获取用户信息失败') {
 				uni.navigateTo({
-					url:'pages/huoquanshibai/huoquanshibai'
+					url: 'pages/huoquanshibai/huoquanshibai'
 				})
 			}
-			
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -26,6 +26,7 @@
 	@import '@/uni_modules/uni-scss/index.scss';
 	/* #ifndef APP-NVUE */
 	@import '@/static/customicons.css';
+
 	// 设置整个项目的背景色
 	page {
 		background-color: #f5f5f5;
@@ -37,4 +38,4 @@
 		color: #333;
 		padding: 10px;
 	}
-</style>
+</style>

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "School_apartment",
-    "appid" : "__UNI__1EB2D7B",
+    "appid" : "__UNI__AE1DA78",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -69,8 +69,9 @@
             "disableHostCheck" : true,
             "proxy" : {
                 //使用代理
-				// https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/roomType/list
+                // https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/roomType/list
                 "/hotel/ihotel-api" : {
+                    // https://chtech.ncjti.edu.cn/air-conditioner-control/h5/
                     "target" : "https://chtech.ncjti.edu.cn/hotel/ihotel-api", //目标地址
                     "changeOrigin" : true,
                     "secure" : true, // 设置支持https协议的代理
@@ -90,7 +91,8 @@
             }
         },
         "router" : {
-            "base" : "/hotel/h5"
+            "base" : "/hotel/h5/"
+            // "base" : "/air-conditioner-control/h5/"
         }
     }
 }

pages.json

@@ -1,58 +1,67 @@
 {
-	"pages": [{
-		"path": "pages/index/index",
-		"style": {
-			"navigationBarTitleText": "智慧校园公寓"
+	"pages": [
+		{
+			"path": "pages/default/default",
+			"style": {
+				"navigationBarTitleText": "公告",
+				"enablePullDownRefresh": false
+			}
 		}
-	},
-	{
-		"path": "pages/myself/myself",
-		"style": {
-			"navigationBarTitleText": "我的"
-		}
-	},
-	{
-		"path": "pages/order_room/order_room",
-		"style": {
-			"navigationBarTitleText": "填写订单"
-		}
-	},
-	{
-		"path": "pages/my_orderlist/my_orderlist",
-		"style": {
-			"navigationBarTitleText": "我的订单"
-		}
-	},
-	{
-		"path": "pages/order_mark/order_mark",
-		"style": {
-			"navigationBarTitleText": "订单详情"
-		}
-	},
-	{
-		"path": "pages/ruzhuxuzhi/ruzhuxuzhi",
-		"style":{
-			"navigationBarTitleText": "入住须知"
-		}
-	},
-	{
-		"path": "pages/zhifuchenggong/zhifuchenggong",
-		"style":{
-			"navigationBarTitleText": "支付成功"
-		}
-	},
-	{
-		"path": "pages/huoquanshibai/huoquanshibai",
-		"style":{
-			"navigationBarTitleText": "获权失败"
-		}
-	},
-	{
-		"path": "pages/gongyuxiangqing/gongyuxiangqing",
-		"style":{
-			"navigationBarTitleText": "公寓详情"
-		}
-	}
+		// , 
+		// {
+		// 	"path": "pages/index/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "智慧校园公寓"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/myself/myself",
+		// 	"style": {
+		// 		"navigationBarTitleText": "我的"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/order_room/order_room",
+		// 	"style": {
+		// 		"navigationBarTitleText": "填写订单"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/my_orderlist/my_orderlist",
+		// 	"style": {
+		// 		"navigationBarTitleText": "我的订单"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/order_mark/order_mark",
+		// 	"style": {
+		// 		"navigationBarTitleText": "订单详情"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/ruzhuxuzhi/ruzhuxuzhi",
+		// 	"style": {
+		// 		"navigationBarTitleText": "入住须知"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/zhifuchenggong/zhifuchenggong",
+		// 	"style": {
+		// 		"navigationBarTitleText": "支付成功"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/huoquanshibai/huoquanshibai",
+		// 	"style": {
+		// 		"navigationBarTitleText": "获权失败"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/gongyuxiangqing/gongyuxiangqing",
+		// 	"style": {
+		// 		"navigationBarTitleText": "公寓详情"
+		// 	}
+		// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -63,7 +72,7 @@
 			"background": "#efeff4"
 		}
 	},
-	"tabBar": {//底部导航
+	"tabBar": { //底部导航
 		"color": "#7A7E83",
 		"selectedColor": "#296DE3",
 		"borderStyle": "black",
@@ -71,7 +80,7 @@
 		"list": [{
 			"pagePath": "pages/index/index",
 			"iconPath": "static/tabbar/apartment.svg",
-			"selectedIconPath": "static/tabbar/apart_dian.svg",//选中时的图片路径
+			"selectedIconPath": "static/tabbar/apart_dian.svg", //选中时的图片路径
 			"text": "公寓"
 		}, {
 			"pagePath": "pages/myself/myself",
@@ -81,4 +90,4 @@
 		}]
 	}
 
-}
+}

pages/default/default.vue

@@ -0,0 +1,64 @@
+html
+<template>
+	<div class="default-page">
+		<img :src="getImagePath('default.png')" alt="Image" class="mimg" />
+		<p class="mp">{{ description }}</p>
+	</div>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				description: "酒店预定系统8月15正式开放"
+			};
+		},
+		methods: {
+			getImagePath(imageName) {
+				return require(`@/static/images/${imageName}`);
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.default-page {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 100vh;
+		text-align: center;
+		background-color: #fff;
+
+		.mimg {
+			height: 50%;
+			width: auto;
+			margin-bottom: 20rpx;
+		}
+
+		.mp {
+			opacity: 1;
+			font-size: 30rpx;
+			font-weight: 400;
+			line-height: 2.8rem;
+			height: 50%;
+			color: rgba(87, 146, 240, 1);
+			text-align: center;
+			vertical-align: top;
+		}
+	}
+
+	@media screen and (orientation: landscape) {
+		.default-page {
+			flex-direction: row;
+
+			.mimg {
+				width: 50%;
+				height: auto;
+			}
+
+			.mp {
+				margin: 1rem;
+			}
+		}
+	}
+</style>

pages/index/css/index.css

@@ -5,6 +5,7 @@
 	justify-content: center;
 	background-color: #F2F3F5;
 }
+
 /* 背景图 */
 .index_bg {
 	width: 750rpx;
@@ -16,28 +17,32 @@
 	background-repeat: no-repeat;
 	margin-top: 0px;
 }
+
 /* 欢迎光临 */
-.welcome{
+.welcome {
 	width: 163px;
 	height: 60px;
 	background: rgba(255, 255, 255, 0.4);
 	backdrop-filter: blur(5px);
 }
-.welcome_img{
+
+.welcome_img {
 	position: absolute;
 	margin-left: 20px;
 	margin-top: 8px;
 	width: 125px;
 	height: 44px;
 }
+
 /* <!-- 第一层公寓名称卡片 --> */
-.uni-ka{
+.uni-ka {
 	width: 710rpx;
 	height: 254rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 10px;
 }
-.uni-title{
+
+.uni-title {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 21rpx;
@@ -45,7 +50,8 @@
 	font-size: 34rpx;
 	font-weight: 500;
 }
-.uni-sub-title{
+
+.uni-sub-title {
 	position: absolute;
 	margin-left: 31rpx;
 	margin-top: 77rpx;
@@ -53,7 +59,8 @@
 	font-size: 20rpx;
 	font-weight: 400;
 }
-.uni-extra{
+
+.uni-extra {
 	position: absolute;
 	margin-left: 560rpx;
 	margin-top: 71rpx;
@@ -61,7 +68,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.uni-body{
+
+.uni-body {
 	position: absolute;
 	margin-left: 31rpx;
 	margin-top: 144rpx;
@@ -69,7 +77,8 @@
 	font-size: 14px;
 	font-weight: 500;
 }
-.uni-body2{
+
+.uni-body2 {
 	position: absolute;
 	margin-left: 31rpx;
 	margin-top: 147rpx;
@@ -77,7 +86,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.uni-map{
+
+.uni-map {
 	position: absolute;
 	float: right;
 	width: 50rpx;
@@ -86,7 +96,8 @@
 	margin-left: 552rpx;
 	margin-top: 137rpx;
 }
-.uni-phone{
+
+.uni-phone {
 	position: absolute;
 	float: right;
 	width: 50rpx;
@@ -94,11 +105,12 @@
 	margin-left: 630rpx;
 	margin-top: 137rpx;
 }
+
 /* 第二层工具 */
-.item-list{
+.item-list {
 	display: flex;
 	flex-direction: row;
-	justify-content: flex-start;
+	justify-content: space-around;
 	width: 710rpx;
 	height: 181rpx;
 	margin-top: 20rpx;
@@ -106,7 +118,8 @@
 	background: rgba(255, 255, 255, 1);
 	border-radius: 10px;
 }
-.item-list-one{
+
+.item-list-one {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -114,11 +127,13 @@
 	/* margin-right: 60rpx; */
 	margin-top: 20px;
 }
-.img-btn{
+
+.img-btn {
 	width: 59rpx;
 	height: 54rpx;
 }
-.list-txt{
+
+.list-txt {
 	width: 150rpx;
 	text-align: center;
 	font-size: 28rpx;
@@ -126,8 +141,9 @@
 	color: rgba(0, 0, 0, 1);
 	font-weight: 400;
 }
+
 /* 第三层订房 */
-.room-list{
+.room-list {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-start;
@@ -138,8 +154,9 @@
 	background: rgba(255, 255, 255, 1);
 	border-radius: 10px, 10px, 0px, 0px;
 }
+
 /* 选择住房日期 */
-.select-time{
+.select-time {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-start;
@@ -148,28 +165,33 @@
 	height: 120rpx;
 	margin: 0;
 }
-.select-time-one{
+
+.select-time-one {
 	margin-top: 32rpx;
 	margin-left: 77rpx;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
-.select-list{
+
+.select-list {
 	color: rgba(153, 153, 153, 1);
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.select-list-time{
+
+.select-list-time {
 	color: rgba(0, 0, 0, 1);
 	font-size: 34rpx;
 	font-weight: 400;
 }
-.select-center{
+
+.select-center {
 	width: 190rpx;
 	height: 120rpx;
 }
-.select-line1{
+
+.select-line1 {
 	position: absolute;
 	margin-left: 40px;
 	margin-top: 36px;
@@ -177,7 +199,8 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
-.select-circle{
+
+.select-circle {
 	position: absolute;
 	width: 81rpx;
 	height: 46rpx;
@@ -191,7 +214,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.select-line2{
+
+.select-line2 {
 	position: absolute;
 	margin-left: 94px;
 	margin-top: 36px;
@@ -199,12 +223,14 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
+
 /* 房型列表 */
-.room-kuang{
-	display: block; 
+.room-kuang {
+	display: block;
 	margin-top: 150rpx;
 }
-.room-xinxi{
+
+.room-xinxi {
 	display: -webkit-box;
 	flex-direction: column;
 	align-items: center;
@@ -212,21 +238,24 @@
 	height: 213rpx;
 	margin-top: 20rpx;
 }
-.room-image{
+
+.room-image {
 	position: absolute;
 	margin-left: 31rpx;
 	width: 213rpx;
 	height: 161rpx;
 	border-radius: 5px;
 }
-.room-name{
+
+.room-name {
 	position: absolute;
 	margin-left: 260rpx;
 	color: rgba(0, 0, 0, 1);
 	font-size: 34rpx;
 	font-weight: 400;
 }
-.room-mark{
+
+.room-mark {
 	position: absolute;
 	margin-left: 260rpx;
 	margin-top: 46rpx;
@@ -234,19 +263,22 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-icon{
+
+.room-icon {
 	position: absolute;
 	margin-left: 261rpx;
 	margin-top: 116rpx;
 }
-.before-price{
+
+.before-price {
 	position: absolute;
 	margin-left: 606rpx;
 	color: rgba(153, 153, 153, 1);
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-price{
+
+.room-price {
 	position: absolute;
 	/* margin-left: 605rpx; */
 	margin-top: 46rpx;
@@ -255,7 +287,8 @@
 	font-size: 42rpx;
 	font-weight: 500;
 }
-.room-button{
+
+.room-button {
 	position: absolute;
 	margin-left: 579rpx;
 	margin-top: 96rpx;
@@ -269,7 +302,8 @@
 	text-align: center;
 	line-height: 66rpx;
 }
-.room-button2{
+
+.room-button2 {
 	position: absolute;
 	margin-left: 569rpx;
 	margin-top: 96rpx;
@@ -283,7 +317,8 @@
 	text-align: center;
 	line-height: 66rpx;
 }
-.room-line{
+
+.room-line {
 	position: absolute;
 	margin-left: 0rpx;
 	margin-top: 194rpx;
@@ -291,20 +326,23 @@
 	height: 1px;
 	background: rgba(220, 225, 230, 1);
 }
+
 /* 房间样式弹窗页面 */
-.popup_bg_picker{
+.popup_bg_picker {
 	width: 700rpx;
 	height: 800rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6rpx;
 }
-.popup_bg{
+
+.popup_bg {
 	width: 650rpx;
 	height: 738rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6rpx;
 }
-.popup_title{
+
+.popup_title {
 	position: absolute;
 	margin-left: 40rpx;
 	margin-top: 20rpx;
@@ -313,7 +351,8 @@
 	font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
 	font-weight: 400;
 }
-.popup_error{
+
+.popup_error {
 	position: absolute;
 	margin-left: 577rpx;
 	margin-top: 15rpx;
@@ -321,25 +360,29 @@
 	height: 32px;
 	background-image: url(../../static/index/swiper_x.svg);
 }
+
 /* 轮播图 */
-.swiper{
+.swiper {
 	position: absolute;
 	margin-left: 0rpx;
 	margin-top: 87rpx;
 	width: 650rpx;
 	height: 340rpx;
 }
-.swiper-item{
+
+.swiper-item {
 	width: 650rpx;
 	height: 340rpx;
 }
-.swiper-img{
+
+.swiper-img {
 	position: absolute;
 	width: 650rpx;
 	height: 340rpx;
 	margin: 0;
 }
-.popup_title2{
+
+.popup_title2 {
 	position: absolute;
 	margin-left: 38rpx;
 	margin-top: 444rpx;
@@ -348,7 +391,8 @@
 	font-weight: 500;
 	font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
 }
-.popup_txt{
+
+.popup_txt {
 	position: absolute;
 	margin-left: 46rpx;
 	margin-right: 43rpx;
@@ -360,30 +404,39 @@
 	height: 217rpx;
 	overflow-y: auto;
 }
-.popup_txt_in{
+
+.popup_txt_in {
 	width: 551rpx;
 	height: 217rpx;
 }
-.popup_txt::-webkit-scrollbar {/*滚动条整体样式*/
-    width: 9rpx;
-    height: 240rpx;
-    background-color: #707371;
+
+.popup_txt::-webkit-scrollbar {
+	/*滚动条整体样式*/
+	width: 9rpx;
+	height: 240rpx;
+	background-color: #707371;
 }
-.popup_txt::-webkit-scrollbar-thumb {/*滚动条整体样式*/
-    background-color: #707371;
-    border-radius: 5px;
+
+.popup_txt::-webkit-scrollbar-thumb {
+	/*滚动条整体样式*/
+	background-color: #707371;
+	border-radius: 5px;
 }
-.popup_txt::-webkit-scrollbar-track {/*滚动条里面轨道*/
-    background: #cac9d3;
+
+.popup_txt::-webkit-scrollbar-track {
+	/*滚动条里面轨道*/
+	background: #cac9d3;
 }
+
 /* 办理续住弹窗 */
-.popup_bg_xu{
+.popup_bg_xu {
 	width: 650rpx;
 	height: 575rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6rpx;
 }
-.select-time-xu{
+
+.select-time-xu {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-start;
@@ -393,14 +446,16 @@
 	margin-top: 128rpx;
 	margin-left: 0rpx;
 }
-.select-time-one-xu{
+
+.select-time-one-xu {
 	margin-top: 32rpx;
 	margin-left: 55rpx;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
-.popup_xu_line{
+
+.popup_xu_line {
 	position: absolute;
 	margin-left: 0rpx;
 	margin-top: 86rpx;
@@ -409,7 +464,8 @@
 	background: rgba(204, 204, 204, 1);
 	border: 1rpx solid rgba(229, 229, 229, 1);
 }
-.popup_xu_txt{
+
+.popup_xu_txt {
 	position: absolute;
 	margin-left: 52rpx;
 	margin-top: 282rpx;
@@ -417,8 +473,9 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
+
 /* 支付框 */
-.fukuan{
+.fukuan {
 	display: flex;
 	padding-top: 475rpx;
 	width: 650rpx;
@@ -427,7 +484,8 @@
 	box-shadow: inset 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
 	box-sizing: border-box;
 }
-.fu-price{
+
+.fu-price {
 	width: 363rpx;
 	color: rgba(255, 87, 51, 1);
 	font-size: 44rpx;
@@ -435,7 +493,8 @@
 	text-align: center;
 	line-height: 100rpx;
 }
-.fu-zhifu{
+
+.fu-zhifu {
 	float: right;
 	width: 288rpx;
 	height: 100rpx;
@@ -446,21 +505,23 @@
 	text-align: center;
 	line-height: 100rpx;
 }
+
 /* uni-calendar选中背景色 */
 >>>.uni-calendar-item--isDay[data-v-6097fd5b] {
-    background-color: #fff;
-    opacity: 0.8;
-    color: #2979ff;
+	background-color: #fff;
+	opacity: 0.8;
+	color: #2979ff;
 }
+
 >>>.uni-calendar-item--before-checked[data-v-6097fd5b] {
-    background-color: #0055ff;
-    color: #fff;
+	background-color: #0055ff;
+	color: #fff;
 	opacity: 1;
 }
 
 >>>.uni-calendar-item--after-checked[data-v-6097fd5b] {
-    background-color: #0055ff;
-    color: #fff;
+	background-color: #0055ff;
+	color: #fff;
 	opacity: 1;
 }
 
@@ -468,7 +529,7 @@
     opacity: 0.5;
 } */
 /* 弹出框 */
-.kuang_txt{
+.kuang_txt {
 	align-items: center;
 	justify-content: center;
 	padding: 15rpx;
@@ -478,7 +539,8 @@
 	text-align: center;
 	background-color: #fff;
 }
-.kuang_txt_tui{
+
+.kuang_txt_tui {
 	align-items: center;
 	justify-content: center;
 	padding: 15rpx;

pages/index/index.vue

@@ -22,10 +22,10 @@
 		    <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')">
+		 <!-- <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> -->
 		  <!-- <view class="item-list-one" @click="navigateToXuzhu">
 		    <image src="../../static/index/index_xuzhu.svg" class="img-btn"></image>
 		    <text class="list-txt">办理续住</text>
@@ -83,7 +83,7 @@
 						<image src="../../static/index/index_nosmoking.svg" style="width: 30rpx;height: 30rpx;margin-left: 10rpx;"></image>
 						<image src="../../static/index/index_lock.svg" style="width: 30rpx;height: 30rpx;margin-left: 10rpx;"></image>
 					</view>
-					<view class="before-price"><strike>¥{{item.usualPrice}}</strike></view>
+					<!-- <view class="before-price"><strike>¥{{item.usualPrice}}</strike></view> -->
 					<view class="room-price">¥{{item.discountPrice}}</view>
 					<view class="room-button" :class="{'room-button2': item.enableNum == 0}">
 						<text v-if="item.enableNum==0">已满</text>

pages/my_orderlist/my_orderlist.vue

@@ -44,7 +44,7 @@
 					<text v-if="item.orderStatu == 1" @click="getOrderPay(item.id)">支付</text>
 					<text v-if="item.orderStatu == 4" @click="navigateToJiezhang(item.id)">去处理</text>
 					<text v-if="item.orderStatu == 5" @click="navigateToWanchengZaici(item.roomTypeId)">再次预定</text>
-					<text v-if="item.orderStatu == 2" @click="openRu(item.id,'warn')">办理入住</text>
+					<!-- <text v-if="item.orderStatu == 2" @click="openRu(item.id,'warn')">办理入住</text> -->
 					<text v-if="item.orderStatu == 3" @click="openTui(item.id,'warn')">退房</text>
 					
 				</view>

pages/myself/myself.vue

@@ -36,10 +36,6 @@
 			  </view>
 			</view>
 			<view class="item-list">
-			  <view class="item-list-one" @click="navigateToDaijiezhang">
-			    <image src="../../static/my/no_pay.svg" class="img-btn"></image>
-			    <text class="list-txt">待结账</text>
-			  </view>
 			  <view class="item-list-one" @click="navigateToYiwancheng">
 			    <image src="../../static/my/wancheng.svg" class="img-btn"></image>
 			    <text class="list-txt">已完成</text>
@@ -54,10 +50,6 @@
 			    <image src="../../static/my/person_phone.svg" class="img-btn"></image>
 			    <text class="list-txt">人工热线</text>
 			  </view>
-			  <!-- <view class="item-list-one" @click="navigateToBaoxiu">
-			    <image src="../../static/my/baoxiu.svg" class="img-btn"></image>
-			    <text class="list-txt">房间报修</text>
-			  </view> -->
 			</view>
 		</view>
 	</view>

pages/order_mark/order_mark.vue

@@ -3,7 +3,7 @@
 		<!-- 第一层模块 -->
 		<view class="one-order3" v-if="orderList.orderStatu == 5">
 			<view class="one-order-title">订单已完成 / 期待您再次光临<text class="all-price">￥{{orderList.shouldFree}}</text></view>
-			<view class="one-order-menshi">水电扣除<text class="menshi-price">￥{{orderList.totalFree}}</text></view>
+			<view class="one-order-menshi">房费<text class="menshi-price">￥{{orderList.totalFree}}</text></view>
 			<view class="room-button-6"@click="getOrderDelete(orderList.orderId)">
 				<text>删除订单</text>
 			</view>
@@ -37,20 +37,12 @@
 				<text v-if="orderList.orderStatu == 3">办理成功 / 期待您的到来</text>
 				<text class="all-price">￥{{orderList.payAmount}}</text>
 			</view>
-			<view class="one-order-menshi">门市价<text class="menshi-price">￥{{orderList.roomTypeUsualPrice}}</text></view>
-			<view class="one-order-fuli">教师福利<text class="fuli-price">￥{{orderList.roomTypeDiscountPrice}}</text></view>
 			<view class="one-order-yufukuan">
-				预付款<text class="yufukuan-price">￥{{orderList.payAmount}}</text>
+				房费<text class="yufukuan-price">￥{{orderList.payAmount}}</text>
 			</view>
-			<!-- <view class="one-order-zhu">
-				注：水费为0.62元/吨，电费为1.1元/度；补助吨数为3吨，补助度
-				数为10度，超出标准需在预付款中扣除，未超出原路返回预
-				付款
-			</view> -->
 			<view class="room-button" v-if="orderList.orderStatu != 2&& orderList.orderStatu != 3">
 				<text v-if="orderList.orderStatu == 0" @click="navigateToZaici(orderList.enableStartTime,orderList.enableEndTime,orderList.roomTypeId)">再次预定</text>
 				<text v-if="orderList.orderStatu == 1" @click="openQu()(orderList.orderId,'warn')">取消订单</text>
-				<!-- <text v-if="orderList.orderStatu == 3">办理续住</text> -->
 			</view>
 			<view class="room-button2" :class="{'buttonNo': orderList.orderStatu == 3 || orderList.orderStatu == 2}">
 				<text v-if="orderList.orderStatu == 0" @click="openDel(orderList.orderId,'warn')">删除</text>
@@ -69,10 +61,6 @@
 			<view class="two-order-xing">户         型：<text class="two-order-txt">{{orderList.roomNo}}</text></view>
 			<view class="two-order-zhuTime">入离时间：<text class="two-order-txt" v-if="orderList.enableStartTime,orderList.enableEndTime">入住日{{orderList.enableStartTime.substring(11,16)}}后   离店日{{orderList.enableEndTime.substring(11,16)}}前</text></view>
 			<view class="two-order-secret" v-if="orderList.orderStatu ==3">房间门锁密码：{{orderList.lockRealtimePassword}}</view>
-			<view class="two-order-shui" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">水起码：{{orderList.startOfWater}}吨</view>
-			<view class="two-order-dian" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">电起码：{{orderList.startOfElectric}}度</view>
-			<view class="two-order-shui2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">水起码：{{orderList.startOfWater}}吨</view>
-			<view class="two-order-dian2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">电起码：{{orderList.startOfElectric}}度</view>
 		</view>
 		
 		<view class="order-mark">您的满意是我们最大的追求</view>

pages/order_room/css/order_room.css

@@ -5,6 +5,7 @@
 	justify-content: center;
 	background-color: #F2F3F5;
 }
+
 /* 背景图 */
 .index_bg {
 	width: 750rpx;
@@ -16,30 +17,34 @@
 	background-repeat: no-repeat;
 	margin-top: 0px;
 }
+
 /* 欢迎光临 */
-.welcome{
+.welcome {
 	width: 163px;
 	height: 60px;
 	background: rgba(255, 255, 255, 0.4);
 	backdrop-filter: blur(5px);
 }
-.welcome_img{
+
+.welcome_img {
 	position: absolute;
 	margin-left: 20px;
 	margin-top: 8px;
 	width: 125px;
 	height: 44px;
 }
+
 /* 第一层标题 */
-.touming_bg{
+.touming_bg {
 	margin-top: -120rpx;
-	margin-bottom:0px;
+	margin-bottom: 0px;
 	width: 750rpx;
 	height: 115rpx;
 	background: rgba(255, 255, 255, 0.4);
 	backdrop-filter: blur(4rpx);
 }
-.touming_title{
+
+.touming_title {
 	margin-left: 20rpx;
 	margin-top: 13rpx;
 	color: rgba(0, 0, 0, 1);
@@ -47,22 +52,25 @@
 	font-weight: 600;
 	font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
 }
-.touming_txt{
+
+.touming_txt {
 	margin-left: 20rpx;
 	margin-top: 5rpx;
 	color: rgba(0, 0, 0, 1);
 	font-size: 24rpx;
 	font-weight: 400;
 }
+
 /* 第二层表单 */
-.two_all{
+.two_all {
 	margin-top: 0rpx;
 	width: 750rpx;
-	height: 655rpx;
+	height: 598rpx;
 	background: rgba(255, 255, 255, 1);
 }
+
 /* 选择住房日期 */
-.select-time{
+.select-time {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-start;
@@ -72,28 +80,33 @@
 	margin: 0;
 	background: rgba(255, 255, 255, 1);
 }
-.select-time-one{
+
+.select-time-one {
 	margin-top: 32rpx;
 	margin-left: 90rpx;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 }
-.select-list{
+
+.select-list {
 	color: rgba(153, 153, 153, 1);
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.select-list-time{
+
+.select-list-time {
 	color: rgba(0, 0, 0, 1);
 	font-size: 34rpx;
 	font-weight: 400;
 }
-.select-center{
+
+.select-center {
 	width: 190rpx;
 	height: 120rpx;
 }
-.select-line1{
+
+.select-line1 {
 	position: absolute;
 	margin-left: 37px;
 	margin-top: 46px;
@@ -101,7 +114,8 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
-.select-circle{
+
+.select-circle {
 	position: absolute;
 	width: 81rpx;
 	height: 46rpx;
@@ -115,7 +129,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.select-line2{
+
+.select-line2 {
 	position: absolute;
 	margin-left: 91px;
 	margin-top: 46px;
@@ -123,14 +138,16 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
-.form_bg{
+
+.form_bg {
 	margin-left: 21rpx;
 	width: 709rpx;
-	height: 621rpx;
+	height: 418rpx;
 	background: rgba(247, 249, 250, 1);
 	border-radius: 5rpx;
 }
-.form_title{
+
+.form_title {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 166rpx;
@@ -138,7 +155,8 @@
 	font-size: 28rpx;
 	font-weight: 400;
 }
-.form-name{
+
+.form-name {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 238rpx;
@@ -146,7 +164,8 @@
 	font-size: 28rpx;
 	font-weight: 400;
 }
-.form-line{
+
+.form-line {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 301rpx;
@@ -154,7 +173,8 @@
 	background: rgba(204, 204, 204, 1);
 	border: 1px solid rgba(230, 230, 230, 1);
 }
-.form-phone{
+
+.form-phone {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 326rpx;
@@ -162,7 +182,8 @@
 	font-size: 28rpx;
 	font-weight: 400;
 }
-.uni-list-cell-db{
+
+.uni-list-cell-db {
 	position: absolute;
 	width: 670rpx;
 	margin-left: 29rpx;
@@ -171,30 +192,35 @@
 	font-size: 28rpx;
 	font-weight: 400;
 }
-.jiantou{
+
+.jiantou {
 	float: right;
 	margin-top: -44rpx;
 	width: 39rpx;
 	height: 39rpx;
 }
-.uni-textarea{
+
+.uni-textarea {
 	position: absolute;
 	margin-left: 29rpx;
 	margin-top: 502rpx;
 }
-.textsrea-txt{
+
+.textsrea-txt {
 	position: absolute;
 	margin-left: 575rpx;
 	margin-top: 574rpx;
 }
+
 /* 第三层表单 */
-.three_all{
+.three_all {
 	margin-top: 20rpx;
 	width: 750rpx;
 	height: 263rpx;
 	background: rgba(255, 255, 255, 1);
 }
-.three-title{
+
+.three-title {
 	position: absolute;
 	margin-left: 20rpx;
 	margin-top: 30rpx;
@@ -202,7 +228,8 @@
 	font-size: 32rpx;
 	font-weight: 400;
 }
-.three-mark{
+
+.three-mark {
 	position: absolute;
 	margin-left: 20rpx;
 	margin-top: 83rpx;
@@ -210,7 +237,8 @@
 	font-size: 28rpx;
 	font-weight: 400;
 }
-.three-zhu{
+
+.three-zhu {
 	position: absolute;
 	margin-left: 20rpx;
 	margin-top: 152rpx;
@@ -219,28 +247,42 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
+
 /* 注释 */
-.zhushi{
+.zhushi {
 	display: flex;
+	flex-direction: row;
+	justify-content: space-around;
+	align-items: center;
 	margin-top: 50rpx;
 	color: rgba(153, 153, 153, 1);
 	font-size: 20rpx;
 	font-weight: 400;
-	text-align: center;
 }
-.zhushi-mark{
-	margin-left: 20rpx;
+
+.zhushi-mark {
+	position: relative;
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	flex-wrap: nowrap;
+	margin-left: 58rpx;
 }
-.zhushi-circle{
-	margin-left: 30rpx;
+
+.zhushi-circle {
 	position: absolute;
+	top: 15rpx;
+	left: -15rpx;
 	width: 8rpx;
 	height: 8rpx;
-	border-radius: 50px;
+	border-radius: 50%;
 	background: rgba(153, 153, 153, 1);
+	margin-right: 10rpx;
 }
+
 /* 支付框 */
-.fukuan{
+.fukuan {
 	display: flex;
 	margin-top: 38rpx;
 	width: 750rpx;
@@ -248,7 +290,8 @@
 	background: rgba(255, 255, 255, 1);
 	box-shadow: 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
 }
-.fu-price{
+
+.fu-price {
 	width: 463rpx;
 	color: rgba(255, 87, 51, 1);
 	font-size: 44rpx;
@@ -256,7 +299,8 @@
 	text-align: center;
 	line-height: 100rpx;
 }
-.fu-zhifu{
+
+.fu-zhifu {
 	float: right;
 	width: 287rpx;
 	height: 100rpx;
@@ -267,7 +311,8 @@
 	text-align: center;
 	line-height: 100rpx;
 }
-.room-button2{
+
+.room-button2 {
 	float: right;
 	width: 287rpx;
 	height: 100rpx;
@@ -278,28 +323,31 @@
 	text-align: center;
 	line-height: 100rpx;
 }
+
 /* 日期选择器弹窗 */
-.popup_bg_picker{
+.popup_bg_picker {
 	width: 700rpx;
 	height: 800rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6rpx;
 }
+
 /* uni-calendar选中背景色 */
 
 >>>.uni-calendar-item--isDay[data-v-6097fd5b] {
-    background-color: #fff;
-    opacity: 0.8;
-    color: #2979ff;
+	background-color: #fff;
+	opacity: 0.8;
+	color: #2979ff;
 }
+
 >>>.uni-calendar-item--before-checked[data-v-6097fd5b] {
-    background-color: #0055ff;
-    color: #fff;
+	background-color: #0055ff;
+	color: #fff;
 	opacity: 1;
 }
 
 >>>.uni-calendar-item--after-checked[data-v-6097fd5b] {
-    background-color: #0055ff;
-    color: #fff;
+	background-color: #0055ff;
+	color: #fff;
 	opacity: 1;
 }

pages/order_room/order_room.vue

@@ -2,7 +2,9 @@
 	<view class="content">
 		<!-- 背景图 -->
 		<view class="index_bg">
-			<view class="welcome"><image class="welcome_img" src="../../static/index/welcome.png"></image></view>
+			<view class="welcome">
+				<image class="welcome_img" src="../../static/index/welcome.png"></image>
+			</view>
 		</view>
 		<!-- 第一层标题 -->
 		<view class="touming_bg">
@@ -13,8 +15,8 @@
 		<view class="two_all">
 			<view class="select-time" @click="openCalendar">
 				<view class="select-time-one">
-				  <text class="select-list">{{startWeek}}入住</text>
-				  <text class="select-list-time">{{startTime}}</text>
+					<text class="select-list">{{startWeek}}入住</text>
+					<text class="select-list-time">{{startTime}}</text>
 				</view>
 				<view class="select-center">
 					<view class="select-line1"></view>
@@ -22,14 +24,14 @@
 					<view class="select-line2"></view>
 				</view>
 				<view class="select-time-one">
-				  <text class="select-list">{{endWeek}}离店</text>
-				  <text class="select-list-time">{{endTime}}</text>
+					<text class="select-list">{{endWeek}}离店</text>
+					<text class="select-list-time">{{endTime}}</text>
 				</view>
 			</view>
 			<uni-popup ref="popup_picker" :mask-click="true">
 				<view class=popup_bg_picker>
-				<uni-calendar :selected="info.selected" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate"
-				:endDate="info.endDate" :range="info.range" @change="change"/>
+					<uni-calendar :selected="info.selected" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert"
+						:lunar="info.lunar" :startDate="info.startDate" :endDate="info.endDate" :range="info.range" @change="change" />
 				</view>
 			</uni-popup>
 			<view class="form_bg">
@@ -39,37 +41,12 @@
 				<view class="form-line"></view>
 				<view class="form-phone">{{cardPhone}}</view>
 				<view class="form-line" style="margin-top: 389rpx;"></view>
-				<view class="uni-list-cell-db">
-					<picker @change="bindPickerChange" :value="index" :range="array">
-						<view class="uni-input">{{array[index]}}</view>
-						<text class="jiantou">〉</text>
-					</picker>
-				</view>
-				<view class="form-line" style="margin-top: 477rpx;"></view>
-				<view class="uni-textarea">
-					<textarea @blur="bindTextAreaBlur" placeholder="在此填写您的要求" maxlength="50" auto-height />
-				</view>
-				<text class="textsrea-txt">{{textNum}}/50</text>
-			</view>
-		</view>
-		<!-- 第三层表单 -->
-		<view class="three_all">
-			<view class="three-title">
-				您是【
-				<text v-if="cardIdentity==4">教师</text>
-				<text v-if="cardIdentity==0">其他</text>
-				<text v-if="cardIdentity==1">学生</text>
-				<text v-if="cardIdentity==5">校友</text>
-				】
 			</view>
-			<view class="three-mark">本人可以免费入住，需要预交费<text style="color: rgba(255, 87, 51, 1);">{{payMount}}</text>元，即可享受权益</view>
-			<!-- <view class="three-zhu">注：水费为0.62元/吨，电费为1.1元/度；补助吨数为3吨，补助度数
-         为10度，超出标准需在预付款中扣除，未超出原路返回预付款</view> -->
 		</view>
 		<!-- 注释 -->
 		<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>
+			<text class="zhushi-mark"><text class="zhushi-circle"></text>入住免房费</text>
 			<text class="zhushi-mark"><text class="zhushi-circle"></text>提前选好房</text>
 		</view>
 		<!-- 支付框 -->
@@ -85,7 +62,7 @@
 			<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="确定" :content="order_txt" @confirm="dialogConfirm"
 				@close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
-		
+
 	</view>
 </template>
 
@@ -101,12 +78,12 @@
 			date = date.replace(/-/g, '/')
 		}
 		const dd = new Date(date)
-	
+
 		dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
-	
-		var a = new Array("日", "一", "二", "三", "四", "五", "六");  
-		var week = new Date().getDay();    
-		var week2 = new Date().getDay()+1;    
+
+		var a = new Array("日", "一", "二", "三", "四", "五", "六");
+		var week = new Date().getDay();
+		var week2 = new Date().getDay() + 1;
 		const y = dd.getFullYear()
 		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
 		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
@@ -115,14 +92,14 @@
 		const s = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
 		return {
 			fullDate: y + '-' + m + '-' + d,
-			fullDate2: y + '-' + m + '-' + d+' '+h+':'+f+':'+s,
+			fullDate2: y + '-' + m + '-' + d + ' ' + h + ':' + f + ':' + s,
 			fullTime: m + '月' + d + '日',
 			year: y,
 			month: m,
 			date: d,
 			day: dd.getDay(),
-			sWeek:"周"+ a[week],
-			eWeek:"周"+ a[week2]
+			sWeek: "周" + a[week],
+			eWeek: "周" + a[week2]
 		}
 	}
 	export default {
@@ -134,32 +111,32 @@
 					range: true,
 					insert: true,
 					selected: [],
-					startDate:'',
-					date:'',
-					endDate:''
+					startDate: '',
+					date: '',
+					endDate: ''
 				},
-				startTime:'',//到店日期
-				endTime:'',//离店日期
-				startDate:'',//默认到店日期接口数据
-				endDate:'',//默认离店日期接口数据
-				startWeek:'',// 默认入店日
-				endWeek:'',// 默认离店
+				startTime: '', //到店日期
+				endTime: '', //离店日期
+				startDate: '', //默认到店日期接口数据
+				endDate: '', //默认离店日期接口数据
+				startWeek: '', // 默认入店日
+				endWeek: '', // 默认离店
 				array: ['18:00前到店', '19:00前到店', '20:00前到店', '21:00前到店'],
 				index: 0,
-				mayTime:'',// 预计到店时间
-				typeName:'',//户型名
-				textNum:0,//输入框当前字数
-				cardName:'',//用户名
-				cardPhone:'',//用户电话
-				cardIdentity:'',//身份
-				submitToken:'',//请求令牌
-				roomTypeId:'',//房间类型id
-				remark:'',//备注要求
-				payMount:0,//应付金额
-				freeRoom:0,//剩余房间
-				ruzhu_num:1,//入住夜晚
-				order_txt:'',//提交订单时信息
-				msgType:'warn',
+				mayTime: '', // 预计到店时间
+				typeName: '', //户型名
+				textNum: 0, //输入框当前字数
+				cardName: '', //用户名
+				cardPhone: '', //用户电话
+				cardIdentity: '', //身份
+				submitToken: '', //请求令牌
+				roomTypeId: '', //房间类型id
+				remark: '', //备注要求
+				payMount: 0, //应付金额
+				freeRoom: 0, //剩余房间
+				ruzhu_num: 1, //入住夜晚
+				order_txt: '', //提交订单时信息
+				msgType: 'warn',
 			}
 		},
 		onLoad(option) {
@@ -167,15 +144,15 @@
 			// this.payMount=Number(option.payMount)
 			// this.ruzhu_num=option.ruzhu_num
 			// this.freeRoom=option.freeRoom
-			this.roomTypeId=option.roomTypeId
-			this.typeName=option.typeName
-			this.startTime=option.startTime
-			this.endTime=option.endTime
-			this.startDate=option.enableStartTime.substring(0,11)+"12:00:00"
-			this.endDate=option.enableEndTime.substring(0,11)+"14:00:00"
-			this.startWeek=this.getweekday(this.startDate)
-			this.endWeek=this.getweekday(this.endDate)
-			this.mayTime=this.startDate.substring(0,11)+"18:00:00"
+			this.roomTypeId = option.roomTypeId
+			this.typeName = option.typeName
+			this.startTime = option.startTime
+			this.endTime = option.endTime
+			this.startDate = option.enableStartTime.substring(0, 11) + "12:00:00"
+			this.endDate = option.enableEndTime.substring(0, 11) + "14:00:00"
+			this.startWeek = this.getweekday(this.startDate)
+			this.endWeek = this.getweekday(this.endDate)
+			this.mayTime = this.startDate.substring(0, 11) + "18:00:00"
 			// console.log(this.getweekday(this.startDate))
 			this.getTokenSubmit()
 		},
@@ -191,112 +168,109 @@
 			setTimeout(() => {
 				this.info.date = getDate(new Date()).fullDate
 				this.info.startDate = getDate(new Date()).fullDate
-				this.info.endDate =  getDate(new Date(),6).fullDate
+				this.info.endDate = getDate(new Date(), 6).fullDate
 				this.startTime = getDate(new Date()).fullTime
-				this.endTime = getDate(new Date(),1).fullTime
+				this.endTime = getDate(new Date(), 1).fullTime
 				this.startWeek = getDate(new Date()).sWeek
-				this.endWeek = getDate(new Date(),1).eWeek
-				this.ruzhu_num=1
+				this.endWeek = getDate(new Date(), 1).eWeek
+				this.ruzhu_num = 1
 			}, 20)
 		},
 		methods: {
 			// 获取请求令牌
 			getTokenSubmit() {
-				  let _self = this
-				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/submit/token",
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
+				let _self = this
+				this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/submit/token", {
+					headers: {
+						'user_token': localStorage.getItem('token')
+					}
+				}).then(res => {
 					res = res.data
 					if (res.success) {
-						this.submitToken=res.data.submitToken
+						this.submitToken = res.data.submitToken
 					} else {
-					  console.log('获取请求令牌失败')
+						console.log('获取请求令牌失败')
 					}
-				  });
+				});
 			},
 			// 获取用户信息
 			getUserInfo() {
-				  let _self = this
-				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
+				let _self = this
+				this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo", {
+					headers: {
+						'user_token': localStorage.getItem('token')
+					}
+				}).then(res => {
 					res = res.data
 					if (res.success) {
 						if (res.data.statu == '1') {
-						  _self.cardName=res.data.name
-						  _self.cardPhone=res.data.telPhone
-						  _self.cardIdentity=res.data.identityType
-						}else {
+							_self.cardName = res.data.name
+							_self.cardPhone = res.data.telPhone
+							_self.cardIdentity = res.data.identityType
+						} else {
 							alert('您没有权限，请联系客服')
 						}
 					} else {
-					  console.log('获取用户信息失败')
+						console.log('获取用户信息失败')
 					}
-				  });
+				});
 			},
 			// 确认订单
 			getOrderConfirm(type) {
 				let _self = this
-				this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/confirm?startTime="+this.startDate.substring(0,10)+"&endTime="+this.endDate.substring(0,10)+'&roomTypeId='+this.roomTypeId).then(res => {
+				this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/confirm?startTime=" + this.startDate.substring(0, 10) + "&endTime=" + this.endDate
+					.substring(0, 10) + '&roomTypeId=' + this.roomTypeId).then(res => {
 					res = res.data
 					if (res.success) {
-					  this.payMount=res.data.totalAmount
-					  this.freeRoom=res.data.freeNum
-					  this.ruzhu_num=res.data.nums
+						this.payMount = res.data.totalAmount
+						this.freeRoom = res.data.freeNum
+						this.ruzhu_num = res.data.nums
 					} else {
 						this.msgType = type
-						this.order_txt=res.message
+						this.order_txt = res.message
 						this.$refs.popup_order.open()
 					}
 				});
 			},
 			// 提交订单
 			getOrderSubmit(type) {
-				this.payUrl=''
+				this.payUrl = ''
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
 				this.$axios.defaults.headers.common['request_token'] = this.submitToken;
-				this.$axios.defaults.headers.common['Content-Type'] ='application/json'
-				this.$axios.post("/hotel/ihotel-api/ihotel/hotelOrder/user/order/submit",
-				{
-					"enableStartTime":this.startDate,//入住时间
-					"enableEndTime":this.endDate,//离店时间
-					"roomTypeId":this.roomTypeId,//房间类型id
-					"payAmount":this.payMount,//需支付金额
-					"userName":this.cardName,
-					"userPhone":this.cardPhone,
-					"mayIntoTime":this.mayTime,
-					"remark":this.remark,
-				}
-				).then(res => {
+				this.$axios.defaults.headers.common['Content-Type'] = 'application/json'
+				this.$axios.post("/hotel/ihotel-api/ihotel/hotelOrder/user/order/submit", {
+					"enableStartTime": this.startDate, //入住时间
+					"enableEndTime": this.endDate, //离店时间
+					"roomTypeId": this.roomTypeId, //房间类型id
+					"payAmount": this.payMount, //需支付金额
+					"userName": this.cardName,
+					"userPhone": this.cardPhone,
+					"mayIntoTime": this.mayTime,
+					"remark": this.remark,
+				}).then(res => {
 					res = res.data
 					if (res.success) {
-						if(res.data.payAmount==0) {
+						if (res.data.payAmount == 0) {
 							uni.navigateTo({
-								url:'../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
+								url: '../zhifuchenggong/zhifuchenggong?orderId=' + res.data.orderId
 							})
 						} else {
 							window.location.href = res.data.payUrl;
 						}
-						
+
 					} else {
 						this.msgType = type
-						this.order_txt=res.message
+						this.order_txt = res.message
 						this.$refs.popup_order.open()
 					}
 				});
 			},
 			// 计算指定时间是周几
-			getweekday(date){
-			   // date例如:'2022-03-05'
-				var weekArray = new Array("周日","周一", "周二", "周三", "周四", "周五", "周六")
-				var weeka  = weekArray[new Date(date).getDay()]
+			getweekday(date) {
+				// date例如:'2022-03-05'
+				var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六")
+				var weeka = weekArray[new Date(date).getDay()]
 				return weeka
 			},
 			//日历选择器
@@ -307,8 +281,7 @@
 				console.log('1change 返回:', e)
 				// 模拟动态打卡
 				// if (this.info.selected.length > 5) return
-				this.info.selected=[
-					{
+				this.info.selected = [{
 						date: e.range.before,
 						info: '到店'
 					},
@@ -317,19 +290,19 @@
 						info: '离店'
 					}
 				]
-				if(e.range.before!=''&&e.range.after=='') {
-					this.startWeek='周'+e.lunar.ncWeek.substring(2,3)
-				} else if(e.range.before!=''&&e.range.after!=''){
-					if((new Date(e.range.after).getTime())<(new Date(e.range.before).getTime())) {
-						this.order_txt='离店日期不能小于到店日期'
+				if (e.range.before != '' && e.range.after == '') {
+					this.startWeek = '周' + e.lunar.ncWeek.substring(2, 3)
+				} else if (e.range.before != '' && e.range.after != '') {
+					if ((new Date(e.range.after).getTime()) < (new Date(e.range.before).getTime())) {
+						this.order_txt = '离店日期不能小于到店日期'
 						this.$refs.popup_order.open()
-					}else{
-						this.endWeek='周'+e.lunar.ncWeek.substring(2,3)
-						this.startTime=e.range.before.substring(5,7)+'月'+e.range.before.substring(8,10)+'日'
-						this.endTime=e.range.after.substring(5,7)+'月'+e.range.after.substring(8,10)+'日'
-						this.startDate = e.range.before +' 14:00:00'
-						this.endDate =  e.range.after +' 12:00:00'
-						this.ruzhu_num=parseInt(((new Date(e.range.after).getTime())-(new Date(e.range.before).getTime()))/1000/60/60/24)
+					} else {
+						this.endWeek = '周' + e.lunar.ncWeek.substring(2, 3)
+						this.startTime = e.range.before.substring(5, 7) + '月' + e.range.before.substring(8, 10) + '日'
+						this.endTime = e.range.after.substring(5, 7) + '月' + e.range.after.substring(8, 10) + '日'
+						this.startDate = e.range.before + ' 14:00:00'
+						this.endDate = e.range.after + ' 12:00:00'
+						this.ruzhu_num = parseInt(((new Date(e.range.after).getTime()) - (new Date(e.range.before).getTime())) / 1000 / 60 / 60 / 24)
 					}
 				}
 			},
@@ -337,15 +310,15 @@
 			bindPickerChange: function(e) {
 				console.log('picker发送选择改变，携带值为', e.detail.value)
 				this.index = e.detail.value
-				this.mayTime = this.startDate.substring(0,11)+this.array[this.index].substring(0,5)+":00"
+				this.mayTime = this.startDate.substring(0, 11) + this.array[this.index].substring(0, 5) + ":00"
 				// console.log(this.mayTime)
 			},
 			// 输入框
-			bindTextAreaBlur: function (e) {
+			bindTextAreaBlur: function(e) {
 				// console.log(e.detail.cursor)
 				// console.log(e.detail.value)
-				this.textNum=e.detail.cursor
-				this.remark=e.detail.value
+				this.textNum = e.detail.cursor
+				this.remark = e.detail.value
 			}
 		}
 	}
@@ -353,4 +326,4 @@
 
 <style>
 	@import url("./css/order_room.css");
-</style>
+</style>