From c9e0cc9152bdbe03960806a0f374df8ea6a3f52e Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Fri, 26 Dec 2025 15:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=80=E6=AC=BE=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/ComboCard.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 5d9bed0..37efc34 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -16,6 +16,7 @@
                     <text class="text-[#4C9F44]" v-if="order.status === GroupComboOrderStatus.ToUse">待使用</text>
                     <text class="text-[#606266]" v-if="order.status === GroupComboOrderStatus.Used">已使用</text>
                     <text class="text-[#C9C9C9]" v-if="order.status === GroupComboOrderStatus.Refunded">已退款</text>
+                    <text class="text-[#C9C9C9]" v-if="order.status === GroupComboOrderStatus.Refunded">已退款</text>
                 </view>
             </view>
             <view class="mt-22rpx">
@@ -39,16 +40,16 @@
                         <view class="text-center flex items-center text-28rpx mt-28rpx justify-end" v-if="order.status === GroupComboOrderStatus.ToUse">
                             <view
                                 @click="ComboCard.handleOrderRefund(order, OrderSource.Combo)"
-                                class="w-178rpx h-70rpx leading-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133]">
-                                <!-- :class="order.operation_type === StoreType.Direct ? ' mr-28rpx' : ''"> -->
+                                class="w-178rpx h-70rpx leading-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133]"
+                                :class="order.operation_type === StoreType.Direct ? ' mr-28rpx' : ''">
                                     申请退款
                             </view>
-                            <!-- <view 
-                                @click="ComboCard.handleUsePackage"
+                            <view 
+                                @click="ComboCard.handleUsePackage(order.store_id, order.operation_type)"
                                 class="w-178rpx h-70rpx leading-70rpx rounded-8rpx border-[2rpx] border-[#4C9F44] text-[#4C9F44]" 
                                 v-if="order.operation_type === StoreType.Direct">
                                     立即预定
-                            </view> -->
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -311,8 +312,9 @@
         /**
          * 使用套餐
          */
-        handleUsePackage: () => {
-            router.navigateTo(`/bundle/tea-room/choose-room?groupCouponId=${props.order.group_id}&groupCouponOrderId=${props.order.id}&teaRoomId=${props.order.store_id}`)
+        handleUsePackage: (store_id: number, operation_type: number) => {
+            router.navigateTo(`/bundle/tea-room/room?id=${store_id}&type=${operation_type}`)
+            // router.navigateTo(`/bundle/tea-room/choose-room?groupCouponId=${props.order.group_id}&groupCouponOrderId=${props.order.id}&teaRoomId=${props.order.store_id}`)
         },
 
         /**