subpkg_checkin/checkin/checkin.vue

@@ -105,7 +105,7 @@
 						let failName = this.checkinInfo[falsePos].name
 						uni.showModal({
 							showCancel: false,
-							content: '办理失败，请至 订单->已入住 处重新办理；若仍失败，请至联系前台',
+							content: '办理失败，请重新选择订单',
 							success: (res) => {
 								if (res.confirm) {
 									uni.switchTab({

subpkg_checkin/confirmOrder/confirmOrder.vue

@@ -223,18 +223,33 @@
 						uni.$http.post(`/hotelOrder/cancelPayment/${this.order.id}`)
 					}
 				} else {
-					uni.showModal({
-						content: '房间已被占用，请重新选房',
-						showCancel: false,
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
-										this.order.roomType
-								})
+					//小程序创建的订单跳转至选择房间，pms预订单跳转至查询订单
+					if (this.order.orderSource === 'MINI_APP') {
+						uni.showModal({
+							content: '房间已被占用，请重新选房',
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									uni.navigateTo({
+										url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
+											this.order.roomType
+									})
+								}
 							}
-						}
-					})
+						})
+					} else {
+						uni.showModal({
+							content: '订单不可用，请重新选择订单',
+							showCancel: false,
+							success: (res) => {
+								if (res.confirm) {
+									uni.navigateTo({
+										url: '/subpkg_checkin/queryOrder/queryOrder?'
+									})
+								}
+							}
+						})
+					}
 				}
 				// #endif