This commit is contained in:
zhx 2026-07-03 18:07:52 +08:00
parent f6822d2411
commit ea78619f5f
2 changed files with 798 additions and 720 deletions

File diff suppressed because it is too large Load Diff

View File

@ -37,6 +37,7 @@ export function FinanceRechargeDetailList({
onRefreshGooglePaid,
onReload,
regions,
regionsByApp,
summary,
}) {
const [expandedId, setExpandedId] = useState("");
@ -231,7 +232,7 @@ export function FinanceRechargeDetailList({
</AmountText>
</td>
<td className="r num">{taxDeductionText(item)}</td>
<td>{regionText(item, regionNames)}</td>
<td>{regionText(item, regionsByApp, apps, !filters.appCode)}</td>
</tr>
{expanded ? (
<tr className="finance-detailrow">
@ -445,12 +446,15 @@ function appName(appCode, apps) {
return (apps || []).find((app) => app.appCode === appCode)?.appName || appCode || "-";
}
function regionText(item, regionNames) {
// regionText App App Lalu- App
function regionText(item, regionsByApp, apps, withAppPrefix) {
const regionId = item.targetRegionId || item.sellerRegionId;
if (!regionId) {
return "—";
}
return regionNames.get(String(regionId)) || `区域 ${regionId}`;
const appRegions = (regionsByApp || {})[item.appCode] || [];
const name = appRegions.find((region) => String(region.regionId) === String(regionId))?.name || `区域 ${regionId}`;
return withAppPrefix ? `${appName(item.appCode, apps)}-${name}` : name;
}
function secondaryOrderNo(item) {