From deb2a67c1a9824b288ce4a7a228347ffd60964fe Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 九月 2024 18:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages/driver/reserved.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/h5/pages/driver/reserved.vue b/h5/pages/driver/reserved.vue
index 0683f0f..90f4ccd 100644
--- a/h5/pages/driver/reserved.vue
+++ b/h5/pages/driver/reserved.vue
@@ -7,8 +7,8 @@
 					<text>*</text>
 					<text>鍏ュ洯鍘熷洜</text>
 				</view>
-				<view class="value" @click="showReason = true">
-					<text class="mr6" :style="{ color: param.inReason ? '#000000' : '#999999' }">{{ param.inReason ? param.inReason : '璇烽�夋嫨' }}</text>
+				<view class="value" @click="reasonClick">
+					<text class="mr6" :class="{gray: param.id}" :style="{ color: param.inReason ? '#000000' : '#999999' }">{{ param.inReason ? param.inReason : '璇烽�夋嫨' }}</text>
 					<u-icon name="arrow-right" color="#CCCCCC" size="16"></u-icon>
 				</view>
 			</view>
@@ -105,7 +105,8 @@
 		</view>
 		
 		<!--  -->
-		<u-picker :show="showReason" keyName="reason" :columns="reasonList" @confirm="reasonConfirm"></u-picker>
+		<u-picker :show="showReason" keyName="reason" closeOnClickOverlay @close="showReason = false"
+			@cancel="showReason = false" :columns="reasonList" @confirm="reasonConfirm"></u-picker>
 		<u-datetime-picker
 			:show="showDatetime"
 			closeOnClickOverlay
@@ -149,6 +150,12 @@
 		this.initData()
 	},
 	methods: {
+		reasonClick() {
+			if(this.param.id){
+				return
+			}
+			this.showReason = true
+		},
 		onSubmit() {
 			const param = { ...this.param }
 			if (!param.arriveDate) return this.showToast('璇烽�夋嫨鍒板満鏃堕棿')
@@ -297,6 +304,9 @@
 			display: flex;
 			align-items: center;
 			justify-content: flex-end;
+			.gray{
+				color: #999999 !important;
+			}
 			.btns {
 				display: flex;
 				align-items: center;

--
Gitblit v1.9.3