subpkg/chooseHotel/chooseHotel.vue

@@ -63,6 +63,7 @@
 				notFound: false,
 				displayScanner: true,
 				source: "",
+				appId: ""
 			}
 		},
 		methods: {
@@ -70,9 +71,15 @@
 			async inputChanged() {
 				this.notFound = false
 
-				let res = await uni.$http.get(`/hotel/hotelName/${this.hotelName}`)
+				let res = await uni.$http.post('/hotel/available', {
+					appId: this.appId,
+					hotelName: this.hotelName
+				})
+				
+				
 				if (res.data.data.length === 0) {
 					this.notFound = true
+					console.log("sous", res);
 					return
 				}
 				this.hotelList = res.data.data
@@ -108,7 +115,9 @@
 				// #endif
 			},
 			async getHotels() {
-				let res = await uni.$http.get('/hotel')
+				let res = await uni.$http.post('/hotel/available', {
+					appId: this.appId
+				})
 				this.hotelList = res.data.data
 			},
 			async queryHotelByHotelId(hotelId) {
@@ -145,6 +154,8 @@
 			// #endif
 
 			// 首次载入页面渲染全部酒店，后可根据搜索来搜索其他酒店
+			const {miniProgram: {appId}} = uni.getAccountInfoSync();
+			this.appId = appId
 			await this.getHotels()
 		},
 	}
@@ -228,7 +239,7 @@
 				background-color: #ffffff;
 				width: 100%;
 				position: absolute;
-				top: 120rpx;
+				top: 350rpx;
 				left: 0;
 				bottom: 0;
 				padding-top: 20rpx;

subpkg/extend/extend.vue

@@ -137,7 +137,6 @@
 				endTime: '',
 				canExtend: false,
 				checkinInfoId: '',
-				useYst: true
 			};
 		},
 		computed: {
@@ -242,7 +241,7 @@
 			async pay(orderId) {
 				console.log("pay start");
 				// #ifdef MP-WEIXIN
-				if (this.useYst) {
+				if (this.currentHotel.paymentChannel === "YST") {
 					await this.ystPayment(orderId)
 				} else {
 					let res = await uni.$http.post('/order/payment/weChat', {

subpkg_checkin/confirmOrder/confirmOrder.vue

@@ -97,7 +97,7 @@
 					<text text="" align="right" size="20">(注：需付押金{{order.deposit ? order.deposit : ""}}元)</text>
 				</view>
 			</view>
-			<view class="completeBtn" v-if="useYst">
+			<view class="completeBtn" v-if="currentHotel.paymentChannel === 'YST'">
 				<button class="u-button" @click="ystPayment">支付</button>
 			</view>
 			<view class="completeBtn" v-else>
@@ -146,7 +146,6 @@
 					}
 				}],
 				title: "",
-				useYst: true,
 				// #ifdef MP-ALIPAY
 				rightBtns: [{
 					text: "删除",