更新

pages/goodSource/index.vue

@@ -354,13 +354,13 @@
 					_val = ''
 				} else {
 					if (good.carModel.includes(2)) {
-						_val += '高栏/'
+						_val += '高栏 '
 					}
 					if (good.carModel.includes(3)) {
-						_val += '集装箱/'
+						_val += '集装箱 '
 					}
 					if (good.carModel.includes(4)) {
-						_val += '自卸车'
+						_val += '自卸车 '
 					}
 				}
 				return _val
@@ -420,7 +420,6 @@
 					geocode: true,
 					success: res => {
 						if (res.latitude) {
-							// console.log(res,333333)
 							if(res.address.city){
 								if(res.address.city.indexOf('市')!=-1){
 									res.address.city=res.address.city.substring(0,res.address.city.length-1)

pages/mine/manageVehicles/addVehicle.vue

@@ -391,6 +391,7 @@
 					// carWidth: '',
 					// carHeight: '',
 					// addressUrl: ''
+
 				},
 				carTypeList:[["汽油","柴油","油电混合","纯电动","插电式混合动力","增程式"]],
 				isShowCarType:false,

pages/order/bankCard.vue

@@ -140,7 +140,8 @@
 			},
 			init() {
 				this.$request.baseRequest('post', '/driverPayeeInfo/selectDriverPayee', {
-						driverId: this.userInfo.driverId,
+						// driverId: this.userInfo.driverId,
+						commonId: this.userInfo.id,
 					}).then(res => {
 						if (res.code == '200') {
 							this.bankList = res.data

pages/order/confirmLoading.vue

@@ -399,6 +399,7 @@
 					}
 					this.alertTitle = '确定提交装车信息？'
 				}
+				if (this.validate()) return
 				this.isShowAlert = true
 				this.detailData.statusFlag = type
 				// this.$refs.uToast.show({
@@ -447,17 +448,17 @@
 				// 	})
 				// 	return true
 				// }
-				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.loadingImg)) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "装车照片不能为空！",
-				// 	})
-				// 	return true
-				// }
+			
+				if(this.fileList1.length == 0){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "装车照片不能为空！",
+					})
+					return true
+				}
 			},
 			confirmClick() {
 				this.isShowAlert = false
-				if (this.validate()) return
 				//1暂存
 				if (this.detailData.statusFlag == 1) {
 					delete this.detailData.hyCarrierInfo.loadingAreaLongitude;

pages/order/confirmUnloading.vue

@@ -449,7 +449,7 @@
 	.bottom-btn {
 		display: flex;
 		justify-content: space-around;
-		margin-bottom: 50rpx;
+		// margin-bottom: 50rpx;
 		background: #FFFFFF;
 		padding: 40rpx 0;
 	}

pages/order/signContract.vue

@@ -79,7 +79,7 @@
 				</view>
 			</view>
 			<view class='row-between'>
-				<view class="gray">装车净重</view>
+				<view class="gray">装车净重(吨)</view>
 				<view class="flex">
 					<u--input placeholder="请输入装车净重" border="none" v-model="dataDetails.weight" inputAlign='right'
 						clearable></u--input>
@@ -473,6 +473,9 @@
 													}
 												})
 												}
+											}else{
+												uni.$u.toast(res.message);
+												uni.hideLoading()
 											}
 										})
 									.catch(res => {