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

完善茶艺师接口对接

Browse Source
This commit is contained in:
wangxiaowei
2026-01-05 00:39:06 +08:00
parent 237df8d039
commit 39c64a2504
29 changed files with 1204 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/bundle/order/tea-specialist/order-list.vue
View File

@ -23,11 +23,11 @@
</wd-navbar>
<view class="tabs">
<wd-tabs v-model="tab" swipeable slidable="always" :lazy="false" @click="OrderList.handleChangeTabs">
<wd-tab title="全部" :name="TeaSpecialistOrderStatusText.All"></wd-tab>
<wd-tab title="待付款" :name="TeaSpecialistOrderStatusText.Pending"></wd-tab>
<wd-tab title="预约单" :name="TeaSpecialistOrderStatusText.Pay"></wd-tab>
<wd-tab title="待确认" :name="TeaSpecialistOrderStatusText.Confirm"></wd-tab>
<wd-tab title="已完结" :name="TeaSpecialistOrderStatusText.Finished"></wd-tab>
<wd-tab title="全部" :name="TeaSpecialistManageOrderStatusText.All"></wd-tab>
<wd-tab title="待付款" :name="TeaSpecialistManageOrderStatusText.Unpaid"></wd-tab>
<wd-tab title="预约单" :name="TeaSpecialistManageOrderStatusText.Reserved"></wd-tab>
<wd-tab title="服务中" :name="TeaSpecialistManageOrderStatusText.Service"></wd-tab>
<wd-tab title="已完成" :name="TeaSpecialistManageOrderStatusText.Completed"></wd-tab>
</wd-tabs>
</view>
</view>
@ -37,37 +37,9 @@
<!-- 全部 -->
<mescroll-body ref="mescrollItem0" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" :down="downOption" :up="upOption">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.TeaRoom" :order="item"></combo-card>
<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
</view>
</mescroll-body>
<!-- 待付款 -->
<!-- <mescroll-body ref="mescrollItem1" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" :down="downOption" :up="upOption" v-if="tab === OrderStatus.Pending">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
</view>
</mescroll-body> -->
<!-- 预约单 -->
<!-- <mescroll-body ref="mescrollItem2" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" :down="downOption" :up="upOption" v-if="tab === OrderStatus.Reserved">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
</view>
</mescroll-body> -->
<!-- 待确认 -->
<!-- <mescroll-body ref="mescrollItem2" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" :down="downOption" :up="upOption" v-if="tab === OrderStatus.Confirm">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
</view>
</mescroll-body> -->
<!-- 已完结 -->
<!-- <mescroll-body ref="mescrollItem3" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" v-if="tab === OrderStatus.Finished">
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
<combo-card :type="OrderSource.TeaSpecialist" :order="item"></combo-card>
</view>
</mescroll-body> -->
</view>
</view>
</template>
@ -78,7 +50,8 @@
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 { OrderSource, OrderStatus, TeaSpecialistOrderStatusText, TeaSpecialistOrderStatusValue } from '@/utils/order'
import { OrderSource, OrderStatus, TeaSpecialistOrderStatusText } from '@/utils/order'
import { TeaSpecialistManageOrderStatusText, TeaSpecialistOrderStatusValue } from '@/utils/teaSpecialistOrder'
import { router } from '@/utils/tools'
/* mescroll */
@ -107,6 +80,11 @@
// 根据传过来的参数决定显示哪个tab
if (args.orderStatus) {
tab.value = args.orderStatus
if (tab.value === TeaSpecialistOrderStatusText.Pending) {
orderStatus.value = ''
} else {
orderStatus.value = TeaSpecialistOrderStatusValue[tab.value] || ''
}
}
})
@ -138,7 +116,7 @@
handleChangeTabs: (e: {index: number, name: string}) => {
tab.value = e.name
if (e.name === TeaSpecialistOrderStatusText.Pending) {
orderStatus.value = '0'
orderStatus.value = ''
} else {
orderStatus.value = TeaSpecialistOrderStatusValue[e.name] || ''
}