更新

main.js

@@ -13,8 +13,8 @@ import utils from '@/util/util.js'
 import webim from 'webim.js';
 import helper from'@/common/helper.js'
 // import axios from 'axios'
-import TabbarView from "./common/TabBarView.js";
-Vue.prototype.$tabbarView = new TabbarView();
+// import TabbarView from "./common/TabBarView.js";
+// Vue.prototype.$tabbarView = new TabbarView();
 Vue.prototype.$api = baseApi
 Vue.prototype.$request = request
 Vue.prototype.$utils = utils

pages/mine/driverCertification.vue

@@ -15,16 +15,16 @@
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
-			
+
 					<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 				</view>
-			
+
 				<view class="title">上传身份证国徽面</view>
 				<view @click="uploadImg(2,index)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传身份证国徽面</view>
 				</view>
-			
+
 				<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,index)"
 					class="preview-card-img picture">
 					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
@@ -32,16 +32,17 @@
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
-			
+
 					<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 				</view>
-			
+
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard" maxlength="18">
+					<u--input placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard"
+						maxlength="18">
 					</u--input>
 				</view>
-			
+
 				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
@@ -52,10 +53,11 @@
 					<view class="left-text">身份证地址</view>
 					<!-- <u--input placeholder="请输入身份证地址" inputAlign='right' border="none" v-model="dataDetails.cardAddress" maxlength="18">
 					</u--input> -->
-					<u--textarea v-model="dataDetails.cardAddress" border="none"  placeholder="请输入身份证地址" autoHeight  maxlength="30"></u--textarea>
+					<u--textarea v-model="dataDetails.cardAddress" border="none" placeholder="请输入身份证地址" autoHeight
+						maxlength="30"></u--textarea>
 				</view>
-				<u-picker  :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-				 @cancel='isShowcardValidity=false'	@confirm="confirmValidityPeriod" @change="changeHandler">
+				<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
+					@cancel='isShowcardValidity=false' @confirm="confirmValidityPeriod" @change="changeHandler">
 				</u-picker>
 			</view>
 			<view class="content1 content-other">
@@ -77,12 +79,13 @@
 					<view class="left-text">称呼</view>
 					<view class="flex">
 						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
-						v-model="dataDetails.driverCall" maxlength="1">
+							v-model="dataDetails.driverCall" maxlength="1">
 						</u--input>
-						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
+						<view style='margin-left:4px;font-size:15px;' class="flex align-center"
+							v-if="dataDetails.driverSex=='男'">先生</view>
 						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-else>女士</view>
 					</view>
-					
+
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
@@ -232,20 +235,22 @@
 						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='right' border="none"
 							v-model="item.bankDepositBranch">
 						</u--input>
-						<view @click="manualInput" class="type">选择支行</view>
+						<view @click="manualInput(index)" class="type">选择支行</view>
 					</view>
 					<view class="flex" v-if="!isShowManualInput">
-
-						<view class="select-bankzh point" @click="selectZhbank">
+						<u--input class="select-bankzh" placeholder="选择开户支行" inputAlign='right' border="none"
+							v-model="item.bankDepositBranch">
+						</u--input>
+						<!-- <view class="select-bankzh point" @click="selectZhbank">
 							{{item.bankDepositBranch?item.bankDepositBranch:'选择开户支行'}}
-						</view>
+						</view> -->
 						<view @click="manualInput" class="type">手动输入</view>
 					</view>
 				</view>
 				<view class="flex row flex-space-between">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName">
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" disabled>
 						</u--input>
 					</view>
 				</view>
@@ -412,20 +417,20 @@
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			delCard(type) {
@@ -627,18 +632,25 @@
 				this.dataDetails.hyDriverPayeeInfoList[this.index].bankDepositBranch = e.value[0]
 				this.isShowBank = false
 			},
-			manualInput() {
+			manualInput(val) {
+				this.index = val
 
 				if (this.isShowManualInput) {
-					if (uni.$u.test.isEmpty(this.bankType[this.index])) {
+					if (!this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请先上传银行卡！",
 						})
 						return true
+					} else if (this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl && uni.$u.test.isEmpty(
+							this.bankType[this.index])) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入开户支行！",
+						})
+						return true
 					}
 					this.isShowBank = true
-
 				} else {
 					this.isShowBank = false
 				}
@@ -685,22 +697,23 @@
 						})
 						return
 					}
