diff --git a/src/bundle/order/platform/order-detail.vue b/src/bundle/order/platform/order-detail.vue
index 377c3b4..f18b900 100644
--- a/src/bundle/order/platform/order-detail.vue
+++ b/src/bundle/order/platform/order-detail.vue
@@ -144,7 +144,7 @@
         </view>
 
         <!-- 操作按钮 -->
-        <view class="w-full fixed bottom-0 left-0 right-0 bg-white h-152rpx" v-if="orderStatus !== GroupComboOrderStatus.Refunded">
+        <view class="w-full fixed bottom-0 left-0 right-0 bg-white h-152rpx" v-if="orderStatus !== GroupComboOrderStatus.Refunded && orderStatus !== GroupComboOrderStatus.Refunding">
             <!-- 直营店 -->
             <view class="mt-34rpx" v-if="order.store.operation_type == StoreType.Direct">
                 <!-- 待使用 -->
diff --git a/src/bundle/order/tea-room/order-list.vue b/src/bundle/order/tea-room/order-list.vue
index 3f4b968..f62ac88 100644
--- a/src/bundle/order/tea-room/order-list.vue
+++ b/src/bundle/order/tea-room/order-list.vue
@@ -73,8 +73,11 @@
         })
 
         // 根据传过来的参数决定显示哪个tab
+        console.log("🚀 ~ args.orderStatus:", args.orderStatus)
         if (args.orderStatus) {
             tab.value = args.orderStatus
+            orderStatus.value =TeaRoomOrderStatusValue[args.orderStatus]
+            // OrderList.handleSearch
         }
     })
 
@@ -118,9 +121,7 @@
                 orderStatus.value = TeaRoomOrderStatusValue[e.name] || ''
             }
 
-            // 切换tab时,重置当前的mescroll
-            list.value = []
-            getMescroll().resetUpScroll();
+            OrderList.handleSearch()
         },
 
         /**
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index b0f027e..a977e56 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -163,14 +163,12 @@
 				<view class="px-30rpx pt-30rpx py-24rpx">茶室订单</view>
 				<view class="flex relative px-30rpx">
 					<view v-for="(item, index) in roomMenuList" :key="index">
-						<navigator :url="`/bundle/order/tea-room/order-list?orderStatus=${item.status}`" hover-class="none">
-							<view class="w-96rpx text-center flex flex-col items-center justify-center mr-30rpx">
+							<view class="w-96rpx text-center flex flex-col items-center justify-center mr-30rpx" @click="router.navigateTo(`/bundle/order/tea-room/order-list?orderStatus=${item.status}`)">
 								<view class="w-36rpx h-36rpx flex items-center justify-center">
 									<wd-img width="100%" height="100%" :src="item.icon"></wd-img>
 								</view>
 								<view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view>
 							</view>
-						</navigator>
 					</view>
 				</view>
 			</view>
@@ -180,14 +178,12 @@
 				<view class="px-30rpx pt-30rpx py-24rpx">茶艺师订单</view>
 				<view class="flex relative px-30rpx">
 					<view v-for="(item, index) in teaReserveMenuList" :key="index">
-						<navigator :url="`/bundle/order/tea-specialist/order-list?orderStatus=${item.status}`" hover-class="none">
-							<view class="w-96rpx text-center flex flex-col items-center justify-center mr-30rpx">
-								<view class="w-36rpx h-36rpx flex items-center justify-center">
-									<wd-img width="100%" height="100%" :src="item.icon"></wd-img>
-								</view>
-								<view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view>
+						<view class="w-96rpx text-center flex flex-col items-center justify-center mr-30rpx" @click="router.navigateTo(`/bundle/order/tea-specialist/order-list?orderStatus=${item.status}`)">
+							<view class="w-36rpx h-36rpx flex items-center justify-center">
+								<wd-img width="100%" height="100%" :src="item.icon"></wd-img>
 							</view>
-						</navigator>
+							<view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view>
+						</view>
 					</view>
 				</view>
 			</view> -->
@@ -241,7 +237,7 @@
 </template>
 
 <script lang="ts" setup>
-	import { OrderStatus } from '@/utils/order'
+	import { TeaRoomOrderStatusText, TeaSpecialistOrderStatusText } from '@/utils/order'
 	import { toast } from '@/utils/toast'
 	import { router } from '@/utils/tools'
 	import { useUserStore } from '@/store'
@@ -278,19 +274,19 @@
 
 	// 茶室订单
 	const roomMenuList = reactive([
-		{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', status: 'all' },
-		{ id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', status: OrderStatus.Pending },
-		{ id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', status: OrderStatus.Reserved },
-		{ id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', status: OrderStatus.Finished },
+		{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', status: TeaRoomOrderStatusText.All },
+		{ id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', status: TeaRoomOrderStatusText.Pending },
+		{ id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', status: TeaRoomOrderStatusText.Pay },
+		{ id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', status: TeaRoomOrderStatusText.Finished },
 	])
 
 	// 茶艺师订单
 	const teaReserveMenuList = reactive([
-		{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', status: 'all' },
-		{ id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', status: OrderStatus.Pending },
-		{ id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', status: OrderStatus.Reserved },
-		{ id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', status: OrderStatus.Confirm },
-		{ id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', status: OrderStatus.Finished },
+		{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', status: TeaSpecialistOrderStatusText.All },
+		{ id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', status: TeaSpecialistOrderStatusText.Pending },
+		{ id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', status: TeaSpecialistOrderStatusText.Pay },
+		{ id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', status: TeaSpecialistOrderStatusText.Confirm },
+		{ id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', status: TeaSpecialistOrderStatusText.Finished },
 	])
 
 	// 更多服务