From 3c852116e606c0686fbd3669c72515d82bb44cf8 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sun, 14 Dec 2025 14:41:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=97=E9=A4=90=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/bundle/setmeal/setmeal.vue | 77 ++++++++++++++++--------------
src/components/order/ComboCard.vue | 62 ++++++++++++++++++++++++
src/pages.json | 1 -
src/utils/order.ts | 20 +++++++-
4 files changed, 122 insertions(+), 38 deletions(-)
diff --git a/src/bundle/setmeal/setmeal.vue b/src/bundle/setmeal/setmeal.vue
index b99323d..8332177 100644
--- a/src/bundle/setmeal/setmeal.vue
+++ b/src/bundle/setmeal/setmeal.vue
@@ -1,5 +1,4 @@
{
- "needLogin": true,
"layout": "default",
"style": {
"navigationStyle": "custom"
@@ -7,7 +6,7 @@
}
-
+
@@ -16,27 +15,30 @@
-
+
-
-
-
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+ 新建套餐
+
@@ -65,6 +67,11 @@
// tab
const tab = ref('all')
+ const tabList = ref>([
+ { title: '已上架', num: 10, name: 'list'},
+ { title: '已下架', num: 11, name: 'delist' },
+ // { title: '草稿箱', num: 0, name: 'draft' }
+ ])
onLoad((args) => {
uni.$on('refreshOrderList', () => {
@@ -89,21 +96,21 @@
*/
upCallback: (mescroll) => {
// 需要留一下数据为空的时候显示的空数据图标内容
- const filter = {
- page: mescroll.num,
- size: mescroll.size,
- order_status: orderStatus.value,
- search: keywords.value
- }
+ // const filter = {
+ // page: mescroll.num,
+ // size: mescroll.size,
+ // order_status: orderStatus.value,
+ // search: keywords.value
+ // }
- getTeaRoomOrderList(filter).then((res) => {
- const curPageData = res.list || [] // 当前页数据
- if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
- list.value = list.value.concat(curPageData) //追加新数据
- mescroll.endSuccess(curPageData.length, Boolean(res.more))
- }).catch(() => {
+ // getTeaRoomOrderList(filter).then((res) => {
+ // const curPageData = res.list || [] // 当前页数据
+ // if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+ // list.value = list.value.concat(curPageData) //追加新数据
+ // mescroll.endSuccess(curPageData.length, Boolean(res.more))
+ // }).catch(() => {
mescroll.endErr() // 请求失败, 结束加载
- })
+ // })
},
/**
@@ -111,24 +118,24 @@
* @param e
*/
handleChangeTabs: (e: {index: number, name: string}) => {
- tab.value = e.name
- if (e.name === TeaRoomOrderStatusText.Pending) {
- orderStatus.value = '0'
- } else {
- orderStatus.value = TeaRoomOrderStatusValue[e.name] || ''
- }
+ // tab.value = e.name
+ // if (e.name === TeaRoomOrderStatusText.Pending) {
+ // orderStatus.value = '0'
+ // } else {
+ // orderStatus.value = TeaRoomOrderStatusValue[e.name] || ''
+ // }
- // 切换tab时,重置当前的mescroll
- list.value = []
- getMescroll().resetUpScroll();
+ // // 切换tab时,重置当前的mescroll
+ // list.value = []
+ // getMescroll().resetUpScroll();
},
/**
* 内容搜索
*/
handleSearch: () => {
- list.value = []
- getMescroll().resetUpScroll();
+ // list.value = []
+ // getMescroll().resetUpScroll();
}
}
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 4bd4874..becb0a3 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -213,6 +213,67 @@
+
+
+
+
+
+
+
+
+
+
+ 这里是套餐的名字这里是套餐的名字
+
+
+
+
+ ID:1270304172
+
+
+
+
+
+ 5.1折
+
+
+
+
+
+
+ 年售
+ 96
+
+
+ 更多
+ 改价
+ 下架
+ 编辑
+
+
+
+
+
+
+
+
+ 删除订单
+
+
+
+
+ 取消订单
+
+ 去支付
+
+
+
+
@@ -225,6 +286,7 @@
import { handleTRCancelOrderHooks, handleTRDeleteOrderHooks, handleTRToPayHooks, handleToTRStoreHooks, handleTGOrderRefundHooks } from '@/hooks/useOrder'
import { StoreType } from '@/utils/tea'
import { router } from '@/utils/tools'
+ import { toTimes, copy } from '@/utils/tools'
/**
* ComboCard 套餐卡片组件
diff --git a/src/pages.json b/src/pages.json
index 9b2a648..5d03374 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -278,7 +278,6 @@
{
"path": "setmeal/setmeal",
"type": "page",
- "needLogin": true,
"layout": "default",
"style": {
"navigationStyle": "custom"
diff --git a/src/utils/order.ts b/src/utils/order.ts
index 9715a66..cf8aad0 100644
--- a/src/utils/order.ts
+++ b/src/utils/order.ts
@@ -48,7 +48,8 @@ export enum OrderSource {
Combo = 'combo', // TODO 团购套餐：用于替代下面的Direct和Franchise
DouYin = 'douyin', // 抖音团购
TeaRoom = 'teaRoom', // 茶室
- TeaSpecialist = 'teaSpecialist' // 茶艺师
+ TeaSpecialist = 'teaSpecialist', // 茶艺师
+ SetMeal = 'setMeal', // 茶室管理端-套餐管理
}
// 订单来源对应名称
@@ -57,6 +58,7 @@ export const OrderSourceText: Record = {
[OrderSource.DouYin]: '抖音',
[OrderSource.TeaRoom]: '茶室',
[OrderSource.TeaSpecialist]: '茶艺师',
+ [OrderSource.SetMeal]: '套餐管理',
}
// 订单状态
@@ -148,7 +150,21 @@ export const OrderStatusTitle: Record>
[OrderStatus.Refunded]: '售后完成',
[OrderStatus.AfterSaleApply]: '申请售后',
[OrderStatus.AfterSaleProcessing]: '申请售后中'
- }
+ },
+ [OrderSource.SetMeal]: {
+ [OrderStatus.Consuming]: '消费中',
+ [OrderStatus.Reserved]: '已预约',
+ [OrderStatus.Serving]: '服务中',
+ [OrderStatus.Pending]: '待付款',
+ [OrderStatus.Confirm]: '订单待确认',
+ [OrderStatus.Finished]: '已完结',
+ [OrderStatus.Cancelled]: '订单取消',
+ [OrderStatus.ToUse]: '待使用',
+ [OrderStatus.Used]: '交易完成',
+ [OrderStatus.Refunded]: '售后完成',
+ [OrderStatus.AfterSaleApply]: '申请售后',
+ [OrderStatus.AfterSaleProcessing]: '申请售后中'
+ },
}