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

pages/house/payAdd.vue

@@ -73,8 +73,8 @@ import list from '../../uni_modules/uview-ui/libs/config/props/list';
 					name:'收款'
 				}],
 				dataForm: {
-					flowType: '',
-					flowTypeName:'',
+					flowType: '1',
+					flowTypeName:'收款',
 					amount: '',
 					remark: '',
 					payType: '',
@@ -118,6 +118,9 @@ import list from '../../uni_modules/uview-ui/libs/config/props/list';
 				this.showPay = false;
 			},
 			conform() {
+				if(this.dataForm.payType==''){
+					return this.$showToast('请选择支付方式');
+				}
 				if(this.dataForm.flowTypeName=='收款'){
 					this.dataForm.flowType=1;
 				}else{