From 5687f2931d3a6a447a1adcd00d89fcf07c07fea8 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Fri, 26 Dec 2025 15:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E9=94=81=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E2=80=9C=E5=85=8D=E5=AF=86=E2=80=9D=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=BC=80=E4=B8=8D=E5=8A=A0=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bundle/order/tea-room/order-detail.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/bundle/order/tea-room/order-detail.vue b/src/bundle/order/tea-room/order-detail.vue
index b71f120..e8a6b97 100644
--- a/src/bundle/order/tea-room/order-detail.vue
+++ b/src/bundle/order/tea-room/order-detail.vue
@@ -182,7 +182,14 @@
                             <view class="text-[#4C9F44] font-bold text-32rpx leading-44rpx absolute top-[50%] transform translate-y-[-50%] right-22rpx">点击开锁</view>
                         </view>
                         <view class="text-[#303133] text-30rpx leading-42rpx mt-16rpx text-center">大门锁</view>
-                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">{{ order.is_lockpwd == 1 ? `手动输入 ${order.gate_key}` : '正在生成密码' }}</view>
+                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">
+                            <template v-if="order.is_lockpwd == 1">
+                                {{ order.gate_key == '免密' ? '免密' : `手动输入 ${order.gate_key}` }}
+                            </template>
+                            <template v-else>
+                                正在生成密码
+                            </template>
+                        </view>
                     </view>
                     <view class="border-r-2rpx border-r-solid border-r-[#F6F7F9] h-224rpx"></view>
                     <view class="w-224rpx" @click="OrderDetail.handleOpenDoorLock('room')">
@@ -191,7 +198,14 @@
                             <view class="text-[#4C9F44] font-bold text-32rpx leading-44rpx absolute top-[50%] transform translate-y-[-50%] right-22rpx">点击开锁</view>
                         </view>
                         <view class="text-[#303133] text-30rpx leading-42rpx mt-16rpx text-center">房间锁</view>
-                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">{{ order.is_lockpwd == 1 ? `手动输入 ${order.room_key}` : '正在生成密码' }}</view>
+                        <view class="text-[#606266] text-26rpx leading-48rpx mt-4rpx text-center font-500">
+                            <template v-if="order.is_lockpwd == 1">
+                                {{ order.room_key == '免密' ? '免密' : `手动输入 ${order.room_key}` }}
+                            </template>
+                            <template v-else>
+                                正在生成密码
+                            </template>
+                        </view>
                     </view>
                 </view>
             </view>
@@ -532,8 +546,9 @@
          * 再次预定
          */
         handleAgainReserve: () => {
+            console.log("🚀 ~ value.room_msg.id:", order.value.room_msg.id)
             router.navigateTo(
-                `/bundle/tea-room/detail?storeId=${order.value.store_msg.id}&roomId=${order.value.room_msg.id}&type=${ReserveServiceCategory.ReserveRoom}&price=${order.value.room_msg.price}`
+                `/bundle/tea-room/detail?storeId=${order.value.store_msg.id}&id=${order.value.room_msg.id}&type=${ReserveServiceCategory.ReserveRoom}&price=${order.value.room_msg.price}`
             )
         },