前端

pages/mine/editDriverCertificationNext.vue

@@ -588,10 +588,17 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseValidityStartDate)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "驾驶证起始有效期不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.driverLicenseValidityDate)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "驾驶证有效期不能为空！",
+						message: "驾驶证结束有效期不能为空！",
 					})
 					return true
 				}

pages/order/confirmUnloading.vue

@@ -53,15 +53,14 @@
 					{{detailData.carrierInfo.unloadingDate?detailData.carrierInfo.unloadingDate:'选择卸车日期'}}
 				</view>
 			</view>
-			<view class='row-between'>
+			<!-- <view class='row-between'>
 				<view class="row-left-text">合计运费（元）</view>
 				<view style='position:relative;'>
 					<input :style="{color:this.detailData.freight!=detailData.totalFreight?'red':'#000'}" class="totalFreight-input" placeholder="输入合计运费" v-model="detailData.totalFreight"
 					type="number" />
 					<image @click='eliminate' class='close' v-if='detailData.totalFreight.length>0' src="../../static/images/order/guanbi.png" mode=""></image>
 				</view>
-				
-			</view>
+			</view> -->
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
 				<view class="flex align-center">
@@ -388,13 +387,13 @@
 				} else {
 					this.alertContent = '确定提交卸车信息？'
 				}
-				if(!this.detailData.totalFreight){
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "请输入合计运费！",
-					})
-					return
-				}
+				// if(!this.detailData.totalFreight){
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "请输入合计运费！",
+				// 	})
+				// 	return
+				// }
 				this.isShowAlert = true
 				this.detailData.statusFlag = type
 			},
@@ -417,19 +416,20 @@
 				// 	});
 				// 	return
 				// }
-				if (
-					this.detailData.carrierInfo.totalFreight < 0 || this.detailData.carrierInfo.totalFreight > 100000 || (
-						String(this.detailData.carrierInfo.totalFreight).indexOf('.') != -1 && String(this.detailData
-							.carrierInfo.totalFreight).length - (String(this.detailData.carrierInfo.totalFreight).indexOf(
-							'.') + 1) > 2)
-				) {
-					uni.showToast({
-						title: '运费输入错误！',
-						duration: 2000,
-						icon: "none",
-					});
-					return
-				}
+				// if (
+				// 	this.detailData.carrierInfo.totalFreight < 0 || this.detailData.carrierInfo.totalFreight > 100000 || (
+				// 		String(this.detailData.carrierInfo.totalFreight).indexOf('.') != -1 && String(this.detailData
+				// 			.carrierInfo.totalFreight).length - (String(this.detailData.carrierInfo.totalFreight).indexOf(
+				// 			'.') + 1) > 2)
+				// ) {
+				// 	uni.showToast({
+				// 		title: '运费输入错误！',
+				// 		duration: 2000,
+				// 		icon: "none",
+				// 	});
+				// 	return
+				// }
+				
 				if (!this.detailData.carrierInfo.unloadingImg) {
 					uni.showToast({
 						title: '卸车照片不能为空！',
@@ -458,7 +458,7 @@
 				if(this.detailData.carrierInfo.unloadingDate){//卸车时间 去当前时间的时分秒
 					this.detailData.carrierInfo.unloadingDate= this.detailData.carrierInfo.unloadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m
 				}
-				this.detailData.carrierInfo.totalFreight = this.detailData.totalFreight
+				// this.detailData.carrierInfo.totalFreight = this.detailData.totalFreight
 				this.detailData.carrierInfo.carNo = this.detailData.carNumber
 				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData.carrierInfo).then(res => {
 						if (res.code == 200) {

pages/order/index.vue

@@ -112,6 +112,7 @@
 								<!-- {{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
 								{{good.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
+							
 							<!-- <view class='pay flex'
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='待平台确认卸车'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<div>已付</div>
@@ -139,6 +140,8 @@
 								确认卸车</view>
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
+							<view class="start normal" @click.stop="toDetail(good.id)" v-if="good.orderStatus=='待确认运费'">确认运费
+							</view>
 							<!-- <view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view> -->
 							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结' && good.driverEvaluated != 1"><!-- driverEvaluated 为1是已评价过-->
 								评价</view>

pages/order/orderDetails.vue

@@ -25,6 +25,8 @@
 				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading"></u-button> -->
 				<u-button class="btn" text="修改装车信息"  @click="confirmLoading" v-if="dataObj.orderStatus=='货主驳回装车信息'||dataObj.orderStatus=='平台驳回装车信息'"></u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.orderStatus=='运输中'"></u-button>
+				<u-button class="btn" text="确认运费" @click="checkfreight(1)" v-if="dataObj.orderStatus=='待确认运费'"></u-button>
+				<u-button class="btn" text="驳回运费" @click="checkfreight(2)" v-if="dataObj.orderStatus=='待确认运费'"></u-button>
 				<u-button class="btn" text="修改卸车信息" @click="confirmUnLoading" v-if="dataObj.orderStatus=='货主驳回卸车信息'||dataObj.orderStatus=='平台驳回卸车信息'"></u-button>
 				<u-button class="btn" text="完结" @click="closed" v-if="dataObj.orderStatus=='结算中'"></u-button>
 			</view>
@@ -235,6 +237,8 @@
 			</view>
 		           
 		</u-popup>
+		<u-modal :show="moneyShow" title="提示" :content='freightContent' showCancelButton @confirm="moneyClick" @close="moneyclose"
+			@cancel="moneyclose"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 	</view>
@@ -283,6 +287,9 @@
 				alertTitle: '确定终止订单？',
 				alertContent: "",
 				isShowAlert: false,
+				moneyShow:false,
+				freightContent:"",
+				tips:""
 			}
 
 		},
@@ -300,6 +307,34 @@
 				this.show = false
 			          // console.log('close');
 			},
+			moneyclose(){
+				this.moneyShow=false
+			},
+			moneyClick(){
+				this.$request.baseRequest('post', '/orderInfo/api/confirmFreight', {
+						id: this.dataObj.id,
+						 typeFlag:2,
+						 examineFlag:this.tips
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: this.tips == 1?"确认成功":"驳回成功",
+							})
+							this.moneyShow=false
+							this.getList()
+						}
+					})
+			},
+			checkfreight(num){
+				this.tips = num
+				if(num == 1){
+					this.freightContent = "合计应付运费 "+ this.dataObj.hyCarrierInfo.totalFreight + " 元，确定无误？"
+				}else{
+					this.freightContent = "确认驳回运费信息？"
+				}
+				this.moneyShow=true
+			},
 			ylImg(src) {
 				uni.previewImage({
 					urls: src,

pages/public/register.vue

@@ -213,7 +213,7 @@
 					})
 					return
 				}
-				if (this.verifyCode.length > 6) {
+				if (this.verifyCode.length != 6) {
 					uni.showToast({
 						title: '验证码错误',
 						icon: 'none',
@@ -305,6 +305,7 @@
 						}
 					})
 					.catch(res => {
+						debugger
 						console.log(res);
 					});
 			},

util/request.js

@@ -45,6 +45,12 @@ const baseRequest = (method, url, data, header) => {
 								resolve(res[1].data)
 							}else{
 								resolve(res[1].data)
+								// uni.$u.toast(res[1].data.message);
+								// uni.showToast({
+								// 		icon:'none',
+								// 	    title: res[1].data.message,
+								// 	    duration: 2000 
+								// 	}); 
 							}
 						} else {
 							reject(response)