更新

pages/goodSource/shippingDetails.vue

@@ -65,8 +65,8 @@
 					<view class="left">货物</view>
 					<view class="flex">
 						<view>{{detailData.goodsName}}</view>
-						<view style='margin: 0 10rpx;'>|</view>
-						<view v-if='detailData.weight'>{{detailData.weight}}吨</view>
+						<view style='margin: 0 10rpx;'></view>
+						<view v-if='detailData.weight'>| {{detailData.weight}}吨</view>
 					</view>
 
 				</view>
@@ -109,7 +109,7 @@
 				<view  class="flex mt20">
 					<view class="left">描述</view>
 					<view class="right">
-						{{detailData.taskDescription?detailData.taskDescription:'空'}}
+						{{detailData.taskDescription?detailData.taskDescription:'无'}}
 					</view>
 				</view>
 			</view>

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>