前端解决冲突

pages/goodSource/shippingDetails.vue

@@ -110,7 +110,7 @@
 				<view  class="flex mt20">
 					<view class="left">描述</view>
 					<view class="right">
-						{{detailData.taskDescription?detailData.taskDescription:'空'}}
+						{{detailData.taskDescription?detailData.taskDescription:'无'}}
 					</view>
 				</view>
 			</view>

pages/mine/driverCertification.vue

@@ -241,14 +241,12 @@
 						</view>
 						<view @click="manualInput" class="type">手动输入</view>
 					</view>
-
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<view>{{item.payeeName}}</view>
-						<!-- <u--input disabled placeholder="输入收款人姓名" inputAlign='right' border="none" v-model="item.payeeName">
-						</u--input> -->
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName">
+						</u--input>
 					</view>
 				</view>
 				<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'

pages/order/confirmUnloading.vue

@@ -396,9 +396,25 @@
 			},
 
 			submit(type) {
+			
 				if (type == 1) {
 					this.alertContent = '确定暂存卸车信息？'
 				} else {
+					if (this.fileList1.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "卸车照片不能为空！",
+						})
+						return
+					}
+					
+					if (this.fileList2.length == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请上传回单照片！",
+						})
+						return
+					}
 					this.alertContent = '确定提交卸车信息？'
 				}
 				// if(!this.detailData.totalFreight){
@@ -444,22 +460,7 @@
 				// 	return
 				// }
 				
-				if (!this.detailData.carrierInfo.unloadingImg) {
-					uni.showToast({
-						title: '卸车照片不能为空！',
-						icon: "none",
-						duration: 2000
-					});
-					return
-				}
-				if (!this.detailData.carrierInfo.receiptImg) {
-					uni.showToast({
-						title: '请上传回单照片！',
-						icon: "none",
-						duration: 2000
-					});
-					return
-				}
+				
 				this.isShowAlert = false
 				uni.showLoading({
 					title:'加载中'

pages/order/orderDetails.vue

@@ -154,7 +154,7 @@
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车时间</view>
-				<view class="">{{carrierInfo.loadingDate1}}</view>
+				<view class="">{{carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车照片</view>

pages/order/signContract.vue

@@ -38,14 +38,11 @@
 				<view class="gray">距离</view>
 				<view class="">约{{dataDetails.distance}}公里</view>
 			</view>
-			<view class='row-between'>
-				<!-- 后加 -->
-				<!-- <view class="gray">服务费（元）</view> -->
+			<!-- 司机没有工本费 -->
+		<!-- 	<view class='row-between'>
 				<view class="gray">工本费（元）</view>
 				<view class="">{{dataDetails.serviceCharge}}</view>
-			</view>
-
-
+			</view> -->
 			<view class="title">
 				完善信息
 			</view>

util/request.js

@@ -43,7 +43,6 @@ const baseRequest = (method, url, data, header) => {
 				// 		})
 				uni.request(baseDefaultOpts).then(
 					(res) => {
-						console.log(res)
 						if (res.cookies) {
 							console.log(res.cookies)
 							if (res.cookies.length != 0) {