前端

pages/mine/manageVehicles/addVehicle.vue

@@ -127,8 +127,8 @@
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">车辆能源类型</view>
-				<view class="" @click="driveType">
-					{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}
+				<view style='text-align:right;width:50%;' class="" @click="driveType">
+					{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}>
 				</view>
 			</view>
 
@@ -225,7 +225,8 @@
 
 			<view class="flex row">
 				<view class="left-text">车辆所属车主</view>
-				<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.owner">
+				<input placeholder="输入车主姓名" v-model="dataDetails.owner" type="text">
+				<!-- <u--input inputAlign='left' border="none"> -->
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
@@ -246,6 +247,8 @@
 			</view>
 			<view class="flex row noborder input-ckg">
 				<view class="input-positon">
+					<!-- <input type='number' class="input" placeholder="长"  border="none"
+						v-model="dataDetails.carLong"> -->
 					<u--input type='number' class="input" placeholder="长" inputAlign='left' border="none"
 						v-model="dataDetails.carLong">
 					</u--input>
@@ -255,6 +258,8 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
+					<!-- <input type='number' class="input" placeholder="宽" border="none"
+						v-model="dataDetails.carWidth"> -->
 					<u--input type='number' placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.carWidth">
 					</u--input>
 					<view class="position-right">
@@ -263,6 +268,8 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
+			<!-- 		<input type='number' class="input"  placeholder="高" border="none"
+						 v-model="dataDetails.carHeight"> -->
 					<u--input type='number' placeholder="高" inputAlign='left' border="none" v-model="dataDetails.carHeight">
 					</u--input>
 					<view class="position-right">
@@ -389,6 +396,7 @@
 					useNature: "营业特种车",
 					guaUseNature: "营运挂车",
 					energyType:"汽油",
+					owner:''
 					// carTotalWeight: '',
 					// carApprovedWeight: '',
 					// carLong: '',
@@ -942,44 +950,6 @@
 				});
 			},
 			validate() {
-				// true 为校验不通过
-				if (uni.$u.test.isEmpty(this.dataDetails.carNumber)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "车牌号不能为空！",
-					})
-					return true
-				}
-				if (uni.$u.test.isEmpty(this.dataDetails.carTotalWeight) && this.sign == '非挂车') {
-					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',
-						message: "整备质量不能为空！",
-					})
-					return true
-				}
-				if (uni.$u.test.isEmpty(this.dataDetails.owner)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "车辆所属车主不能为空！",
-					})
-					return true
-				}
-				if (uni.$u.test.isEmpty(this.dataDetails.carLong) && uni.$u.test.isEmpty(this.dataDetails.caWidth) && uni
-					.$u.test.isEmpty(this.dataDetails.carHeight)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "外廓尺寸不能为空！",
-					})
-					return true
-				}
 				if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1080,7 +1050,6 @@
 					})
 					return true
 				}
-
 				if (this.sign == '挂车') {
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseHomePage)) {
 						this.$refs.uToast.show({
@@ -1103,78 +1072,149 @@
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.guaCarNumber)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseRegistrationDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车车牌号不能为空！",
+							message: "挂车行驶证注册日期不能为空！",
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.guaOwner)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseIssueDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "车辆所属车主不能为空！",
+							message: "挂车行驶证发证日期不能为空！！",
 						})
 						return true
-					}    
-					if (uni.$u.test.isEmpty(this.dataDetails.guaServicingWeight)) {
+					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车整备质量不能为空！",
+							message: "挂车行驶证有效期不能为空！",
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.guaCarApprovedWeight)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.guaLssuingAuthority)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车核定载质量不能为空！",
+							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)) {
+					}
+				}
+				
+				// true 为校验不通过
+				if (uni.$u.test.isEmpty(this.dataDetails.carNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "车牌号不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.owner)) {
+					console.log(this.dataDetails.owner)
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "车辆所属车主不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.carTotalWeight) && this.sign == '非挂车') {
+					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',
+						message: "整备质量不能为空！",
+					})
+					return true
+				}
+				
+				if (uni.$u.test.isEmpty(this.dataDetails.carLong) || uni.$u.test.isEmpty(this.dataDetails.carWidth) || uni
+					.$u.test.isEmpty(this.dataDetails.carHeight)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "外廓尺寸不能为空！",
+					})
+					return true
+				}
+				
+				
+				
+				
+				if (this.sign == '挂车') {
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseHomePage)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车外廓尺寸不能为空！",
+							message: "挂车行驶证主页不能为空！",
 						})
 						return true
 					}
