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

完善页面整合TS

Browse Source
This commit is contained in:
wangxiaowei
2025-09-19 17:25:23 +08:00
parent 864c40aa3a
commit ff2f645101
13 changed files with 540 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@
</template>
<script lang="ts" setup>
import {TeaRoomOrderStatus, TeaSpecialistOrderStatus} from '@/utils/order'
import {OrderStatus} from '@/utils/order'
import {toast} from '@/utils/toast'
const OSS = inject('OSS')
@ -252,18 +252,18 @@
// 茶室订单
const roomMenuList = reactive([
{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_room_all_order.png`, badge: '', type: 'all' },
{ id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', type: TeaRoomOrderStatus.Pending },
{ id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', type: TeaRoomOrderStatus.Reserved },
{ id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', type: TeaRoomOrderStatus.Finished },
{ id: 2, title: '待付款', icon: `${OSS}icon/icon_room_wait_pay_order.png`, badge: '', type: OrderStatus.Pending },
{ id: 3, title: '预约单', icon: `${OSS}icon/icon_room_reserve_order.png`, badge: '', type: OrderStatus.Reserved },
{ id: 4, title: '已完结', icon: `${OSS}icon/icon_room_finish_order.png`, badge: '', type: OrderStatus.Finished },
])
// 茶艺师订单
const teaReserveMenuList = reactive([
{ id: 1, title: '全部订单', icon: `${OSS}icon/icon_tea_all_order.png`, badge: '', type: 'all' },
{ id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', type: TeaSpecialistOrderStatus.Pending },
{ id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', type: TeaSpecialistOrderStatus.Reserved },
{ id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', type: TeaSpecialistOrderStatus.Confirm },
{ id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', type: TeaSpecialistOrderStatus.Finished },
{ id: 2, title: '待付款', icon: `${OSS}icon/icon_tea_wait_pay_order.png`, badge: '', type: OrderStatus.Pending },
{ id: 3, title: '预约单', icon: `${OSS}icon/icon_tea_reserve_order.png`, badge: '', type: OrderStatus.Reserved },
{ id: 4, title: '待确认', icon: `${OSS}icon/icon_tea_wait_confirm_order.png`, badge: '', type: OrderStatus.Confirm },
{ id: 4, title: '已完结', icon: `${OSS}icon/icon_tea_finish_order.png`, badge: '', type: OrderStatus.Finished },
])
// 更多服务

10
src/pages/reserve/reserve.vue
View File

@ -35,7 +35,7 @@
<mescroll-body @init="mescrollInit" @down="downCallback" @up="reserve.upCallback" :up="upOption">
<view v-for="(item, index) in 5" :key="index" >
<view class="mb-20rpx" @click="reserve.handleToReserveRoomOrder">
<combo-card :type="ReserveCategory.TeaRoom" :order-status="ReserveCategoryOrderStatus.Consuming"></combo-card>
<combo-card :type="OrderSource.TeaRoom" :order-status="OrderStatus.Consuming"></combo-card>
</view>
</view>
</mescroll-body>
@ -46,7 +46,7 @@
<mescroll-body @init="mescrollInit" @down="downCallback" @up="reserve.upCallback" :up="upOption">
<view v-for="(item, index) in 5" :key="index" >
<view class="mb-20rpx" @click="reserve.handleToTeaSpecialistOrder">
<combo-card :type="ReserveCategory.TeaSpecialist" :order-status="ReserveCategoryOrderStatus.Consuming"></combo-card>
<combo-card :type="OrderSource.TeaSpecialist" :order-status="OrderStatus.Consuming"></combo-card>
</view>
</view>
</mescroll-body>
@ -59,7 +59,7 @@
import ComboCard from '@/components/order/ComboCard.vue'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { ReserveCategory, ReserveCategoryOrderStatus } from '@/utils/order'
import { OrderSource, OrderStatus } from '@/utils/order'
const OSS = inject('OSS')
const navbarHeight = Number(inject('navbarHeight')) + 42 + 14 // 42为tabs的高度 14是边距值
@ -134,14 +134,14 @@
// 茶室预约-跳转到对应的订单页
handleToReserveRoomOrder: () => {
uni.navigateTo({
url: `/bundle/order/tea-room/order-detail?orderStatus=${ReserveCategoryOrderStatus.Consuming}`
url: `/bundle/order/tea-room/order-detail?orderStatus=${OrderStatus.Consuming}`
})
},
// 茶艺师预约-跳转到对应的订单页
handleToTeaSpecialistOrder: () => {
uni.navigateTo({
url: `/bundle/order/tea-specialist/order-detail?orderStatus=${ReserveCategoryOrderStatus.Serving}`
url: `/bundle/order/tea-specialist/order-detail?orderStatus=${OrderStatus.Serving}`
})
},