阶段性提交

App.vue

@@ -23,7 +23,7 @@
 			var errorMsg = this.$utils.getEncryptedData('errorMsg');
 
 			if (this.$utils.isEmpty(cardNumber) && this.$utils.isEmpty(token) && this.$utils.isEmpty(errorMsg)) {
-				var url = 'https://chtech.ncjti.edu.cn/hotelReservation/zhotel2/appopenid.action';
+				var url = 'https://chtech.ncjti.edu.cn/hotelReservation/zhotel/appopenid.action';
 				var encodedUrl = encodeURIComponent(url);
 				window.location.href = 'https://open.wecard.qq.com/connect/oauth/authorize' +
 					'?app_key=9FFFACD6D09F15D2' +

manifest.json

@@ -70,15 +70,15 @@
             "proxy" : {
                 //使用代理
                 // https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/roomType/list
-                "/hotelReservation/zhotel2" : {
+                "/hotelReservation/zhotel" : {
                     // https://chtech.ncjti.edu.cn/air-conditioner-control/h5/
-                    "target" : "https://chtech.ncjti.edu.cn/hotelReservation/zhotel2", //目标地址
+                    "target" : "https://chtech.ncjti.edu.cn/hotelReservation/zhotel", //目标地址
                     "changeOrigin" : true,
                     "secure" : true, // 设置支持https协议的代理
 
                     // 设置地址重定向，把程序中/api开头的路径替换成:http://t.yushu.im"
                     "pathRewrite" : {
-                        "/hotelReservation/zhotel2" : "" // 设置/api路径重定向
+                        "/hotelReservation/zhotel" : "" // 设置/api路径重定向
                     }
                 }
             }

pages/index/css/index.css

@@ -288,7 +288,7 @@
 .room-price {
 	position: absolute;
 	/* margin-left: 605rpx; */
-	margin-top: 46rpx;
+	margin-top: 18rpx;
 	margin-left: 578rpx;
 	color: rgba(255, 87, 51, 1);
 	font-size: 42rpx;

pages/index/index.vue

@@ -417,17 +417,6 @@
 				let _self = this
 				_self.typeText = ''
 				_self.img = []
-				// this.$axios.get(`/hotelReservation/zhotel2/ihotel/roomType/info/${id}`).then(res => {
-				// 	res = res.data
-				// 	if (res.success) {
-				// console.log(res)
-				// _self.typeText = res.data.typeDesc
-				// _self.img = res.data.typeImage.split(',')
-				// console.log(_self.img)
-				// 	} else {
-				// 		console.log('获取房型详情失败')
-				// 	}
-				// });
 				if (id === 1) {
 					_self.typeText = '描述标准型'
 					_self.img = ['../../static/index/std.jpg', '../../static/index/std.jpg', '../../static/index/std.jpg']
@@ -468,13 +457,13 @@
 			// 跳转到入住须知
 			navigateToXuzhi() {
 				uni.navigateTo({
-					url: "../ruzhuxuzhi/ruzhuxuzhi",
+					url: "/pages/ruzhuxuzhi/ruzhuxuzhi",
 				});
 			},
 			// 跳转到公寓详情
 			navigateToXiangqing() {
 				uni.navigateTo({
-					url: "../gongyujieshao/gongyujieshao",
+					url: "/pages/gongyujieshao/gongyujieshao",
 				});
 			},
 			// 订房间 
@@ -484,7 +473,7 @@
 				_self.roomType = []
 				// if (enableNum >= 1) {
 					uni.navigateTo({
-						url: "../order_room/order_room?roomTypeId=" + id + "&enableStartTime=" + _self.startDate + "&enableEndTime=" + _self.endDate +
+						url: "/pages/order_room/order_room?roomTypeId=" + id + "&enableStartTime=" + _self.startDate + "&enableEndTime=" + _self.endDate +
 							"&startTime=" + _self.startTime + "&endTime=" + _self.endTime + "&ruzhu_num=" + _self.ruzhu_num + "&typeName=" + typeName +
 							"&freeRoom=" + enableNum + "&price=" + price
 					});
@@ -507,7 +496,7 @@
 					}
 					if (this.dai_panduan.length >= 1) {
 						uni.navigateTo({
-							url: "../my_orderlist/my_orderlist?Inv=2"
+							url: "/pages/my_orderlist/my_orderlist?Inv=2"
 						})
 					} else if (this.dai_panduan.length < 1) {
 						this.msgType = type
@@ -532,7 +521,7 @@
 					}
 					if (this.tui_panduan.length >= 1) {
 						uni.navigateTo({
-							url: "../my_orderlist/my_orderlist?Inv=3"
+							url: "/pages/my_orderlist/my_orderlist?Inv=3"
 						})
 					} else if (this.tui_panduan.length < 1) {
 						this.msgType = type
@@ -571,7 +560,7 @@
 					console.log(this.xuzhu_panduan)
 					if (this.xuzhu_panduan.length > 1) {
 						uni.navigateTo({
-							url: "../my_orderlist/my_orderlist?Inv=3"
+							url: "/pages/my_orderlist/my_orderlist?Inv=3"
 						})
 					} else if (this.xuzhu_panduan.length == 1) {
 						this.$refs.popup_xuzhu.open()

pages/my_orderlist/css/my_orderlist.css

@@ -5,6 +5,7 @@
 	justify-content: center;
 	background-color: #F2F3F5;
 }
+
 /*切换栏*/
 .inv-h-w {
 	background-color: #FFFFFF;
@@ -17,6 +18,7 @@
 	overflow-x: auto;
 	border: 1rpx solid #fdfdfc;
 }
+
 .inv-h-w::-webkit-scrollbar-thumb {
 	/*滚动条里面小方块*/
 	border-radius: 5px;
@@ -48,13 +50,14 @@
 }
 
 /* 订单样式 */
-.room-kuang{
-	display: block; 
+.room-kuang {
+	display: block;
 	width: 750rpx;
 	background-color: #FFFFFF;
 	margin-top: 5rpx;
 }
-.room-xinxi{
+
+.room-xinxi {
 	/* display: -webkit-box; */
 	flex-direction: column;
 	align-items: center;
@@ -62,7 +65,8 @@
 	height: 243rpx;
 	margin-top: 20rpx;
 }
-.room-image{
+
+.room-image {
 	position: absolute;
 	margin-left: 51rpx;
 	margin-top: 10rpx;
@@ -70,7 +74,8 @@
 	height: 125rpx;
 	border-radius: 5px;
 }
-.room-name{
+
+.room-name {
 	position: absolute;
 	margin-left: 236rpx;
 	margin-top: 10rpx;
@@ -78,7 +83,8 @@
 	font-size: 34rpx;
 	font-weight: 400;
 }
-.room-time{
+
+.room-time {
 	position: absolute;
 	margin-left: 236rpx;
 	margin-top: 56rpx;
@@ -86,7 +92,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-order{
+
+.room-order {
 	position: absolute;
 	margin-left: 236rpx;
 	margin-top: 96rpx;
@@ -94,14 +101,16 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-type{
+
+.room-type {
 	position: absolute;
 	margin-left: 627rpx;
 	color: rgba(128, 128, 128, 1);
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-price{
+
+.room-price {
 	position: absolute;
 	margin-left: 580rpx;
 	margin-top: 46rpx;
@@ -109,15 +118,17 @@
 	font-size: 42rpx;
 	font-weight: 500;
 }
-.room-count{
+
+.room-count {
 	position: absolute;
 	margin-left: 51rpx;
 	margin-top: 155rpx;
 	font-size: 24rpx;
 	font-weight: 400;
-	color:#FF5733;
+	color: #FF5733;
 }
-.room-count-txt{
+
+.room-count-txt {
 	position: absolute;
 	margin-left: 205rpx;
 	margin-top: 155rpx;
@@ -125,7 +136,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.room-button{
+
+.room-button {
 	position: absolute;
 	margin-left: 381rpx;
 	margin-top: 146rpx;
@@ -137,6 +149,7 @@
 	line-height: 56rpx;
 	color: rgba(41, 109, 227, 1);
 }
+
 /* .room-button2{
 	position: absolute;
 	margin-left: 551rpx;
@@ -149,7 +162,7 @@
 	line-height: 56rpx;
 	color: rgba(41, 109, 227, 1);
 } */
-.room-button3{
+.room-button3 {
 	position: absolute;
 	margin-left: 551rpx;
 	margin-top: 146rpx;
@@ -163,7 +176,8 @@
 	color: rgba(255, 255, 255, 1);
 	font-size: 28rpx;
 }
-.room-line{
+
+.room-line {
 	position: absolute;
 	margin-left: 20rpx;
 	margin-top: 225rpx;
@@ -171,14 +185,16 @@
 	height: 1px;
 	background: rgba(220, 225, 230, 1);
 }
+
 /* 办理续住弹窗 */
-.popup_bg_xu{
+.popup_bg_xu {
 	width: 650rpx;
 	height: 575rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 6rpx;
 }
-.popup_title{
+
+.popup_title {
 	position: absolute;
 	margin-left: 40rpx;
 	margin-top: 20rpx;
@@ -187,7 +203,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;
@@ -195,21 +212,25 @@
 	height: 32px;
 	background-image: url(../../static/index/swiper_x.svg);
 }
-.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;
@@ -217,7 +238,8 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
-.select-circle{
+
+.select-circle {
 	position: absolute;
 	width: 81rpx;
 	height: 46rpx;
@@ -231,7 +253,8 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
-.select-line2{
+
+.select-line2 {
 	position: absolute;
 	margin-left: 94px;
 	margin-top: 36px;
@@ -239,7 +262,8 @@
 	height: 1px;
 	background: rgba(41, 109, 227, 1);
 }
-.select-time-xu{
+
+.select-time-xu {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-start;
@@ -249,14 +273,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;
@@ -265,7 +291,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;
@@ -273,8 +300,9 @@
 	font-size: 24rpx;
 	font-weight: 400;
 }
+
 /* 支付框 */
-.fukuan{
+.fukuan {
 	display: flex;
 	padding-top: 475rpx;
 	width: 650rpx;
@@ -283,7 +311,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;
@@ -291,7 +320,8 @@
 	text-align: center;
 	line-height: 100rpx;
 }
-.fu-zhifu{
+
+.fu-zhifu {
 	float: right;
 	width: 288rpx;
 	height: 100rpx;
@@ -302,8 +332,9 @@
 	text-align: center;
 	line-height: 100rpx;
 }
+
 /* 弹出框 */
-.kuang_txt{
+.kuang_txt {
 	align-items: center;
 	justify-content: center;
 	padding: 15rpx;

pages/my_orderlist/my_orderlist.vue

@@ -191,7 +191,7 @@
 									success: (res) => {
 										if (res.confirm) {
 											uni.navigateTo({
-												url: "../my_orderlist/my_orderlist?Inv=2"
+												url: "/pages/my_orderlist/my_orderlist?Inv=2"
 											})
 										}
 									}
@@ -416,7 +416,7 @@
 			// 订单取消再次预订
 			navigateToZaici(enableStartTime, enableEndTime, roomTypeId) {
 				uni.navigateTo({
-					url: "../order_room/order_room?enableStartTime=" + enableStartTime + "&enableEndTime=" + enableEndTime + "&startTime=" +
+					url: "/pages/order_room/order_room?enableStartTime=" + enableStartTime + "&enableEndTime=" + enableEndTime + "&startTime=" +
 						enableStartTime.substring(5, 7) + '月' + enableStartTime.substring(8, 10) + '日' + "&endTime=" + enableEndTime.substring(5, 7) +
 						'月' + enableEndTime.substring(8, 10) + '日' + "&roomTypeId=" + roomTypeId
 				})
@@ -430,7 +430,7 @@
 			// 处理结账
 			navigateToJiezhang(id) {
 				uni.navigateTo({
-					url: "../order_mark/order_mark?orderId=" + id
+					url: "/pages/order_mark/order_mark?orderId=" + id
 				})
 			},
 			/*
@@ -498,7 +498,7 @@
 			navigateToOrderMark(id) {
 				// console.log(id)
 				uni.navigateTo({
-					url: "../order_mark/order_mark?orderId=" + id,
+					url: "/pages/order_mark/order_mark?orderId=" + id,
 				})
 			},
 			// 办理续住弹窗

pages/myself/myself.vue

@@ -111,7 +111,7 @@
 			// 跳转到订单
 			navigateToDingdan(index) {
 				uni.navigateTo({
-					url: "../my_orderlist/my_orderlist?Inv=" + index,
+					url: "/pages/my_orderlist/my_orderlist?Inv=" + index,
 				})
 			},
 			// 拨打人工热线

pages/order_mark/order_mark.vue

@@ -112,7 +112,7 @@
 			getOrderInfo() {
 				let _self = this
 				_self.orderList = []
-				this.$axios.get(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/${this.orderId}`, {
+				this.$axios.get(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/${this.orderId}`, {
 					headers: {
 						'user_token': localStorage.getItem('token')
 					}
@@ -176,7 +176,7 @@
 			// 订单结账信息
 			getOrderBill() {
 				let _self = this
-				this.$axios.get(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/bill/${this.orderId}`, {
+				this.$axios.get(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/bill/${this.orderId}`, {
 					headers: {
 						'user_token': localStorage.getItem('token')
 					}
@@ -196,7 +196,7 @@
 			// 订单取消再次预订
 			navigateToZaici(enableStartTime, enableEndTime, roomTypeId) {
 				uni.navigateTo({
-					url: "../order_room/order_room?enableStartTime=" + enableStartTime + "&enableEndTime=" + enableEndTime + "&startTime=" +
+					url: "/pages/order_room/order_room?enableStartTime=" + enableStartTime + "&enableEndTime=" + enableEndTime + "&startTime=" +
 						enableStartTime.substring(5, 7) + '月' + enableStartTime.substring(8, 10) + '日' + "&endTime=" + enableEndTime.substring(5, 7) +
 						'月' + enableEndTime.substring(8, 10) + '日' + "&roomTypeId=" + roomTypeId
 				})
@@ -205,7 +205,7 @@
 			getOrderCancel(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`, ).then(res => {
+				this.$axios.put(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`, ).then(res => {
 					res = res.data
 					if (res.success) {
 						this.order_txt = '取消成功'
@@ -220,7 +220,7 @@
 			// 支付订单
 			getOrderPay(orderId) {
 				let _self = this
-				this.$axios.get(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/pay/${orderId}`, {
+				this.$axios.get(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/pay/${orderId}`, {
 					headers: {
 						'user_token': localStorage.getItem('token')
 					}
@@ -245,7 +245,7 @@
 			getOrderDelete(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.delete(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/${this.order_txt_id}`, ).then(res => {
+				this.$axios.delete(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/${this.order_txt_id}`, ).then(res => {
 					res = res.data
 					if (res.success) {
 						this.order_txt = '删除订单成功'
@@ -267,7 +267,7 @@
 			getOrderHold(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`, ).then(res => {
+				this.$axios.put(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`, ).then(res => {
 					res = res.data
 					if (res.success) {
 						this.order_txt = '办理入住成功'
@@ -283,7 +283,7 @@
 			getOrderReturn(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`, ).then(res => {
+				this.$axios.put(`/hotelReservation/zhotel/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`, ).then(res => {
 					res = res.data
 					if (res.success) {
 						this.order_txt = '退房成功'

pages/order_room/css/order_room.css

@@ -269,12 +269,16 @@
 
 /* 支付框 */
 .fukuan {
+	position: fixed;
+	bottom: 0;
+	right: 0;
 	display: flex;
 	margin-top: 38rpx;
 	width: 750rpx;
 	height: 100rpx;
 	background: rgba(255, 255, 255, 1);
 	box-shadow: 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
+	box-sizing: border-box;
 }
 
 .fu-price {

pages/order_room/order_room.vue

@@ -171,7 +171,7 @@
 									success: (res) => {
 										if (res.confirm) {
 											uni.navigateTo({
-												url: "../my_orderlist/my_orderlist?Inv=2"
+												url: "/pages/my_orderlist/my_orderlist?Inv=2"
 											})
 										}
 									}
@@ -205,7 +205,7 @@
 				}
 				that.cardNumber = tempCardNumber;
 				that.$myRequest({
-					url: '/hotelReservation/zhotel2/appuser.action?card_number=' + that.cardNumber
+					url: '/hotelReservation/zhotel/appuser.action?card_number=' + that.cardNumber
 				}).then(res => {
 					// console.log(res);
 					let data = res.data.data
@@ -237,7 +237,7 @@
 				let that = this
 				that.$myRequest({
 					method: 'POST',
-					url: '/hotelReservation/zhotel2/apporder_pay.action',
+					url: '/hotelReservation/zhotel/apporder_pay.action',
 					data: {
 						'card_number': that.cardNumber,
 						'h_type': that.h_type,

pages/ruzhuxuzhi/ruzhuxuzhi.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="content">
-		<view class="xuzhi">
-			<view style="margin-left: 50rpx;margin-top: 15rpx;margin-right: 15rpx;" v-for="(item,index) in xuzhiList" :key="index">•{{item.list}}</view>
+	<view class="container">
+		<view class="title">南昌交通学院研究生公寓入住须知</view>
+		<view class="items">
+			<view style="margin-left: 50rpx;margin-top: 15rpx;margin-right: 15rpx;" v-for="( item, index ) in xuzhiList" :key="index">{{ item.list }}</view>
 		</view>
 	</view>
 </template>
@@ -10,38 +11,83 @@
 	export default {
 		data() {
 			return {
-				xuzhiList:[
-					{id:1,list:'酒店在14:00后办理入住；'},
-					{id:2,list:'我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊；'},
-					{id:3,list:'我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊，时机、分享形式、分享动机、分享场景4个维度来聊聊；'},
+				xuzhiList: [{
+						id: 1,
+						list: '尊敬的家长，欢迎入住本公寓，为了给您的居住环境营造安全舒适的环境，在入住公寓前请仔细阅读并遵守本须知：'
+					}, {
+						id: 2,
+						list: '一、入住人员凭本人有效身份证在前台办理入住手续。'
+					},
+					{
+						id: 3,
+						list: '二、办理住宿登记后，方可入住，退房时间为次日中午12点前，超过12点增收半天房费，晚上6点以后离店收取一天房费。'
+					},
+					{
+						id: 4,
+						list: '三、在9月3日之前均可免费取消，9月3号之后房间保留不退款，9月5号系统将关闭，所有用户需线下订房。'
+					},
+					{
+						id: 5,
+						list: '四、入住时需交定额押金，如有丢失失钥匙/ic卡，把被单、被罩染上油渍、污渍、血渍或被单烧坏将扣除押金或照价赔偿。'
+					},
+					{
+						id: 6,
+						list: '五、禁止在客房内吸烟，更不能在客房内燃烧物品。'
+					},
+					{
+						id: 7,
+						list: '六、为了防止影响其他入住人员休息，晚间外出请在12点前返回。'
+					},
+					{
+						id: 8,
+						list: '七、禁止使用电烤箱、电饭煲、电炉等大功率电器用品。'
+					},
+					{
+						id: 9,
+						list: '八、24小时热线电话：19807957890'
+					},
 				]
 			}
 		},
 		onLoad() {
-			
+
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
-	.content {
+<style scoped>
+	.container {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
 		justify-content: center;
+		align-items: center;
 		background-color: #F2F3F5;
 	}
-	.xuzhi{
-		display: revert;
-		margin-top: 20rpx;
+
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		text-align: center;
+		width: 750rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		background: rgba(255, 255, 255, 1);
+		color: rgba(102, 102, 102, 1);
+		box-sizing: border-box;
+	}
+
+	.items {
 		width: 750rpx;
-		height: 1300rpx;
+		height: calc(100vh - 100rpx);
 		background: rgba(255, 255, 255, 1);
 		color: rgba(102, 102, 102, 1);
 		font-size: 28rpx;
 		font-weight: 400;
+		text-indent: 2em;
+		box-sizing: border-box;
+		padding-right: 20rpx;
 	}
 </style>