wangxiaowei/chazhi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改我的页面进入详情页tab状态

Browse Source
This commit is contained in:
wangxiaowei
2025-12-26 17:17:35 +08:00
parent 7ce0015088
commit b3b375395b
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bundle/order/platform/order-detail.vue
View File

@ -144,7 +144,7 @@
</view> </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"> <view class="mt-34rpx" v-if="order.store.operation_type == StoreType.Direct">
<!-- 待使用 --> <!-- 待使用 -->

7
src/bundle/order/tea-room/order-list.vue
View File

@ -73,8 +73,11 @@
}) })
// 根据传过来的参数决定显示哪个tab // 根据传过来的参数决定显示哪个tab
console.log("🚀 ~ args.orderStatus:", args.orderStatus)
if (args.orderStatus) { if (args.orderStatus) {
tab.value = args.orderStatus tab.value = args.orderStatus
orderStatus.value =TeaRoomOrderStatusValue[args.orderStatus]
// OrderList.handleSearch
} }
}) })
@ -118,9 +121,7 @@
orderStatus.value = TeaRoomOrderStatusValue[e.name] || '' orderStatus.value = TeaRoomOrderStatusValue[e.name] || ''
} }
// 切换tab时,重置当前的mescroll OrderList.handleSearch()
list.value = []
getMescroll().resetUpScroll();
}, },
/** /**

28
src/pages/my/my.vue
View File

@ -163,14 +163,12 @@
<view class="px-30rpx pt-30rpx py-24rpx">茶室订单</view> <view class="px-30rpx pt-30rpx py-24rpx">茶室订单</view>
<view class="flex relative px-30rpx"> <view class="flex relative px-30rpx">
<view v-for="(item, index) in roomMenuList" :key="index"> <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" @click="router.navigateTo(`/bundle/order/tea-room/order-list?orderStatus=${item.status}`)">
<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"> <view class="w-36rpx h-36rpx flex items-center justify-center">
<wd-img width="100%" height="100%" :src="item.icon"></wd-img> <wd-img width="100%" height="100%" :src="item.icon"></wd-img>
</view> </view>
<view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view> <view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view>
</view> </view>
</navigator>
</view> </view>
</view> </view>
</view> </view>
@ -180,14 +178,12 @@
<view class="px-30rpx pt-30rpx py-24rpx">茶艺师订单</view> <view class="px-30rpx pt-30rpx py-24rpx">茶艺师订单</view>
<view class="flex relative px-30rpx"> <view class="flex relative px-30rpx">
<view v-for="(item, index) in teaReserveMenuList" :key="index"> <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" @click="router.navigateTo(`/bundle/order/tea-specialist/order-list?orderStatus=${item.status}`)">
<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"> <view class="w-36rpx h-36rpx flex items-center justify-center">
<wd-img width="100%" height="100%" :src="item.icon"></wd-img> <wd-img width="100%" height="100%" :src="item.icon"></wd-img>
</view> </view>
<view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view> <view class="font-400 text-24rpx text-[#303133] leading-34rpx mt-8rpx">{{ item.title }}</view>
</view> </view>
</navigator>
</view> </view>
</view> </view>
</view> --> </view> -->
@ -241,7 +237,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { OrderStatus } from '@/utils/order' import { TeaRoomOrderStatusText, TeaSpecialistOrderStatusText } from '@/utils/order'
import { toast } from '@/utils/toast' import { toast } from '@/utils/toast'
import { router } from '@/utils/tools' import { router } from '@/utils/tools'
import { useUserStore } from '@/store' import { useUserStore } from '@/store'
@ -278,19 +274,19 @@
// 茶室订单 // 茶室订单
const roomMenuList = reactive([ const roomMenuList = reactive([
{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', status: 'all' }, { 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: OrderStatus.Pending }, { 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: OrderStatus.Reserved }, { 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: OrderStatus.Finished }, { id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', status: TeaRoomOrderStatusText.Finished },
]) ])
// 茶艺师订单 // 茶艺师订单
const teaReserveMenuList = reactive([ const teaReserveMenuList = reactive([
{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', status: 'all' }, { 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: OrderStatus.Pending }, { 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: OrderStatus.Reserved }, { 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: OrderStatus.Confirm }, { 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: OrderStatus.Finished }, { id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', status: TeaSpecialistOrderStatusText.Finished },
]) ])
// 更多服务 // 更多服务