zhongtianhaoyuan 2 years ago
parent
commit
59847bff93

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'https://api.changyuntong56.com',
-	baseUrlNew: 'https://apitest.changyuntong56.com',
+	// baseUrlNew: 'https://apitest.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

+ 10 - 3
pages/mine/driverCertification.vue

@@ -220,7 +220,7 @@
 				<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.bankCard">
+						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard" maxlength="19">
 						</u--input>
 					</view>
 				</view>
@@ -250,7 +250,7 @@
 				<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" disabled>
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" readonly>
 						</u--input>
 					</view>
 				</view>
@@ -787,6 +787,14 @@
 													_this.dataDetails.cardAddress = res.data
 														.recPersonAddr
 													_this.dataDetails.numberCard = res.data.recPersonNo
+													if(res.data.recPersonNo && res.data.recPersonNo.length == 18){  //自动获取性别
+														let sex = res.data.recPersonNo.substr(-2,1)
+														if(sex % 2 == 0){
+															_this.dataDetails.driverSex = "女"
+														}else{
+															_this.dataDetails.driverSex = "男"
+														}
+													}
 													if (res.data.recPerson) {
 														_this.dataDetails.driverName = res.data
 															.recPerson
@@ -798,7 +806,6 @@
 															_this.dataDetails.hyDriverPayeeInfoList[i]
 																.payeeName = res.data.recPerson
 														}
-														console.log()
 													}
 													_this.dataDetails.driverBirthday = res.data
 														.recPersonBrithday

+ 4 - 3
pages/mine/index.vue

@@ -13,8 +13,8 @@
 				<view class="right-text">
 					<!-- <view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} -->
 					<!-- {{hasLogin?driverSex:""}} -->
-					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}
-					</view>
+					<!-- <view class="name" v-if='userName'></view> -->
+					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
 			</view>
@@ -238,7 +238,8 @@
 								this.userName = this.firstAuthentication.driverCall
 								this.driverSex = "先生"
 							} else {
-								this.userName = this.firstAuthentication.driverCall
+								// this.userName = this.firstAuthentication.driverCall
+								this.userName = this.userInfo.userName //未认证时  显示(用户 + 电话号)未认证没有性别,通过性别判断认证或未认证
 								this.driverSex = ""
 							}
 

+ 14 - 9
pages/mine/manageVehicles/addVehicle.vue

@@ -1394,15 +1394,20 @@
 						})
 						return true
 					}
-					// if (this.dataDetails.fileList2.length == 0) {
-					// 	this.$refs.uToast.show({
-					// 		type: 'error',
-					// 		message: "人和挂车合影不能为空!",
-					// 	})
-					// 	return true
-					// }
-					
-					
+					if (this.fileList1.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传人和牵引车合影!",
+						})
+						return true
+					}
+					if (this.fileList2.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传人和挂车合影!",
+						})
+						return true
+					}	
 				}
 
 				

+ 2 - 1
pages/order/addEvaluation.vue

@@ -280,7 +280,8 @@
 		.ziti {
 			color: #909090;
 			margin-right: 20rpx;
-			width: 160rpx;
+			width: 200rpx;
+			min-width: 180rpx;
 		}
 
 		.xkuang {