更新

pages/order/confirmLoading.vue

@@ -403,13 +403,13 @@
 				// 	})
 				// 	return true
 				// }
-				if (uni.$u.test.isEmpty(this.detailData.carrierInfo.loadingImg)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "装车照片不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.loadingImg)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "装车照片不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			confirmClick() {
 				

pages/order/confirmUnloading.vue

@@ -321,6 +321,11 @@
 					});
 					return
 				}
+				this.isShowAlert = false
+				uni.showLoading({
+					title:'加载中'
+				})
+				
 				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData.carrierInfo).then(res => {
 						if (res.code == 200) {
 							let _title = ''
@@ -333,6 +338,7 @@
 								type: 'success',
 								message: _title,
 								complete() {
+									uni.hideLoading()
 									uni.switchTab({
 										url: '/pages/order/index'
 									})

pages/order/index.vue

@@ -95,21 +95,25 @@
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
 								{{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								<!-- {{good.illingMethod==0?good.freight:good.freightCar}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认装车'||good.orderStatus=='平台驳回装车信息'||good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='货主驳回卸车信息'">
-								{{good.estimatedFreight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								<!-- {{good.estimatedFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
+								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车卸车确认后 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认卸车'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='待结算'||good.orderStatus=='已完结'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
-								{{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								<!-- {{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
+								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<view class='pay flex'
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='待平台确认卸车'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<div>已付</div>
 								<div class='number'>¥{{good.totalRepayable}}</div>
+								<div class='number'>11</div>
 							</view>
 						</view>
 						<view class="row5 flex flex-end">
@@ -132,7 +136,7 @@
 							-->
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
-							<view class="start normal" @click.stop="addevaluation(good)">评价</view>
+							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view>
 						</view>
 					</view>
 				</view>