zhongtianhaoyuan il y a 3 ans
Parent
commit
179098bfb5

+ 4 - 0
.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      	{
      		"launchtype" : "local"
      		"launchtype" : "local"
      	},
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      	"type" : "uniCloud"
      }
      }
     ]
     ]

+ 8 - 9
pages/mine/driverCertification.vue

@@ -74,12 +74,12 @@
 					</view>
 					</view>
 					<view class="flex row">
 					<view class="flex row">
 						<view class="left-text">总质量(千克)</view>
 						<view class="left-text">总质量(千克)</view>
-						<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="item.carTotalWeight">
+						<u--input placeholder="输入总质量" inputAlign='left' type="number" border="none" v-model="item.carTotalWeight">
 						</u--input>
 						</u--input>
 					</view>
 					</view>
 					<view class="flex row">
 					<view class="flex row">
 						<view class="left-text">核定载质量(千克)</view>
 						<view class="left-text">核定载质量(千克)</view>
-						<u--input placeholder="输入核定载质量" inputAlign='left' border="none"
+						<u--input placeholder="输入核定载质量" inputAlign='left' type="number" border="none"
 							v-model="item.carApprovedWeight">
 							v-model="item.carApprovedWeight">
 						</u--input>
 						</u--input>
 					</view>
 					</view>
@@ -88,7 +88,7 @@
 					</view>
 					</view>
 					<view class="flex row noborder input-ckg">
 					<view class="flex row noborder input-ckg">
 						<view class="input-positon">
 						<view class="input-positon">
-							<u--input class="input" placeholder="长" inputAlign='left' border="none"
+							<u--input class="input" placeholder="长" type="number" inputAlign='left' border="none"
 								v-model="item.carLong">
 								v-model="item.carLong">
 							</u--input>
 							</u--input>
 							<view class="position-right">
 							<view class="position-right">
@@ -97,7 +97,7 @@
 						</view>
 						</view>
 						<view class="star">*</view>
 						<view class="star">*</view>
 						<view class="input-positon">
 						<view class="input-positon">
-							<u--input placeholder="宽" inputAlign='left' border="none" v-model="item.carWidth">
+							<u--input placeholder="宽" type="number" inputAlign='left' border="none" v-model="item.carWidth">
 							</u--input>
 							</u--input>
 							<view class="position-right">
 							<view class="position-right">
 								mm
 								mm
@@ -105,7 +105,7 @@
 						</view>
 						</view>
 						<view class="star">*</view>
 						<view class="star">*</view>
 						<view class="input-positon">
 						<view class="input-positon">
-							<u--input placeholder="高" inputAlign='left' border="none" v-model="item.carHeight">
+							<u--input placeholder="高" inputAlign='left' type="number" border="none" v-model="item.carHeight">
 							</u--input>
 							</u--input>
 							<view class="position-right">
 							<view class="position-right">
 								mm
 								mm
@@ -856,8 +856,7 @@
 				}
 				}
 			},
 			},
 			next(val) {
 			next(val) {
-				console.log(111111111111)
-				// if (this.validate()) return
+				if (this.validate()) return
 				uni.$u.route('/pages/mine/driverCertificationNext', {
 				uni.$u.route('/pages/mine/driverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),
 					data: JSON.stringify(this.dataDetails),
 				});
 				});
@@ -1216,11 +1215,11 @@
 		padding: 40rpx 20rpx 50rpx 20rpx;
 		padding: 40rpx 20rpx 50rpx 20rpx;
 
 
 		.next-btn {
 		.next-btn {
-			background: #F1F3F6;
+			background: #22C572;
 			width: 90%;
 			width: 90%;
 			padding: 20rpx 20rpx;
 			padding: 20rpx 20rpx;
 			text-align: center;
 			text-align: center;
-			color: #C5CAD4;
+			color: #FFFFFF;
 			border-radius: 50rpx;
 			border-radius: 50rpx;
 		}
 		}
 	}
 	}

+ 70 - 15
pages/mine/driverCertificationNext.vue

@@ -68,6 +68,11 @@
 					</view>
 					</view>
 					<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 					<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 				</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">行驶证档案编号</view>
+					<u--input placeholder="输入行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.drivingLicenseNumber">
+					</u--input>
+				</view>
 
 
 				<view class="flex row">
 				<view class="flex row">
 					<view class="left-text">行驶证有效期</view>
 					<view class="left-text">行驶证有效期</view>
@@ -107,6 +112,11 @@
 						<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 						<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 					</view>
 					</view>
 				</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">挂车行驶证档案编号</view>
+					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.trailerLicenseNumber">
+					</u--input>
+				</view>
 
 
 				<view class="flex row" v-if="isGCar">
 				<view class="flex row" v-if="isGCar">
 					<view class="left-text">挂车行驶证有效期</view>
 					<view class="left-text">挂车行驶证有效期</view>
@@ -136,10 +146,10 @@
 					</view>
 					</view>
 				</view>
 				</view>
 
 
