From 3eaf9655d591907e14e0d0c3ee82cba06210ca97 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 12 十一月 2024 14:16:52 +0800
Subject: [PATCH] feat:scoket 地址修改

---
 pages/driver-page/driver-index/driver-index.vue |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index d4bde1f..fc58c4e 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -157,6 +157,7 @@
 							</view>
 							<view class="fourth-line">
 								<view class="button-img"
+								v-if="!(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')"
 									@click.stop="cancelAppoint(item)">
 									璇锋眰閫�鍗�
 								</view>
@@ -256,7 +257,7 @@
 								</view>
 							</view>
 							<view class="fourth-line"
-								v-if="item.status<3">
+								v-if="item.status<3 && !(item.orderType === '鍐呰喘' ||item.orderType === '杞叆')">
 								<view class="button-img"
 									@click.stop="cancelAppoint(item)">
 									璇锋眰閫�鍗�
@@ -402,7 +403,7 @@
 					.then(res => {
 						uni.hideLoading()
 						if (res.code == 0) {
-							this.$u.toast('鎺ュ崟鎴愬姛');
+							this.$u.toast('鎺ュ崟姝e湪澶勭悊涓�...');
 						} else {
 							this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
 						}
@@ -494,11 +495,11 @@
 				uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
 				if (value.orderType === '澶栬喘') {
 					uni.navigateTo({
-						url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+						url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&coalName=${value.coalName}`
 					});
 				} else {
 					uni.navigateTo({
-						url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+						url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&coalName=${value.coalName}`
 					});
 				}
 			},

--
Gitblit v1.9.1