From 99c188a26be5e9feaff6a55e1f60a691b62abb6e Mon Sep 17 00:00:00 2001 From: zhangjianjun Date: Tue, 8 Sep 2026 11:02:38 +0800 Subject: [PATCH] ud --- src/lib/order.test.ts | 17 +++++++++++++++-- src/lib/order.ts | 3 --- src/pages/index/index.tsx | 8 +++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/lib/order.test.ts b/src/lib/order.test.ts index 182392d..10d0580 100644 --- a/src/lib/order.test.ts +++ b/src/lib/order.test.ts @@ -1,4 +1,5 @@ import { describe, expect, it } from 'vitest' +import { adaptA5Order } from './a5/data' import { buildResubmitPayload, filterMapLabelOrders, @@ -33,13 +34,25 @@ const mapOrder = { } describe('order display name', () => { - it('uses neutral copy for map_label and keeps other product names', () => { - expect(getOrderDisplayName(mapOrder)).toBe('商户资料服务') + it('uses the actual product name for each order', () => { + expect(getOrderDisplayName(mapOrder)).toBe('地图标注代办服务') expect(getOrderDisplayName({ goods_type: 'license_year', goods_name: '企业年报服务', })).toBe('企业年报服务') expect(getOrderDisplayName(null)).toBe('-') + expect(getOrderDisplayName({ goods_type: 'map_label', goods_name: ' ' })).toBe('-') + }) + + it('displays goods_info.name from an A5 order', () => { + const order = adaptA5Order({ + id: '727', + goods_type: 'map_label', + goods_name: '旧商品名称', + goods_info: JSON.stringify({ id: '23', name: '地图标注(常见平台)' }), + }) + + expect(getOrderDisplayName(order)).toBe('地图标注(常见平台)') }) }) diff --git a/src/lib/order.ts b/src/lib/order.ts index dbe3653..c01b434 100644 --- a/src/lib/order.ts +++ b/src/lib/order.ts @@ -142,10 +142,7 @@ export function normalizeOrders (orders: T[] = []) { }) } -export const MAP_LABEL_DISPLAY_NAME = '商户资料服务' - export function getOrderDisplayName (order?: OrderLike | null) { - if (order?.goods_type === 'map_label') return MAP_LABEL_DISPLAY_NAME return String(order?.goods_name || '').trim() || '-' } diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 18429c0..83f8a96 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -227,9 +227,11 @@ function OrderCard ({ onResubmit: () => void onComplaint: () => void }) { + const isMapLabel = order.goods_type === 'map_label' const number = a5 ? order.order_id : order.transaction_id const status = (a5 && A5_STATUSES[order.process_status]) || getStatusMeta(order.process_status, order.process_status_name) const actions = a5 ? { complaint: true, submit: true, detail: order.process_status === '2' } : getOrderCardActions(order) + const canSubmit = isMapLabel && actions.submit return ( @@ -240,7 +242,7 @@ function OrderCard ({ - + @@ -260,7 +262,7 @@ function OrderCard ({ 驳回理由:{order.reject_reason} ) : null} - {actions.complaint || actions.submit || actions.detail ? ( + {actions.complaint || canSubmit || actions.detail ? ( <> @@ -270,7 +272,7 @@ function OrderCard ({ {actions.detail ? ( 查看详情 ) : null} - {actions.submit ? ( + {canSubmit ? ( 补充资料