-					var date=new Date()
-					if(e.value[0]<date.getFullYear()){
+					var date = new Date()
+					if (e.value[0] < date.getFullYear()) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e.value[
+							2]) <= (date.getDate())) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证已过期！",
@@ -749,102 +762,108 @@
 			},
 			// 上传图片
 			imgTypeSelect() {
-				var _this=this
+				var _this = this
 				// console.log(val)
-					uni.chooseImage({
-						count: 1,
-						// sourceType: this.$helper.chooseImage.sourceType,
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功回调函数
-									console.log('图片地址', result)
-									switch (_this.uploadType) {
-										// 身份正面
-										case 1:
-											_this.dataDetails.cardAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-														flag:1
-													}).then(res => {
-														if(res.data){
-															_this.dataDetails.cardAddress=res.data.recPersonAddr
-															_this.dataDetails.numberCard = res.data.recPersonNo
-															if (res.data.recPerson) {
-																_this.dataDetails.driverName = res.data.recPerson
-																_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
-																for (let i = 0; i < _this.dataDetails
-																	.hyDriverPayeeInfoList.length; i++
-																	) { //收款人需与司机本人一致
-																	_this.dataDetails.hyDriverPayeeInfoList[i]
-																		.payeeName = res.data.recPerson
-																}
-																console.log()
-															}
-															_this.dataDetails.driverBirthday=res.data.recPersonBrithday
+				uni.chooseImage({
+					count: 1,
+					// sourceType: this.$helper.chooseImage.sourceType,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功回调函数
+								console.log('图片地址', result)
+								switch (_this.uploadType) {
+									// 身份正面
+									case 1:
+										_this.dataDetails.cardAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 1
+												}).then(res => {
+												if (res.data) {
+													_this.dataDetails.cardAddress = res.data
+														.recPersonAddr
+													_this.dataDetails.numberCard = res.data.recPersonNo
+													if (res.data.recPerson) {
+														_this.dataDetails.driverName = res.data
+															.recPerson
+														_this.dataDetails.driverCall = res.data
+															.recPerson.substring(0, 1)
+														for (let i = 0; i < _this.dataDetails
+															.hyDriverPayeeInfoList.length; i++
+														) { //收款人需与司机本人一致
+															_this.dataDetails.hyDriverPayeeInfoList[i]
+																.payeeName = res.data.recPerson
 														}
-													
-
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break
-											// 身份反面
-										case 2:
-											_this.dataDetails.cardBackAddressUrl = result
-											// 识别
-											_this.$request.baseRequest('get',
-													'/driverInfo/personShibie', {
-														personImg: result,
-														flag:2
-													}).then(res => {
-													if(res.data.idCardValidity){
-														let date = res.data.idCardValidity.split("-")[1]
-													    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
+														console.log()
 													}
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break
-											// 银行卡
-										case 3:
-											_this.bankType[_this.index] = []
-											_this.$request.baseRequest('get',
-													'/driverInfo/bankShibie', {
-														bankImg: result,
-													}).then(res => {
-													_this.dataDetails.hyDriverPayeeInfoList[_this.index].payeeAddressUrl = result
-													if(res.data){
-														if (res.data.bankNo) {
-															_this.dataDetails.hyDriverPayeeInfoList[_this
-																.index].bankCard = res.data.bankNo
-														}
-														if (res.data.bankName) {
-															_this.dataDetails.hyDriverPayeeInfoList[_this
-																.index].bankDeposit = res.data.bankName
-														}
-														// 开户支行LIst
-														if (res.data.bankNameZhihang) {
-															_this.bankType[_this.index].push(res.data
-																.bankNameZhihang)
-														}
+													_this.dataDetails.driverBirthday = res.data
+														.recPersonBrithday
+												}
+
+
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
+										// 身份反面
+									case 2:
+										_this.dataDetails.cardBackAddressUrl = result
+										// 识别
+										_this.$request.baseRequest('get',
+												'/driverInfo/personShibie', {
+													personImg: result,
+													flag: 2
+												}).then(res => {
+												if (res.data.idCardValidity) {
+													let date = res.data.idCardValidity.split("-")[1]
+													_this.dataDetails.cardValidityDate = date.replace(
+														'.', '-').replace('.', '-')
+												}
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break
+										// 银行卡
+									case 3:
+										_this.bankType[_this.index] = []
+										_this.$request.baseRequest('get',
+												'/driverInfo/bankShibie', {
+													bankImg: result,
+												}).then(res => {
+												_this.dataDetails.hyDriverPayeeInfoList[_this.index]
+													.payeeAddressUrl = result
+												if (res.data) {
+													if (res.data.bankNo) {
+														_this.dataDetails.hyDriverPayeeInfoList[_this
+															.index].bankCard = res.data.bankNo
+													}
+													if (res.data.bankName) {
+														_this.dataDetails.hyDriverPayeeInfoList[_this
+															.index].bankDeposit = res.data.bankName
 													}
-													_this.$forceUpdate()
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-											break;
-									}
+													// 开户支行LIst
+													if (res.data.bankNameZhihang) {
+														_this.bankType[_this.index].push(res.data
+															.bankNameZhihang)
+													}
+												}
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
+										break;
 								}
-							)
-						}
-					});
+							}
+						)
+					}
+				});
 				// } else {
 				// } 
 				// else {
@@ -967,7 +986,7 @@
 								if (res.data.distinguishNum != "01") { //不等于01 证明银行卡验证不通过
 									// this.payCheck = false //验证开关
 									uni.$u.toast(res.data.distinguish);
-								}else{
+								} else {
 									uni.$u.route('/pages/mine/driverCertificationNext', {
 										data: JSON.stringify(this.dataDetails),
 									});
@@ -1326,7 +1345,7 @@
 			padding: 4rpx 10rpx;
 			font-size: 26rpx;
 			display: flex;
-			margin-left:4px;
+			margin-left: 26rpx;
 			justify-content: center;
 			align-items: center;
 		}
@@ -1377,14 +1396,17 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+
 	/deep/.u-radio-group--row {
-	    justify-content: flex-end;
+		justify-content: flex-end;
 	}
-	/deep/.u-textarea{
-		padding:9px 0;
+
+	/deep/.u-textarea {
+		padding: 9px 0;
 	}
-	/deep/.u-textarea__field{
-		color:#000;
-		text-align:right;
+
+	/deep/.u-textarea__field {
+		color: #000;
+		text-align: right;
 	}
 </style>

pages/mine/manageBankCards/addBankCard.vue

@@ -15,7 +15,6 @@
 				</view>
 				<image class="" :src="dataDetails.payeeAddressUrl" mode="aspectFit"></image>
 			</view>
-
 			<view class="flex row">
 				<view class="left-text">银行卡卡号</view>
 				<view class="flex">
@@ -39,9 +38,12 @@
 				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
-					<view class="select-bankzh" @click="selectZhbank">
+					<u--input class="select-bankzh point" placeholder="选择开户支行" inputAlign='left' border="none"
+						v-model="dataDetails.bankDepositBranch">
+					</u--input>
+					<!-- <view class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
-					</view>
+					</view> -->
 					<view @click="manualInput" class="type">手动输入</view>
 				</view>
 
@@ -104,24 +106,25 @@
 		onLoad() {
 			_this = this;
 			this.get_camera_permission()
-			this.dataDetails.driverId = this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id
+			this.dataDetails.driverId = this.userInfo.driverId ? this.userInfo.driverId : uni.getStorageSync(
+				"firstAuthentication").id
 		},
 		methods: {
 			async get_camera_permission() {
-				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
-				if(photol == false){
+				var photol = await permision.requestAndroidPermission("android.permission.CAMERA")
+				if (photol == false) {
 					uni.showModal({
 						title: '提示',
 						content: '您已经关闭相册权限,去设置',
-						success: function (res) {
+						success: function(res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
 						}
-					});	
+					});
 				}
 			},
 			delCard() {
@@ -138,12 +141,18 @@
 			},
 			// 选择支行
 			selectZhbank() {
-				if (uni.$u.test.isEmpty(this.columns)) {
+				if (!this.dataDetails.payeeAddressUrl) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "请先上传银行卡！",
 					})
 					return true
+				} else if (this.dataDetails.payeeAddressUrl && uni.$u.test.isEmpty(this.columns)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择手动输入开户支行！",
+					})
+					return true
 				}
 
 				this.isShowBank = true
@@ -155,12 +164,19 @@
 			},
 			manualInput() {
 				if (this.isShowManualInput) {
+
 					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "请先上传银行卡！",
 						})
 						return true
+					} else if (this.dataDetails.payeeAddressUrl && uni.$u.test.isEmpty(this.columns)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入开户支行！",
+						})
+						return true
 					}
 					this.isShowBank = true
 
@@ -210,40 +226,40 @@
 			imgTypeSelect(val) {
 				console.log(val)
 				// if (val.name == '相册') {
-					uni.chooseImage({
-						count: 1,
-						// sourceType: this.$helper.chooseImage.sourceType,
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage('image', res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功
-									console.log('图片地址', result)
-									_this.$request.baseRequest('get',
-											'/driverInfo/bankShibie', {
-												bankImg: result,
-											}).then(res => {
-											_this.dataDetails.payeeAddressUrl = result
-											if (res.data.bankNo) {
-												_this.dataDetails.bankCard = res.data.bankNo
-											}
-											if (res.data.bankName) {
-												_this.dataDetails.bankDeposit = res.data.bankName
-											}
-											// 开户支行LIst
-											if (res.data.bankNameZhihang) {
-												_this.columns.push(res.data
-													.bankNameZhihang)
-											}
-											_this.$forceUpdate()
-										})
-										.catch(res => {
-											uni.$u.toast(res.message);
-										});
-								}
-							)
-						}
-					});
+				uni.chooseImage({
+					count: 1,
+					// sourceType: this.$helper.chooseImage.sourceType,
+					success: function(res) {
+						console.log(JSON.stringify(res.tempFilePaths));
+						uploadImage('image', res.tempFilePaths[0], 'appData/',
+							result => {
+								// 上传成功
+								console.log('图片地址', result)
+								_this.$request.baseRequest('get',
+										'/driverInfo/bankShibie', {
+											bankImg: result,
+										}).then(res => {
+										_this.dataDetails.payeeAddressUrl = result
+										if (res.data.bankNo) {
+											_this.dataDetails.bankCard = res.data.bankNo
+										}
+										if (res.data.bankName) {
+											_this.dataDetails.bankDeposit = res.data.bankName
+										}
+										// 开户支行LIst
+										if (res.data.bankNameZhihang) {
+											_this.columns.push(res.data
+												.bankNameZhihang)
+										}
+										_this.$forceUpdate()
+									})
+									.catch(res => {
+										uni.$u.toast(res.message);
+									});
+							}
+						)
+					}
+				});
 				// } else {
 				// 	uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
 				// }
@@ -264,7 +280,7 @@
 					})
 					return true
 				}
