Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

pages/mine/company/addcompany.vue

@@ -255,7 +255,7 @@
 
 		<view class='footer'>
 			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
-			<view @click="$u.throttle(submit, 5000)" class='newlyIncreased'>提交</view>
+			<view @click="$u.throttle(submit(), 5000)" class='newlyIncreased'>提交</view>
 		</view>
 		<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			@change="changeHandler" @cancel="isShowcardValidity=false">
@@ -741,6 +741,13 @@
 					})
 					return true
 				}
+				if(uni.$u.test.isEmpty(this.dataDetails.bankCard)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "卡号不能为空！",
+					})
+					return true
+				}
 				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
 					this.$refs.uToast.show({
 						type: 'error',
@@ -748,6 +755,22 @@
 					})
 					return true
 				}
+				
+				if(uni.$u.test.isEmpty(this.dataDetails.bankDeposit)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户行不能为空！",
+					})
+					return true
+				}
+				if(uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户支行不能为空！",
+					})
+					return true
+				}
+				
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -767,19 +790,16 @@
 				// 		return true
 				// 	}
 				// }
-				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "视频认证不能为空！",
-				// 	})
-				// 	return true
-				// }
+				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "视频认证不能为空！",
+					})
+					return true
+				}
 			},
 			submit() {
 				if (this.validate()) return
-				if (!this.submitstatus) {
-					this.submitstatus = true
-
 					if (!this.consentStatus) {
 						uni.showToast({
 							title: '请勾选协议',
@@ -812,7 +832,6 @@
 								duration: 2000
 							})
 						});
-				}
 
 			},
 			consent() {

pages/mine/company/editcompany.vue

@@ -632,6 +632,13 @@
 					})
 					return true
 				}
+				if(uni.$u.test.isEmpty(this.dataDetails.bankCard)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "卡号不能为空！",
+					})
+					return true
+				}
 				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
 					this.$refs.uToast.show({
 						type: 'error',
@@ -639,6 +646,21 @@
 					})
 					return true
 				}
+				
+				if(uni.$u.test.isEmpty(this.dataDetails.bankDeposit)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户行不能为空！",
+					})
+					return true
+				}
+				if(uni.$u.test.isEmpty(this.dataDetails.bankDepositBranch)){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "开户支行不能为空！",
+					})
+					return true
+				}
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -658,13 +680,13 @@
 				// 		return true
 				// 	}
 				// }
-				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "视频认证不能为空！",
-				// 	})
-				// 	return true
-				// }
+				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "视频认证不能为空！",
+					})
+					return true
+				}
 			},
 			companyNamechange(e) {
 				console.log(e)