From e01c7efc3cfaa4283d52edbea7a25d0f3aed837e Mon Sep 17 00:00:00 2001 From: hailin Date: Tue, 6 Jan 2026 21:46:49 -0800 Subject: [PATCH] =?UTF-8?q?fix(admin-web):=20=E4=BF=AE=E5=A4=8D=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=B4=A6=E6=88=B7=E6=98=BE=E7=A4=BA=E7=9C=81=E5=B8=82?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - getAccountDisplayName 支持6位区域代码(如 330100) - 330100 → 浙江01市 (330100) - 440600 → 广东06市 (440600) - RegionAccountsSection 使用 regionCode 解析名称,不依赖后端 regionName 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../SystemAccountsTab.tsx | 4 ++-- .../src/types/system-account.types.ts | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx b/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx index ecb027bf..66724e90 100644 --- a/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx +++ b/frontend/admin-web/src/components/features/system-account-report/SystemAccountsTab.tsx @@ -383,8 +383,8 @@ function RegionAccountsSection({ data, type }: { data: RegionAccountsSummary; ty {data.accounts.map((account) => ( - {/* [2026-01-07] 更新:合并显示区域名称和编码 */} - {account.regionName ? `${account.regionName} (${account.regionCode})` : account.regionCode || '-'} + {/* [2026-01-07] 更新:使用 getAccountDisplayName 解析区域代码为省市名称 */} + {account.regionCode ? getAccountDisplayName(account.regionCode) : '-'} {formatAmount(account.usdtBalance)} {formatAmount(account.totalReceived)} diff --git a/frontend/admin-web/src/types/system-account.types.ts b/frontend/admin-web/src/types/system-account.types.ts index f1ead3a1..38715905 100644 --- a/frontend/admin-web/src/types/system-account.types.ts +++ b/frontend/admin-web/src/types/system-account.types.ts @@ -479,7 +479,25 @@ export function getAccountDisplayName(accountSequence: string): string { if (SYSTEM_ACCOUNT_NAMES[accountSequence]) { return `${SYSTEM_ACCOUNT_NAMES[accountSequence]} (${accountSequence})`; } - // 检查是否是7位数字的区域账户 + // 检查是否是6位数字的区域代码(如 330100) + if (/^\d{6}$/.test(accountSequence)) { + const provinceCode = accountSequence.substring(0, 2); + const cityPart = accountSequence.substring(2, 4); + const provinceName = PROVINCE_CODE_NAMES[provinceCode]; + + if (provinceName) { + // 判断是省级还是市级 + if (cityPart === '00') { + // 省级 + return `${provinceName} (${accountSequence})`; + } else { + // 市级 - 显示省份简称 + 市级代码 + const shortProvinceName = provinceName.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, ''); + return `${shortProvinceName}${cityPart}市 (${accountSequence})`; + } + } + } + // 检查是否是7位数字的区域账户序列号 if (/^\d{7}$/.test(accountSequence)) { const provinceCode = accountSequence.substring(0, 2); const cityPart = accountSequence.substring(2, 4);