Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pages/house/createOrder.vue

@@ -429,7 +429,7 @@
 				this.dataForm.detailFormList[0].checkInPersonList.splice(index, 1)
 			},
 			confirmOrder(orderStatus) {
-				console.log('0000000', orderStatus);
+
 				if (!this.dataForm.guestName) {
 					this.$showToast('请输入姓名');
 					return
@@ -454,8 +454,14 @@
 				// 	return
 				// }
 				//orderStatus//预约入住 1，直接入住2
-				if (orderStatus) {
-					this.dataForm.orderStatus = orderStatus;
+
+				// if (orderStatus) {
+				// 	this.dataForm.orderStatus = orderStatus ;
+				// }
+				if (!this.dataForm.orderStatus) {
+					this.dataForm.orderStatus = orderStatus || 1;
+				} else {
+					this.dataForm.orderStatus = orderStatus || this.dataForm.orderStatus;
 				}
 				let url = '';
 				if (this.dataForm.id) {

pages/house/stayCheck.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page" :style="{'height':(h)+'px','padding-top':mt+'px'}">
+	<view class="page" :style="{'padding-top':mt+'px'}">
 		<c-nav-bar title="添加入住人" :showIcon="true"></c-nav-bar>
 		<u-form :model="form" ref="form">
 			<view class="box" v-for="(item,index) in checkInPersonList">