前端

config/index.js

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

pages/mine/driverCertificationNext.vue

@@ -166,7 +166,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">从业资格证号</view>
-					<u--input placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 <!--

pages/mine/editDriverCertificationNext.vue

@@ -167,7 +167,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">从业资格证号</view>
-					<u--input placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 				<!--

pages/mine/index.vue

@@ -21,23 +21,23 @@
 			<view></view>
 		</view>
 		<view class="content1">
-			<view class="left">
+			<view @click="goDetailPage('/pages/mine/driverCertification',1)" class="left">
 				<view class="icon">
 					<image class="sfrz-icon" src="@/static/images/mine/sfrz.png" mode='widthFix'>
 					</image>
 				</view>
-				<view class="right-text" @click="goDetailPage('/pages/mine/driverCertification',1)">
+				<view class="right-text" >
 					<view class="top">司机认证</view>
 					<view class="bottom">{{hasLogin? statusVal : '你还没有完成身份认证' }}</view>
 				</view>
 
 			</view>
-			<view class="right">
+			<view @click="goDetailPage('/pages/mine/evaluate')" class="right">
 				<view class="icon">
 					<image class="sfrz-icon" src="@/static/images/mine/pingjia@2x.png" mode='widthFix'>
 					</image>
 				</view>
-				<view class="right-text" @click="goDetailPage('/pages/mine/evaluate')">
+				<view class="right-text" >
 					<view class="top">货主评价</view>
 					<view class="bottom">看看货主对你的评价吧</view>
 				</view>

pages/mine/manageBankCards/addBankCard.vue

@@ -264,7 +264,7 @@
 					})
 					return true
 				}
-				if (uni.$u.test.rangeLength(this.dataDetails.bankCard,[16,20])) {
+				if (this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>20) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "银行卡号输入错误！",
@@ -278,7 +278,7 @@
 					})
 					return true
 				}
-				if (uni.$u.test.rangeLength(this.dataDetails.bankDeposit,[4,25])) {
+				if (this.dataDetails.bankDeposit.lrngth<4||this.dataDetails.bankDeposit.lrngth>25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户行输入错误！",
@@ -292,27 +292,27 @@
 					})
 					return true
 				}
-				if (uni.$u.test.rangeLength(this.dataDetails.bankDepositBranch,[4,25])) {
+				if (this.dataDetails.bankDepositBranch.length<4||this.dataDetails.bankDepositBranch.length>25) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "开户支行输入错误！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.cardholderName)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "持卡人姓名不能为空！",
-					})
-					return true
-				}
-				if (uni.$u.test.isEmpty(this.dataDetails.cardholderIdNumber)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "持卡人身份证号不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.cardholderName)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "持卡人姓名不能为空！",
+				// 	})
+				// 	return true
+				// }
+				// if (uni.$u.test.isEmpty(this.dataDetails.cardholderIdNumber)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "持卡人身份证号不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			//身份证正面
 			getImgUrl1(src) {

pages/mine/manageVehicles/addVehicle.vue

@@ -233,7 +233,7 @@
 				<view class="left-text">车辆所属车主</view>
 				<input style='text-align:right;' placeholder="输入车主姓名" v-model="dataDetails.owner" type="text">
 				<!-- <u--input inputAlign='left' border="none"> -->
-				</u--input>
+				<!-- </u--input> -->
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
 				<view class="left-text">总质量（千克）</view>
@@ -309,18 +309,18 @@
 				</view>
 
 				<view class="flex row">
-					<view class="left-text">车辆所属车主</view>
+					<view class="left-text">挂车车辆所属车主</view>
 					<u--input placeholder="输入车主姓名" inputAlign='right' border="none" v-model="dataDetails.guaOwner">
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">整备质量（千克）</view>
+					<view class="left-text">挂车整备质量（千克）</view>
 					<u--input type='number' placeholder="输入整备质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaServicingWeight">
 					</u--input>
 				</view>
 				<view class="flex row">
-					<view class="left-text">核定载质量（千克）</view>
+					<view class="left-text">挂车核定载质量（千克）</view>
 					<u--input type='number' placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
@@ -1146,6 +1146,13 @@
 					})
 					return true
 				}
+				if (this.dataDetails.lssuingAuthority.length<5||this.dataDetails.lssuingAuthority.length>25) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证发证机关输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.energyType)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1210,6 +1217,13 @@
 						})
 						return true
 					}
+					if (this.dataDetails.guaLssuingAuthority.length<5||this.dataDetails.guaLssuingAuthority.length>25) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证发证机关输入错误！",
+						})
+						return true
+					}
 				}
 				
 				// true 为校验不通过
@@ -1235,6 +1249,14 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.carTotalWeight)&& this.sign == '非挂车' && this.dataDetails.carTotalWeight<500
+				||uni.$u.test.isEmpty(this.dataDetails.carTotalWeight)&& this.sign == '非挂车' && this.dataDetails.carTotalWeight>60000) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "总质量输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight) && this.sign == '非挂车') {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1242,7 +1264,14 @@
 					})
 					return true
 				}
-				
+				if (uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight)&& this.sign == '非挂车' && this.dataDetails.carApprovedWeight<500||
+				uni.$u.test.isEmpty(this.dataDetails.carApprovedWeight) && this.sign == '非挂车' && this.dataDetails.carApprovedWeight>60000) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "核定载质量输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.servicingWeight) && this.sign == '挂车') {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1313,6 +1342,13 @@
 						})
 						return true
 					} 