-				<view class="title">运营证</view>
+				<view class="title">道路运输证</view>
 				<view @click="uploadImg(8)" class="picture picture8" v-if="!dataDetails.operationCertificate">
 				<view @click="uploadImg(8)" class="picture picture8" v-if="!dataDetails.operationCertificate">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
-					<view class="text">上传运营证</view>
+					<view class="text">上传道路运输证</view>
 				</view>
 				</view>
 				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(1)"
 				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
 					class="preview-card-img picture">
@@ -150,18 +160,23 @@
 					<image class="" :src="dataDetails.operationCertificate" mode="aspectFit"></image>
 					<image class="" :src="dataDetails.operationCertificate" mode="aspectFit"></image>
 				</view>
 				</view>
 				<view class="flex row">
 				<view class="flex row">
-					<view class="left-text">运营证有效期</view>
+					<view class="left-text">道路运输证号</view>
+					<u--input placeholder="输入道路运输证号" inputAlign='left' border="none" v-model="dataDetails.operationCertificateNumber">
+					</u--input>
+				</view>
+				<view class="flex row">
+					<view class="left-text">道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(4)">
 					<view class="" @click="selectValidityPeriod(4)">
 						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
 						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
 					</view>
 					</view>
 				</view>
 				</view>
 
 
 				<view v-if="isGCar">
 				<view v-if="isGCar">
-					<view class="title row flex">挂车运营证</view>
+					<view class="title row flex">挂车道路运输证</view>
 					<view @click="uploadImg(9)" class="picture picture9"
 					<view @click="uploadImg(9)" class="picture picture9"
 						v-if="!dataDetails.trailerOperationCertificate">
 						v-if="!dataDetails.trailerOperationCertificate">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
-						<view class="text">上传挂车运营证</view>
+						<view class="text">上传挂车道路运输证</view>
 					</view>
 					</view>
 					<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
 					<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
 						class="preview-card-img picture">
 						class="preview-card-img picture">
@@ -172,9 +187,14 @@
 						<image class="" :src="dataDetails.trailerOperationCertificate" mode="aspectFit"></image>
 						<image class="" :src="dataDetails.trailerOperationCertificate" mode="aspectFit"></image>
 					</view>
 					</view>
 				</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">挂车道路运输证号</view>
+					<u--input placeholder="输入挂车道路运输证号" inputAlign='left' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
+					</u--input>
+				</view>
 
 
 				<view class="flex row" v-if="isGCar">
 				<view class="flex row" v-if="isGCar">
-					<view class="left-text">挂车运营证有效期</view>
+					<view class="left-text">挂车道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(5)">
 					<view class="" @click="selectValidityPeriod(5)">
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
 					</view>
 					</view>
@@ -410,7 +430,14 @@
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseValidityDate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseValidityDate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
-						message: "行驶证副页不能为空!",
+						message: "行驶证有效期不能为空!",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证档案编号不能为空!",
 					})
 					})
 					return true
 					return true
 				}
 				}
@@ -421,7 +448,7 @@
 					})
 					})
 					return true
 					return true
 				}
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseBackPage)) {
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
 						message: "挂车行驶证副页不能为空!",
 						message: "挂车行驶证副页不能为空!",
@@ -435,6 +462,13 @@
 					})
 					})
 					return true
 					return true
 				}
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "挂车行驶证档案编号不能为空!",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
@@ -459,44 +493,65 @@
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
-						message: "运营证不能为空!",
+						message: "道路运输证不能为空!",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "道路运输证号不能为空!",
 					})
 					})
 					return true
 					return true
 				}
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateValidityDate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificateValidityDate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
-						message: "运营证有效期不能为空!",
+						message: "道路运输证有效期不能为空!",
 					})
 					})
 					return true
 					return true
 				}
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
-						message: "挂车运营证不能为空!",
+						message: "挂车道路运输证不能为空!",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "挂车道路运输证号不能为空!",
 					})
 					})
 					return true
 					return true
 				}
 				}
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 				if (uni.$u.test.isEmpty(this.dataDetails.trailerOperationCertificateValidityDate)) {
 					this.$refs.uToast.show({
 					this.$refs.uToast.show({
 						type: 'error',
 						type: 'error',
-						message: "挂车运营证有效期不能为空!",
+						message: "挂车道路运输证有效期不能为空!",
 					})
 					})
 					return true
 					return true
 				}
 				}
 				return false
 				return false
 			},
 			},
 			submit() {
 			submit() {
-				uni.switchTab({
-					url:'/pages/mine/index'
-				})
+				
+			
 				// 校验
 				// 校验
 				if (this.validate()) return
 				if (this.validate()) return
+				debugger
 				if(this.dataDetails.driverSex=='男'){
 				if(this.dataDetails.driverSex=='男'){
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
 				}else{
 				}else{
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'女士'
 					this.dataDetails.driverCall = this.dataDetails.driverCall+'女士'
 				}
 				}
+				if(!this.consentStatus){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请勾选协议!",
+					})
+					return
+				}