From 0978691dc9047c7090dca64406f5d0ac027e8df4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 30 十月 2023 17:59:31 +0800
Subject: [PATCH] 自主配送功能优化 部分功能增删 提煤单详情页面修改

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

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index f60a2e6..4ec0433 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -8,6 +8,18 @@
 				</view>
 				<!-- 寮曞椤� -->
 				<noob-tour></noob-tour>
+				<!-- 鑷富閰嶉�佺晫闈� -->
+				<view class="self-deliver">
+					<view class="self-deliver_text">
+						鍒涘缓鑷富閰嶉�佸崟
+					</view>
+					<view class="self-deliver_btn">
+						<u-button text="鍘诲垱寤�"
+							type="primary"
+							shape="cirle"
+							@click="selfDeliver"></u-button>
+					</view>
+				</view>
 				<view class="collection-form">
 					<view class="collection-form-item"
 						v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -77,7 +89,6 @@
 						@confirm="qiangDanConfirm"
 						@cancel="qiangDanCancel"></u-modal>
 				</view>
-
 				<!-- 寰呴绾︽彁鐓ゅ崟 -->
 				<view class="wait-appointment">
 					<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
@@ -416,10 +427,24 @@
 			},
 			// 鍘婚绾�
 			toAppointmentClick(value) {
-				uni.navigateTo({
-					url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
-				});
+				// 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸~鍐欏師鍙戜负1涓嶉渶瑕佸~鍐欏師鍙�
+				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}`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
+					});
+				}
 			},
+			// 鑷富閰嶉��
+			selfDeliver() {
+				uni.navigateTo({
+					url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
+				})
+			}
 		}
 	};
 </script>
@@ -538,6 +563,20 @@
 				height: 600rpx;
 			}
 
+			// 鑷富閰嶉��
+			.self-deliver {
+				position: relative;
+				top: vww(-120);
+				width: 88%;
+				height: vww(50);
+				margin: vww(8) auto;
+				padding: 0 vww(8);
+				background: #ffffff;
+				box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+				border-radius: 20rpx;
+				@include flex;
+			}
+
 			.collection-form {
 				width: vww(345);
 				margin: 0 vww(15);

--
Gitblit v1.9.1