酒店民宿下单流程优化

pages/house/createOrder.vue

@@ -147,7 +147,8 @@
 			<view class="total"><text>订单金额：</text><text>￥{{totalMOney}}</text></view>
 			<view class="btns">
 				<text @click="confirmOrder(2)" v-if="today==1">直接入住</text>
-				<text @click="confirmOrder(1)">提交</text>
+				<text @click="confirmOrder(1)" v-if="!orderStatus">保存</text>
+				<!-- 新增和编辑时由此按钮 -->
 			</view>
 		</view>
 		<u-picker :itemHeight="88" :immediateChange="true" :show="showLaiyuan" :columns="laiyuan" title="来源选择"
@@ -223,6 +224,7 @@
 						}
 					]
 				],
+				flowTypeNames:['微信','支付宝','云闪付'],
 				roomId: '',
 				laiyuan: [
 					[]
@@ -459,6 +461,12 @@
 						this.dataForm.detailFormList[0].checkInTypeName = this.checkInType[0].filter((item => item
 							.val ==this.dataForm.detailFormList[0].checkInType))[0].label;
 						this.totalMOney = this.dataForm.orderAmount;
+						this.dataForm.flowRecord.forEach((i,index)=>{
+							let flowTypeName=i.flowType==1?'收款':'退款';
+							let payTypeName=this.flowTypeNames[i.payType];
+							this.$set(this.dataForm.flowRecord[index],'flowTypeName',flowTypeName)
+							this.$set(this.dataForm.flowRecord[index],'payTypeName',payTypeName)
+						})
 						
 					}
 				})

pages/house/index.vue

@@ -247,6 +247,8 @@
 						this.clearData();
 						this.areaShow = false;
 						this.init()
+					}else{
+						this.$showToast(res.data.msg);
 					}
 
 				})
@@ -384,7 +386,7 @@
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		z-index: 999999;
+		z-index: 9;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;

pages/house/payAdd.vue

@@ -71,8 +71,6 @@ import list from '../../uni_modules/uview-ui/libs/config/props/list';
 				passengerDefault: [0],
 				checkboxList:[{
 					name:'收款'
-				},{
-					name:'退款'
 				}],
 				dataForm: {
 					flowType: '',
@@ -83,6 +81,7 @@ import list from '../../uni_modules/uview-ui/libs/config/props/list';
 					payTypeName: ''
 				},
 				haspay:0,
+				
 				payStyle: [
 					[{
 							label: '微信',

pages/house/stayCheck.vue

@@ -150,16 +150,11 @@
 			},
 			conform() {
 				this.checkInPersonList.forEach((item) => {
-					console.log(item.checkInPhone);
-					console.log(item.idCard);
-					console.log(1)
 					if (!this.$u.test.mobile(item.checkInPhone)) {
-						console.log('请输入正确手机号');
 						this.$showToast('请输入正确手机号');
 						return
 					}
 					if (!this.$u.test.idCard(item.idCard)) {
-						console.log('请输入正确身份证号');
 						this.$showToast('请输入正确身份证号');
 						return
 					}