-					// if (this.dataDetails.fileList2.length == 0) {
-					// 	this.$refs.uToast.show({
-					// 		type: 'error',
-					// 		message: "人和挂车合影不能为空！",
-					// 	})
-					// 	return true
-					// }
-					
-					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseRegistrationDate)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseBackPage)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车行驶证注册日期不能为空！",
+							message: "挂车行驶证副页不能为空！",
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseIssueDate)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车行驶证发证日期不能为空！！",
+							message: "挂车行驶证档案编号不能为空！",
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseValidityDate)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.guaCarNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车行驶证有效期不能为空！",
+							message: "挂车车牌号不能为空！",
 						})
 						return true
 					}
-					if (uni.$u.test.isEmpty(this.dataDetails.guaLssuingAuthority)) {
+					if (uni.$u.test.isEmpty(this.dataDetails.guaOwner)) {
 						this.$refs.uToast.show({
 							type: 'error',
-							message: "挂车行驶证发证机关不能为空！",
+							message: "车辆所属车主不能为空！",
+						})
+						return true
+					}    
+					if (uni.$u.test.isEmpty(this.dataDetails.guaServicingWeight)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车整备质量不能为空！",
+						})
+						return true
+					}
+					if (uni.$u.test.isEmpty(this.dataDetails.guaCarApprovedWeight)) {
+						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',
+							message: "挂车外廓尺寸不能为空！",
 						})
 						return true
 					}
+					// if (this.dataDetails.fileList2.length == 0) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'error',
+					// 		message: "人和挂车合影不能为空！",
+					// 	})
+					// 	return true
+					// }
+					
+					
 				}
+
+				
 				return false
 			},
 			submit() {

pages/mine/manageVehicles/index.vue

@@ -9,7 +9,8 @@
 
 			<view @click="addCar" class="add-car flex">
 				<view class="car-text">添加车辆</view>
-				<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="24"></u-icon>
+				<image style='width:18px;height:18px;' src="../../../static/images/mine/addcar.png" mode=""></image>
+			<!-- 	<u-icon class="icon" name="plus-circle-fill" color="#2979ff" size="24"></u-icon> -->
 			</view>
 
 		</view>
@@ -23,9 +24,8 @@
 					{{item.carNumber}}
 				</view>
 				<view class="row2">
-					<u-icon name="edit-pen" size="26" style="margin-right: 20rpx;" @click="edit(item)"
-						v-if="item.status!='审核中'"></u-icon>
-					<u-icon name="trash" size="26" @click="del(item,index)"></u-icon>
+					<image v-if="item.status!='审核中'" style='width:15px;height:15px;margin-right: 20rpx;' @click="edit(item)" src="../../../static/images/mine/edit.png" mode=""></image>
+					<image style='width:16px;height:16px;' @click="del(item,index)" src="../../../static/images/mine/sanchu.png" mode=""></image>
 				</view>
 				<view class="row3">
 					<view class="text">车辆状态：</view>
@@ -182,7 +182,7 @@
 		font-weight: 700;
 		font-size: 26rpx;
 		align-items: center;
-		padding: 4rpx 10rpx 4rpx 20rpx;
+		padding: 5rpx 10rpx 5rpx 20rpx;
 		border-radius: 30rpx;
 
 	}

pages/order/index.vue

@@ -6,7 +6,8 @@
 			<view class="fixed">
 				<view class='title flex flex-center'>
 					<view>订单</view>
-					<u-icon class="search" name="search" color="" size="28" @click="search"></u-icon>
+					<image class="search" style='width:18px;height:18px;' src="../../static/images/search_icon.png" @click="search" mode=""></image>
+					<!-- <u-icon class="search" name="search" color="" size="28" @click="search"></u-icon> -->
 				</view>
 				<view class="tab-content">
 					<u-tabs :list="tabList" @click="clickTab" lineColor='#2772FB' :current='tabIndex' :activeStyle="{

pages/order/orderDetails.vue

@@ -4,9 +4,11 @@
 		<view class="fixed1"></view>
 		<view class="fixed">
 			<view class='title flex flex-center'>
-				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
+				<image class="back"  src="../../static/images/return.png" @click="back" mode=""></image>
+<!-- 				<u-icon class="back" name="arrow-left" color="" size="20" ></u-icon> -->
 				<view class="nav-title">订单</view>
-				<u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon>
+				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService" mode=""></image>
+				<!-- <u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon> -->
 			</view>
 		</view>
 		<view class="content1">
@@ -38,7 +40,8 @@
 				</view>
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
-						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)"></u-icon>
+						<image class="phone" style='width:24px;height:24px;' src="../../static/images/dianhua.png" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)" mode=""></image>
+						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)"></u-icon> -->
 					</view>
 
 					<view class="hz-name">联系货主</view>
@@ -465,6 +468,7 @@
 			.back {
 				position: absolute;
 				left: 20rpx;
+				width:18px;height:18px;
 
 			}
 		}