From f4e89542a715274027c0e7a931098008545fb499 Mon Sep 17 00:00:00 2001 From: zhangjianjun Date: Mon, 24 Aug 2026 11:11:05 +0800 Subject: [PATCH] ud --- src/app.config.ts | 2 +- src/lib/cdn.ts | 6 +++--- src/lib/order.test.ts | 13 +++++++++++++ src/lib/order.ts | 8 ++++++++ src/pages/complaint/index.tsx | 4 ++-- src/pages/index/index.tsx | 4 ++-- src/pages/map/index.tsx | 4 ++-- src/pages/resubmit/index.tsx | 10 +++++----- 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/app.config.ts b/src/app.config.ts index 4caf298..4063099 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -13,7 +13,7 @@ export default defineAppConfig({ }, permission: { 'scope.userLocation': { - desc: '用于选择门店地图位置' + desc: '用于选择门店位置' } }, requiredPrivateInfos: [ diff --git a/src/lib/cdn.ts b/src/lib/cdn.ts index 849e335..ba8c998 100644 --- a/src/lib/cdn.ts +++ b/src/lib/cdn.ts @@ -10,9 +10,9 @@ export const RECEIPT_STAMP_DONE = `${STATIC_CDN}/images/oderDetailCallBackSucces export const RECEIPT_STAMP_PENDING = `${STATIC_CDN}/images/oderDetailCallBack.png` export const ENTITY_LABELS = { - entityName: '标注名称', - entityAddress: '标注地址', - entityMapLocation: '地图位置', + entityName: '商户名称', + entityAddress: '经营地址', + entityMapLocation: '门店位置', } export const COPY_ICON = `${CORP_ASSET_BASE}/images-mobile/icon-copy.png` diff --git a/src/lib/order.test.ts b/src/lib/order.test.ts index 8a8e911..182392d 100644 --- a/src/lib/order.test.ts +++ b/src/lib/order.test.ts @@ -6,6 +6,7 @@ import { formatMapCoordinate, formatMapCoordinateDisplay, getOrderAddressName, + getOrderDisplayName, getOrderExtraImages, getOrderMapAddress, joinStorefrontSlots, @@ -17,6 +18,7 @@ import { const mapOrder = { order_id: '4', goods_type: 'map_label', + goods_name: '地图标注代办服务', entity_name: '老店', entity_phone: '13800138000', entity_extra: { keep: 1 }, @@ -30,6 +32,17 @@ const mapOrder = { }, } +describe('order display name', () => { + it('uses neutral copy for map_label and keeps other product names', () => { + expect(getOrderDisplayName(mapOrder)).toBe('商户资料服务') + expect(getOrderDisplayName({ + goods_type: 'license_year', + goods_name: '企业年报服务', + })).toBe('企业年报服务') + expect(getOrderDisplayName(null)).toBe('-') + }) +}) + describe('filterMapLabelOrders', () => { it('keeps only map_label orders and parses goods_param', () => { const orders = filterMapLabelOrders([ diff --git a/src/lib/order.ts b/src/lib/order.ts index fd8f8e3..dbe3653 100644 --- a/src/lib/order.ts +++ b/src/lib/order.ts @@ -9,6 +9,7 @@ export type UploadedImage = { export type OrderLike = { order_id?: string goods_type?: string + goods_name?: string entity_name?: string entity_phone?: string entity_extra?: Record @@ -141,6 +142,13 @@ 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() || '-' +} + export function filterOrdersForProduct (goodsType: string, orders: T[] = []) { const normalized = normalizeOrders(orders) if (isCorpGoodsType(goodsType)) return normalized diff --git a/src/pages/complaint/index.tsx b/src/pages/complaint/index.tsx index 6f85d1b..97918bc 100644 --- a/src/pages/complaint/index.tsx +++ b/src/pages/complaint/index.tsx @@ -5,7 +5,7 @@ import { report, uploadImage } from '@/api/user' import { LOCAL_IMAGES } from '@/lib/assets' import { buildFeedbackPayload, COMPLAINT_TYPES, type ComplaintType } from '@/lib/feedback' import { getOrderDraft } from '@/lib/orderDraft' -import type { OrderLike, UploadedImage } from '@/lib/order' +import { getOrderDisplayName, type OrderLike, type UploadedImage } from '@/lib/order' import './index.scss' const TYPE_ICONS: Record = { @@ -116,7 +116,7 @@ export default function ComplaintPage () { - {order?.goods_name || '-'} + {getOrderDisplayName(order)} 已支付 ¥{order?.total_fee || '-'} diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index b12c24d..64f00d0 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -9,7 +9,7 @@ import { isCorpGoodsType } from '@/lib/detail' import { getNavMetrics } from '@/lib/nav' import { pickServiceContact, type ServiceContact } from '@/lib/contact' import { setOrderDraft } from '@/lib/orderDraft' -import { filterOrdersForProduct, type OrderLike } from '@/lib/order' +import { filterOrdersForProduct, getOrderDisplayName, type OrderLike } from '@/lib/order' import { isValidPhone } from '@/lib/phone' import { getSession } from '@/lib/session' import { @@ -201,7 +201,7 @@ function OrderCard ({ return ( - {order.goods_name || '-'} + {getOrderDisplayName(order)} {status.result} diff --git a/src/pages/map/index.tsx b/src/pages/map/index.tsx index e72af4f..3056374 100644 --- a/src/pages/map/index.tsx +++ b/src/pages/map/index.tsx @@ -146,7 +146,7 @@ export default function MapPage () { Taro.navigateBack() } - const placeText = selected.name || selected.address || (resolving ? '正在识别位置…' : '滑动地图选择位置') + const placeText = selected.name || selected.address || (resolving ? '正在识别位置…' : '滑动选择位置') return ( @@ -176,7 +176,7 @@ export default function MapPage () { - {placeText === '滑动地图选择位置' ? '搜索地点' : placeText} + {placeText === '滑动选择位置' ? '搜索地点' : placeText} void locateCurrent()}> diff --git a/src/pages/resubmit/index.tsx b/src/pages/resubmit/index.tsx index 6341ca8..0cb5df5 100644 --- a/src/pages/resubmit/index.tsx +++ b/src/pages/resubmit/index.tsx @@ -35,7 +35,7 @@ const STOREFRONT_EXAMPLES = [ ] const DISCLAIMER_BODY = - '我们只是代客户提交商户、企业位置资料，不是地图标注平台方，所提供服务为商业有偿帮助咨询服务，全程都是人工提交资料，自身并不能对第三方网站的原始内容进行编辑，请知悉。' + '我们仅代客户提交商户、企业位置资料，所提供服务为商业有偿咨询及资料提交服务，全程由工作人员处理，不代表任何第三方机构，也不能编辑第三方网站的原始内容，请知悉。' function FieldLabel ({ icon, text, required }: { icon: string, text: string, required?: boolean }) { return ( @@ -275,17 +275,17 @@ export default function ResubmitPage () { updateField('entity_name', value)} /> - 请确保您的标注名称与门头照片店名一致 + 请确保商户名称与门头照片店名一致 - {values.entity_address_name || '请选择标注地址'} + {values.entity_address_name || '请选择经营地址'} @@ -295,7 +295,7 @@ export default function ResubmitPage () { - {mapDisplay || '请选择地图位置'} + {mapDisplay || '请选择门店位置'}