+					if (this.dataDetails.guaCarApprovedWeight<500||this.dataDetails.guaCarApprovedWeight>60000) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车核定载质量输入错误！",
+						})
+						return true
+					} 
 					if (uni.$u.test.isEmpty(this.dataDetails.guaCarLong) || uni.$u.test.isEmpty(this.dataDetails.guaCarWidth) || uni.$u.test.isEmpty(this.dataDetails.guaCarHeight)) {
 						this.$refs.uToast.show({
 							type: 'error',

pages/mine/manageVehicles/editVehicle.vue

@@ -23,7 +23,7 @@
 			</view>
 			<view class="flex row">
 				<view class="left-text">道路运输证号</view>
-				<u--input placeholder="输入道路运输证号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入道路运输证号" inputAlign='right' border="none"
 					v-model="dataDetails.operationCertificateNumber">
 				</u--input>
 			</view>
@@ -50,7 +50,7 @@
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">挂车道路运输证号</view>
-				<u--input placeholder="输入挂车道路运输证号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入挂车道路运输证号" inputAlign='right' border="none"
 					v-model="dataDetails.trailerOperationCertificateNumber">
 				</u--input>
 			</view>
@@ -91,7 +91,7 @@
 			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证档案编号</view>
-				<u--input placeholder="输入行驶证档案编号" inputAlign='right' border="none"
+				<u--input maxlength='12' placeholder="输入行驶证档案编号" inputAlign='right' border="none"
 					v-model="dataDetails.drivingLicenseNumber">
 				</u--input>
 			</view>
@@ -164,7 +164,7 @@
 				</view>
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
-				<view class="left-text">挂车行驶证档案编号</view>
+				<view maxlength='12' class="left-text">挂车行驶证档案编号</view>
 				<u--input placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
 					v-model="dataDetails.trailerLicenseNumber">
 				</u--input>
@@ -1187,6 +1187,13 @@
 					})
 					return true
 				}
+				if (this.dataDetails.lssuingAuthority.length<5||this.dataDetails.lssuingAuthority.length>25) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证发证机关输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.energyType)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1295,13 +1302,22 @@
 						})
 						return true
 					}
+					if (this.dataDetails.guaLssuingAuthority.length<5||this.dataDetails.guaLssuingAuthority.length>25) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证发证机关输入错误！",
+						})
+						return true
+					}
 				}
 				return false
 			},
 			submit() {
 					if (this.validate()) return
 					if(this.dataDetails.carCategory == "挂车"){
-						this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+						if(this.dataDetails.guaCarNumber.indexOf('挂')==-1){
+							this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+						}
 					}
 				this.$request.baseRequest('post', '/driverCarInfo/api/editInfo', this.dataDetails).then(res => {
 						if (res.code == '200') {

pages/order/bankCard.vue

@@ -267,7 +267,6 @@
 
 	.card-list {
 		padding: 0 20rpx;
-
 		.number {
 			color: white;
 		}
@@ -289,6 +288,7 @@
 		background-size: cover;
 		padding: 60rpx 43rpx 100rpx 43rpx;
 		border-radius: 20rpx;
+		margin:10px 0;
 		.carNumber{
 			margin-bottom: 20rpx;
 		}

pages/order/confirmLoading.vue

@@ -54,7 +54,7 @@
 			<view class='row-between'>
 				<view class="">装车日期</view>
 				<view class="date-style">
-					{{detailData.loadingDate?detailData.loadingDate:'来自合同'}}
+					{{detailData.loadingDate1?detailData.loadingDate1:'来自合同'}}
 				</view>
 			</view>
 			<view class='row-between'>
@@ -189,6 +189,7 @@
 					id: this.id,
 				}).then(res => {
 					if (res.code == 200) {
+						
 						this.detailData = res.data
 						// #ifdef APP-PLUS
 						this.getLngLat();
@@ -210,6 +211,7 @@
 								console.log(this.fileList1)
 								this.detailData.carNo = res.data.carNo
 								this.detailData.loadingDate = res.data.loadingDate
+								this.detailData.loadingDate1=res.data.loadingDate.split(' ')[0]
 								this.detailData.weight = res.data.loadingWeight
 								this.detailData.freight = res.data.estimatedFreight
 							}

pages/order/index.vue

@@ -187,7 +187,7 @@
 		</u-modal>
 					<!-- 普通弹窗 -->
 			<u-popup :show="show" mode="bottom" @close="close" @open="open">
-				<view class="">
+				<view class="u-popup-wrap">
 					<view >
 						<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
 						<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
@@ -996,4 +996,7 @@
 		background: #2772FB;
 		color: white;
 	}
+	.u-popup-wrap{
+		padding:20px;
+	}
 </style>

pages/order/orderDetails.vue

@@ -150,7 +150,7 @@
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车时间</view>
-				<view class="">{{carrierInfo.loadingDate}}</view>
+				<view class="">{{carrierInfo.loadingDate1}}</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车照片</view>
@@ -214,7 +214,7 @@
 			</u--textarea>
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
-			<view class="">
+			<view  class="u-popup-wrap">
 				<view>
 					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
@@ -541,6 +541,9 @@
 					}).then(res => {
 						if(res.code==200){
 							this.dataObj = res.data
+							if(res.data.hyCarrierInfo){
+								
+							}
 							this.carrierInfo = res.data.hyCarrierInfo
 							this.freightInfo =  res.data.freightInfo
 							if(this.carrierInfo.loadingImg&&this.carrierInfo.loadingImg.length>0){
@@ -744,7 +747,10 @@
 		border-radius: 20rpx;
 		padding: 20rpx;
 	}
-
+	.content3{
+		padding: 20rpx 0;
+		margin:20rpx 0;
+	}
 	.content4 {
 		.time{
 			text-align: right;
@@ -783,4 +789,7 @@
 		background: #2772FB;
 		color: white;
 	}
+	.u-popup-wrap{
+		padding:20px;
+	}
 </style>