diff --git a/h5/hyapp/recharge-center/index.html b/h5/hyapp/recharge-center/index.html index 68f5209..16e50f6 100644 --- a/h5/hyapp/recharge-center/index.html +++ b/h5/hyapp/recharge-center/index.html @@ -4,7 +4,7 @@ Recharge Center - +
@@ -238,6 +238,6 @@
- + diff --git a/h5/hyapp/recharge-center/script.js b/h5/hyapp/recharge-center/script.js index ff1176b..9e22017 100644 --- a/h5/hyapp/recharge-center/script.js +++ b/h5/hyapp/recharge-center/script.js @@ -643,6 +643,36 @@ }).format(number); } + function numberValue(value) { + const number = Number(String(value ?? "").replace(/,/g, "")); + return Number.isFinite(number) ? number : null; + } + + function pickRecordUSDAmount(record) { + const directCandidates = [ + record?.usdQuantity, + record?.usdAmount, + record?.amountUsd, + record?.amountUSDT, + record?.amountUsdt, + record?.usdtAmount, + record?.transferAmountUsdt, + record?.transferAmountUSD, + record?.dollarAmount + ]; + for (const candidate of directCandidates) { + const number = numberValue(candidate); + if (number && number > 0) return number; + } + + const rechargeType = String(record?.rechargeType || record?.currency || "").toUpperCase(); + if (rechargeType.includes("USD")) { + const fallback = numberValue(record?.orderAmount ?? record?.amount); + if (fallback && fallback > 0) return fallback; + } + return null; + } + function pickCoinAmount(body) { if (typeof body === "number" || typeof body === "string") return body; if (body && typeof body === "object") { @@ -989,11 +1019,13 @@ const amount = document.createElement("div"); const isIncome = Number(record?.type) === 0; amount.className = `history-record-amount ${isIncome ? "is-income" : "is-expense"}`; - amount.textContent = `${isIncome ? "+" : "-"}${formatCoins(record?.quantity)} ${message("coins")}`; + const usdAmount = isIncome ? pickRecordUSDAmount(record) : null; + amount.textContent = `${isIncome ? "+" : "-"}${formatCoins(record?.quantity)} ${message("coins")}${usdAmount !== null ? ` ≈ $${formatMoney(usdAmount)}` : ""}`; const time = document.createElement("div"); time.className = "history-record-time"; time.textContent = formatRecordTime(record?.createTime); - side.append(amount, time); + side.appendChild(amount); + side.appendChild(time); item.append(userWrap, side); return item;