基本完成

pages/index/css/index.css

@@ -274,7 +274,7 @@
 .room-icon {
 	position: absolute;
 	margin-left: 261rpx;
-	margin-top: 116rpx;
+	margin-top: 136rpx;
 }
 
 .before-price {

pages/index/index.vue

@@ -83,7 +83,9 @@
 					<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 class="room-mark">描述：配置1.5米双人床一张</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 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>
@@ -124,7 +126,7 @@
 						</view>
 					</swiper-item>
 				</swiper>
-				<text class="popup_title2">便利设施</text>
+				<text class="popup_title2">介绍</text>
 				<view class="popup_txt">
 					<view class="popup_txt_in">{{ typeText }}</view>
 				</view>
@@ -168,7 +170,7 @@
 		<uni-popup ref="popup_xuzhu_no" type="dialog">
 			<uni-popup-dialog cancelText="关闭" confirmText="确定" content="请先订房" @close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
-		<a :href="'https://chtech.ncjti.edu.cn/hotelReservation/zhotel2/appcode.action?card_number=' + cardNumber" id="shouquanId"></a>
+		<a :href="'https://chtech.ncjti.edu.cn/hotelReservation/zhotel/appcode.action?card_number=' + cardNumber" id="shouquanId"></a>
 	</view>
 </template>
 
@@ -364,7 +366,7 @@
 				that.roomType = []
 				// ?startDate=" + that.startDate.substring(0, 10) + "&endDate=" + that.endDate.substring(0, 10)
 				that.$myRequest({
-					url: '/hotelReservation/zhotel2/apphouse_list.action',
+					url: '/hotelReservation/zhotel/apphouse_list.action',
 				}).then(res => {
 					if (res.data.code === 200) {
 						let data = res.data.data;
@@ -384,7 +386,7 @@
 			getUserInfo() {
 				var that = this;
 				that.$myRequest({
-					url: '/hotelReservation/zhotel2/appuser.action?card_number=' + that.cardNumber,
+					url: '/hotelReservation/zhotel/appuser.action?card_number=' + that.cardNumber,
 				}).then(res => {
 					if (res.data.code === 200) {
 						if (that.$utils.isEmpty(res.data.data.openid)) {
@@ -405,27 +407,27 @@
 								}
 							})
 						}
-					// } else {
-					// 	uni.showToast({
-					// 		title: res.data.message
-					// 	})
+						// } else {
+						// 	uni.showToast({
+						// 		title: res.data.message
+						// 	})
 					}
 				});
 			},
-			// // 房型详情接口
+			// 房型详情接口
 			getRoomTypeInfo(id) {
 				let _self = this
 				_self.typeText = ''
 				_self.img = []
 				if (id === 1) {
-					_self.typeText = '描述标准型'
-					_self.img = ['../../static/index/std.jpg', '../../static/index/std.jpg', '../../static/index/std.jpg']
+					_self.typeText = '一室一卫，内有沙发、茶几、空调、电视、衣柜、24小时热水、阳台房间朝南面。'
+					_self.img = ['/static/index/std.jpg', '/static/index/std.jpg', '/static/index/std.jpg']
 				} else if (id === 2) {
-					_self.typeText = '描述高级型'
-					_self.img = ['../../static/index/adv.jpg', '../../static/index/adv1.jpg', '../../static/index/adv2.jpg']
+					_self.typeText = '一室一厅一卫，有标准公寓所有设施，客厅配有空调、3座沙发、书桌。卧室、阳台均朝北面。'
+					_self.img = ['/static/index/adv.jpg', '/static/index/adv1.jpg', '/static/index/adv2.jpg']
 				} else {
-					_self.typeText = '描述豪华型'
-					_self.img = ['../../static/index/lux.jpg', '../../static/index/lux1.jpg', '../../static/index/lux2.jpg']
+					_self.typeText = '一室一厅一卫，有标准公寓所有设施，大客厅配落地空调、5座沙发、书桌。卧室、大阳台均朝南面。'
+					_self.img = ['/static/index/lux.jpg', '/static/index/lux1.jpg', '/static/index/lux2.jpg']
 				}
 			},
 			// 订单列表
@@ -434,7 +436,7 @@
 				_self.xuzhu_type = []
 				_self.tui_type = []
 				_self.dai_type = []
-				this.$axios.get("/hotelReservation/zhotel2/order/page?curPage=1&pageSize=100", {
+				this.$axios.get("/hotelReservation/zhotel/order/page?curPage=1&pageSize=100", {
 					headers: {
 						'user_token': localStorage.getItem('token')
 					}
@@ -472,11 +474,11 @@
 				let _self = this
 				_self.roomType = []
 				// if (enableNum >= 1) {
-					uni.navigateTo({
-						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
-					});
+				uni.navigateTo({
+					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
+				});
 				// }
 				// this.getRoomType()
 			},
@@ -536,8 +538,10 @@
 					this.getRoomTypeInfo(1)
 				} else if (h_type.indexOf('高级') !== -1) {
 					this.getRoomTypeInfo(2)
-				} else {
+				} else if (h_type.indexOf('豪华') !== -1) {
 					this.getRoomTypeInfo(3)
+				} else {
+					
 				}
 			},
 			popupClose() {

pages/my_orderlist/my_orderlist.vue

@@ -7,6 +7,7 @@
 			<view :class="['inv-h',Inv==2?'inv-h-se':'']" @click="changeTab(2)">已支付</view>
 			<view :class="['inv-h',Inv==3?'inv-h-se':'']" @click="changeTab(3)">已入住</view>
 			<view :class="['inv-h',Inv==4?'inv-h-se':'']" @click="changeTab(4)">已取消</view>
+			<view :class="['inv-h',Inv==7?'inv-h-se':'']" @click="changeTab(7)">退款中</view>
 			<view :class="['inv-h',Inv==5?'inv-h-se':'']" @click="changeTab(5)">已退款</view>
 			<view :class="['inv-h',Inv==6?'inv-h-se':'']" @click="changeTab(6)">已退房</view>
 		</scroll-view>
@@ -27,15 +28,16 @@
 						<text v-else-if="item.status==3">已入住</text>
 						<text v-else-if="item.status==4">已取消</text>
 						<text v-else-if="item.status==5">已退款</text>
-						<text v-else="item.status==6">已退房</text>
+						<text v-else-if="item.status==6">已退房</text>
+						<text v-else="item.status==7">退款中</text>
 					</view>
 					<view class="room-price">￥{{ item.pay_account }}</view>
 				</view>
 				<!-- <uni-countdown v-if="item.status == 0" class="room-count" color="#FF5733" :show-day="false" :second="timeupSecond"
 					@timeup="timeup(item.createTime)" />
 				<text v-if="item.status == 0" class="room-count-txt">之后取消</text> -->
-				<view class="room-button" v-if="item.status != 3 && item.status != 4 && item.status != 5 && item.status != 6">
-					<text v-if="item.status == 1 || item.status == 2" @click="openQu(item.id,'warn')">取消订单</text>
+				<view class="room-button3" v-if="item.status == 2">
+					<text v-if="item.status == 2" @click="openQu(item.order_num,'warn')">取消订单</text>
 					<!-- <text v-else-if="item.status == 0" @click="openDel(item.id,'warn')">删除</text> -->
 					<!-- <text v-else="item.status == 5" @click="openDel(item.id,'warn')">删除</text> -->
 					<!-- <text v-else-if="item.status == 2">取消订单</text> -->
@@ -216,7 +218,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': hType,
@@ -274,12 +276,13 @@
 				var Inv2 = that.Inv
 				that.troom = []
 				that.room = []
-				// if (that.Inv == 6) {
-				// 	Inv2 = 0
-				// }
+				if (that.Inv == 0) {
+					Inv2 = 'null'
+				}
 				that.$myRequest({
-					url: '/hotelReservation/zhotel2/appqueryOrder.action?card_number=' + that.cardNumber + '&state=' + Inv2
+					url: '/hotelReservation/zhotel/appqueryOrder.action?card_number=' + that.cardNumber + '&state=' + Inv2
 				}).then(res => {
+					// console.log(res.data);
 					var data = res.data
 					if (data.code === 200) {
 						data.data.forEach(item => {
@@ -336,19 +339,17 @@
 			},
 			// 取消订单弹框
 			openQu(id, type) {
-				uni.showToast({
-					title: '接口未完成'
-				})
-				// this.order_txt_id = id
-				// this.msgType2 = type
-				// this.order_txt2 = '确定取消订单？'
-				// this.$refs.popup_order2.open()
+				// console.log(id, type);
+				this.order_txt_id = id
+				this.msgType2 = type
+				this.order_txt2 = '确定取消订单？'
+				this.$refs.popup_order2.open()
 			},
 			// 办理退房
 			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 = '退房成功'
@@ -366,7 +367,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 = '办理入住成功'
@@ -382,7 +383,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 = '删除订单成功'
@@ -400,15 +401,15 @@
 				let that = this
 				// that.$axios.defaults.headers.common['user_token'] = that.$utils.getEncryptedData('token');
 				that.$myRequest({
-					url: '/hotelReservation/zhotel2/ihotel/hotelOrder/user/order/cancel/' + that.order_txt_id
+					url: '/hotelReservation/zhotel/apprefund.action?order_num=' + that.order_txt_id
 				}).then(res => {
-					alert(JSON.stringify(res.data))
+					// console.log(res.data);
 					if (res.data.code === 200) {
-						that.order_txt = '取消成功'
+						that.order_txt = '退款成功'
 						that.$refs.popup_order.open()
 						that.getOrderPage()
 					} else {
-						that.order_txt = res.message
+						that.order_txt = res.data.message
 						that.$refs.popup_order.open()
 					}
 				});

pages/myself/css/myself.css

@@ -64,7 +64,6 @@
 	margin-left: 20rpx;
 	margin-right: 20rpx;
 	width: 710rpx;
-	height: 397rpx;
 	background: rgba(255, 255, 255, 1);
 	border-radius: 9rpx;
 }
@@ -89,6 +88,7 @@
 	display: flex;
 	flex-direction: row;
 	flex-wrap: wrap;
+	justify-content: space-between;
 	width: 710rpx;
 	padding: 20rpx;
 	background: rgba(255, 255, 255, 1);
@@ -100,7 +100,7 @@
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	flex-grow: 1;
+	width: 180rpx;
 	padding: 20rpx;
 	outline: 1px solid #fafafa;
 }

pages/myself/myself.vue

@@ -31,6 +31,10 @@
 					<image src="../../static/my/yiquxiao.svg" class="img-btn"></image>
 					<text class="list-txt">已取消</text>
 				</view>
+				<view class="item-list-one" @tap="navigateToDingdan(7)">
+					<image src="../../static/my/dairuzhu.svg" class="img-btn"></image>
+					<text class="list-txt">退款中</text>
+				</view>
 				<view class="item-list-one" @tap="navigateToDingdan(5)">
 					<image src="../../static/my/wancheng.svg" class="img-btn"></image>
 					<text class="list-txt">已退款</text>
@@ -82,7 +86,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

pages/order_room/order_room.vue

@@ -9,7 +9,7 @@
 		<!-- 第一层标题 -->
 		<view class="touming_bg">
 			<view class="touming_title">墨轩湖姬子公寓（南昌交通学院）</view>
-			<view class="touming_txt">尊敬的老师，您辛苦了，欢迎入住！</view>
+			<view class="touming_txt">您辛苦了，欢迎入住！</view>
 		</view>
 		<!-- 第二层表单 -->
 		<view class="two_all">

pages/ruzhuxuzhi/ruzhuxuzhi.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="container">
-		<view class="title">南昌交通学院研究生公寓入住须知</view>
+		<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 class="inscribe">研究生公寓</view>
 	</view>
 </template>
 
@@ -13,39 +14,46 @@
 			return {
 				xuzhiList: [{
 						id: 1,
-						list: '尊敬的家长，欢迎入住本公寓，为了给您的居住环境营造安全舒适的环境，在入住公寓前请仔细阅读并遵守本须知：'
+						list: '尊敬的新生家长：'
 					}, {
 						id: 2,
-						list: '一、入住人员凭本人有效身份证在前台办理入住手续。'
+						list: '欢迎选择入住研究生公寓，为维护公寓正常秩序，保障大家的人身、财产平安，根据学校《研究生公寓管理规定》，现将公寓入住有关事项提示如下：'
 					},
 					{
 						id: 3,
-						list: '二、办理住宿登记后，方可入住，退房时间为次日中午12点前，超过12点增收半天房费，晚上6点以后离店收取一天房费。'
+						list: '一、新生家长入住，须出示有效证件，核对预定信息，办理登记手续。'
 					},
 					{
 						id: 4,
-						list: '三、在9月3日之前均可免费取消，9月3号之后房间保留不退款，9月5号系统将关闭，所有用户需线下订房。'
+						list: '二、入住期间公寓不提供早餐，如有需要可到选择到学校食堂或商业街用餐。'
 					},
 					{
 						id: 5,
-						list: '四、入住时需交定额押金，如有丢失失钥匙/ic卡，把被单、被罩染上油渍、污渍、血渍或被单烧坏将扣除押金或照价赔偿。'
+						list: '三、为保障入住环境，公寓每天会安排保洁人员对各房间和楼层进行卫生保洁，并配置一次性洗漱用品。'
 					},
 					{
 						id: 6,
-						list: '五、禁止在客房内吸烟，更不能在客房内燃烧物品。'
+						list: '四、外出时，请注意门是否锁上，切勿将贵重物品留在房间内，如有遗失，概不负责。'
 					},
 					{
 						id: 7,
-						list: '六、为了防止影响其他入住人员休息，晚间外出请在12点前返回。'
+						list: '五、公寓退房时间为次日中午12点前，超过十二点增收半天房费，晚上六点以后离开收取一天的房费。'
 					},
 					{
 						id: 8,
-						list: '七、禁止使用电烤箱、电饭煲、电炉等大功率电器用品。'
+						list: '六、为了您的健康和平安，请勿卧床吸烟，烟蒂请投入烟灰缸内。'
 					},
 					{
 						id: 9,
-						list: '八、24小时热线电话：19807957890'
+						list: '七、请保持室内外卫生，不要随地吐痰，乱扔废弃物，更不要在洗脸池内乱扔脏物，以免堵塞管道。'
 					},
+					{
+						id: 10,
+						list: '八、入住时需缴纳押金200元，如有遗失钥匙或把被单、被罩染上油渍、污渍、血渍或被单烧坏将扣除押金或照价赔偿。'
+					},{
+						id: 11,
+						list: '感谢您的支持与配合！'
+					}
 				]
 			}
 		},
@@ -69,7 +77,7 @@
 
 	.title {
 		font-size: 32rpx;
-		font-weight: 600;
+		font-weight: 800;
 		text-align: center;
 		width: 750rpx;
 		height: 100rpx;
@@ -90,4 +98,15 @@
 		box-sizing: border-box;
 		padding-right: 20rpx;
 	}
+	
+	.inscribe {
+		width: 750rpx;
+		text-align: right;
+		box-sizing: border-box;
+		font-size: 28rpx;
+		font-weight: 400;
+		background: rgba(255, 255, 255, 1);
+		color: rgba(102, 102, 102, 1);
+		padding: 0 50rpx 80rpx 0;
+	}
 </style>