From 2a05da8d00deee4b80fd23c2ff3e3e31d628d479 Mon Sep 17 00:00:00 2001 From: lik Date: Tue, 10 Nov 2026 15:57:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=B8=8D=E5=86=8D=E5=8F=91=E9=80=81=20cancel?= =?UTF-8?q?led=EF=BC=8C=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=94=B9=E7=94=A8=E6=8E=A5=E5=8F=A3=20counts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/api.ts | 15 ++++++++++++++- src/utils/format.ts | 8 +++++++- src/views/dashboard/index.vue | 18 +++++++++++------- src/views/orders/index.vue | 13 +++++++++---- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/types/api.ts b/src/types/api.ts index c704e75..ff0e3ff 100644 --- a/src/types/api.ts +++ b/src/types/api.ts @@ -114,10 +114,23 @@ export type EscortRecord = { } } +export type EscortListCounts = { + all: number + ongoing: number + pending: number + cancelRequested: number + confirmed: number + /** 后端字段名为 inProgress,对应 status=in_progress */ + inProgress: number + completed: number + /** 取消计数:含 cancelStatus=cancelled 与历史 status=cancelled 数据 */ + cancelled: number +} + export type EscortListResult = { records: EscortRecord[] total: number - counts: { all: number; ongoing: number } + counts: EscortListCounts page: number pageSize: number } diff --git a/src/utils/format.ts b/src/utils/format.ts index f1d0021..57c6e79 100644 --- a/src/utils/format.ts +++ b/src/utils/format.ts @@ -23,11 +23,17 @@ export const shortId = (value?: string | null): string => (value ? value.slice(- export const today = (): string => formatDate(new Date()) -export const STATUS_LABELS: Record = { +// 服务状态(可筛选):取消不在 status 上,由 cancelStatus 单独表达 +export const SERVICE_STATUS_LABELS: Record = { pending: '待确认', confirmed: '已确认', in_progress: '服务中', completed: '已完成', +} + +// 状态展示:兼容历史数据里把取消写在 status 中的旧订单 +export const STATUS_LABELS: Record = { + ...SERVICE_STATUS_LABELS, cancelled: '已取消', } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 187b3cb..b90f399 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -305,7 +305,6 @@ const shiftDate = (days: number) => { const load = async () => { loading.value = true try { - const statusKeys = Object.keys(STATUS_LABELS) const [ todayRes, cancelRes, @@ -313,7 +312,6 @@ const load = async () => { recentRes, cancelListRes, trendRes, - ...statusResList ] = await Promise.all([ escortApi.list({ page: 1, pageSize: 1, appointmentDate: today() }), escortApi.list({ page: 1, pageSize: 1, cancelStatus: 'requested' }), @@ -328,7 +326,6 @@ const load = async () => { endDate: today(), includeCancelled: '1', }), - ...statusKeys.map((status) => escortApi.list({ page: 1, pageSize: 1, status })), ]) summary.today = todayRes.total @@ -337,10 +334,15 @@ const load = async () => { recent.value = recentRes.records cancelRequests.value = cancelListRes.records - statusKeys.forEach((status, index) => { - statusCounts[status] = statusResList[index]?.total || 0 - }) - summary.pending = statusCounts.pending || 0 + // 状态分布直接取列表接口的 counts:取消由 counts.cancelled 统计(含历史 status=cancelled 数据), + // 不能按 status=cancelled 查询,取消不在服务状态枚举内 + const totals = recentRes.counts + statusCounts.pending = totals.pending || 0 + statusCounts.confirmed = totals.confirmed || 0 + statusCounts.in_progress = totals.inProgress || 0 + statusCounts.completed = totals.completed || 0 + statusCounts.cancelled = totals.cancelled || 0 + summary.pending = statusCounts.pending const countsByDate: Record = {} trendRes.records.forEach((item) => { @@ -356,6 +358,8 @@ const load = async () => { } trend.dates = dates trend.counts = counts + } catch { + // 错误提示由请求层统一弹出;401 会跳转登录页 } finally { loading.value = false } diff --git a/src/views/orders/index.vue b/src/views/orders/index.vue index 37e3d5a..5125d37 100644 --- a/src/views/orders/index.vue +++ b/src/views/orders/index.vue @@ -39,7 +39,7 @@
全部 服务状态 - + @@ -228,6 +228,7 @@ import { CHANNEL_LABELS, PAYMENT_LABELS, PAYMENT_VARIANTS, + SERVICE_STATUS_LABELS, STATUS_LABELS, STATUS_VARIANTS, formatDate, @@ -242,10 +243,14 @@ const router = useRouter() const queryText = (value: unknown) => (typeof value === 'string' ? value : '') +// 旧链接可能用 status=cancelled 表达「已取消」;取消现在由 cancelStatus 表达 +const initialStatus = queryText(route.query.status) +const legacyCancelled = initialStatus === 'cancelled' + const filters = reactive({ keyword: queryText(route.query.keyword), - status: queryText(route.query.status), - cancelStatus: queryText(route.query.cancelStatus), + status: SERVICE_STATUS_LABELS[initialStatus] ? initialStatus : '', + cancelStatus: queryText(route.query.cancelStatus) || (legacyCancelled ? 'cancelled' : ''), paymentStatus: queryText(route.query.paymentStatus), payChannel: queryText(route.query.payChannel), appointmentDate: queryText(route.query.appointmentDate),