subpkg_checkin/addGuest/addGuest.vue

@@ -241,6 +241,15 @@
 					uni.$showMsg('手机号格式错误！')
 					return
 				}
+				//判断此顾客信息是否已添加
+				if (JSON.stringify(this.checkinInfo) !== '{}' && this.checkinInfo.length > 0) {
+					for (let info of this.checkinInfo) {
+						if (info.idNumber === this.idNumber) {
+							uni.$showMsg('已添加此顾客，请检查填写信息')
+							return
+						}
+					}
+				}
 				//检查该顾客是否在当前酒店入住
 				let res = await uni.$http.post('/checkinInfo/queryByCondition', {
 					userIdNumber: this.idNumber,
@@ -257,16 +266,6 @@
 				let pages = getCurrentPages()
 				let beforePage = pages[pages.length - 2]
 
-				//判断此顾客信息是否已添加
-				if (JSON.stringify(this.checkinInfo) !== '{}' && this.checkinInfo.length > 0) {
-					for (let info of this.checkinInfo) {
-						if (info.idNumber === this.idNumber) {
-							uni.$showMsg('已添加此顾客，请检查填写信息')
-							return
-						}
-					}
-				}
-
 				//判断本地缓存是否有顾客身份证信息，有则跳转step 2
 				for (const info of this.idCardInfo) {
 					if (info.idNumber === this.idNumber && info.name === this.name) {

subpkg_checkin/confirmOrder/confirmOrder.vue

@@ -221,6 +221,7 @@
 				} else {
 					uni.showModal({
 						content: '房间已被占用，请重新选房',
+						showCancel: false,
 						success: (res) => {
 							if (res.confirm) {
 								uni.navigateTo({

subpkg_checkin/selectCheckinType/selectCheckinType.vue

@@ -163,11 +163,6 @@
 				background-color: #9e97c3;
 				margin: 0 60rpx 60rpx;
 				font-size: 33rpx;
-
-				&:hover {
-					color: #FFFFFF;
-					background-color: #CECBE1;
-				}
 			}
 		}
 	}