-				if(this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 20){
+				if (this.dataDetails.bankCard.length < 16 || this.dataDetails.bankCard.length > 20) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "银行卡号输入错误！",
@@ -279,7 +295,7 @@
 					return true
 				}
 
-				if(this.dataDetails.bankDeposit.length < 4 || this.dataDetails.bankDeposit.length > 25){
+				if (this.dataDetails.bankDeposit.length < 4 || this.dataDetails.bankDeposit.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户行输入错误！",
@@ -294,7 +310,7 @@
 					return true
 				}
 
-				if(this.dataDetails.bankDepositBranch.length < 4 || this.dataDetails.bankDepositBranch.length > 25){
+				if (this.dataDetails.bankDepositBranch.length < 4 || this.dataDetails.bankDepositBranch.length > 25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户支行输入错误！",
@@ -374,22 +390,23 @@
 				// 		uni.$u.toast(res.message);
 				// 	});
 				if (that.validate()) return
-				if(this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").driverName){
+				if (this.dataDetails.payeeName != uni.getStorageSync("firstAuthentication").driverName) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "收款人须为司机本人！",
 					})
 					return
-				}else{
+				} else {
 					this.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', {
 						name: this.dataDetails.payeeName,
 						idCard: uni.getStorageSync("firstAuthentication").numberCard,
 						accountNo: this.dataDetails.bankCard
 					}).then(
 						res => {
-							if(res.data.distinguishNum == "01"){
+							if (res.data.distinguishNum == "01") {
 								this.dataDetails.commonId = this.userInfo.id
-								this.$request.baseRequest('post', '/driverPayeeInfo/api/addInfo', this.dataDetails).then(
+								this.$request.baseRequest('post', '/driverPayeeInfo/api/addInfo', this.dataDetails)
+									.then(
 										res => {
 											if (res.code == '200') {
 												let params = {
@@ -403,16 +420,16 @@
 													delta: 1
 												});
 												// uni.$u.route('/pages/mine/manageBankCards/index');
-								
+
 											} else {
 												uni.$u.toast(res.message);
 											}
-								
+
 										})
 									.catch(res => {
 										uni.$u.toast(res.message);
 									});
-							}else{
+							} else {
 								uni.$u.toast(res.message);
 							}
 						})
@@ -431,7 +448,7 @@
 	.content {
 		padding: 20rpx;
 		padding-bottom: 50rpx;
-		height:100vh;
+		height: 100vh;
 	}
 
 	.content3 {
@@ -510,6 +527,7 @@
 		justify-content: center;
 		align-items: center;
 		height: 68rpx;
+		margin-left: 26rpx;
 	}
 
 	.submit-btn {