diff --git a/h5/hyapp/agency-center/host-list.html b/h5/hyapp/agency-center/host-list.html index 55478ef..5fa2c12 100644 --- a/h5/hyapp/agency-center/host-list.html +++ b/h5/hyapp/agency-center/host-list.html @@ -93,6 +93,6 @@
loading....
- + diff --git a/h5/hyapp/agency-center/host-list.js b/h5/hyapp/agency-center/host-list.js index fcbc70b..6ef0cd2 100644 --- a/h5/hyapp/agency-center/host-list.js +++ b/h5/hyapp/agency-center/host-list.js @@ -412,8 +412,11 @@ function formatCountValue(value) { if (value === null || value === undefined || value === "") return "-"; const number = Number(value); - if (Number.isFinite(number) && Number.isInteger(number)) return String(number); - if (Number.isFinite(number)) return String(Number(number.toFixed(2))); + if (Number.isFinite(number)) { + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } return String(value); } @@ -548,7 +551,7 @@ const totalNode = document.querySelector("#memberTotal"); if (!totalNode) return; const number = Number(currentTotalMembers); - totalNode.textContent = Number.isFinite(number) ? String(Math.max(0, Math.trunc(number))) : "-"; + totalNode.textContent = Number.isFinite(number) ? new Intl.NumberFormat("en-US").format(Math.max(0, Math.trunc(number))) : "-"; } function renderSearchState() { diff --git a/h5/hyapp/agency-center/index.html b/h5/hyapp/agency-center/index.html index d51a59a..e51a555 100644 --- a/h5/hyapp/agency-center/index.html +++ b/h5/hyapp/agency-center/index.html @@ -220,6 +220,6 @@
loading....
- + diff --git a/h5/hyapp/agency-center/script.js b/h5/hyapp/agency-center/script.js index c543822..8e1d789 100644 --- a/h5/hyapp/agency-center/script.js +++ b/h5/hyapp/agency-center/script.js @@ -377,7 +377,12 @@ function formatMoney(value) { const number = Number(value); - return Number.isFinite(number) ? number.toFixed(2) : "0.00"; + return Number.isFinite(number) + ? new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number) + : "0.00"; } function pickCurrentSalary(body) { @@ -460,7 +465,7 @@ const number = Number(count); if (Number.isFinite(number)) { - countNode.textContent = String(Math.max(0, Math.trunc(number))); + countNode.textContent = new Intl.NumberFormat("en-US").format(Math.max(0, Math.trunc(number))); return; } @@ -604,7 +609,7 @@ const numericValue = Number(value); if (!Number.isFinite(numericValue)) return "0"; const safeValue = Math.max(0, numericValue); - return Number.isInteger(safeValue) ? String(safeValue) : String(Number(safeValue.toFixed(2))); + return formatCountValue(safeValue); } function pickFirstMemberWorkTarget(body) { @@ -626,8 +631,11 @@ function formatCountValue(value) { if (value === null || value === undefined || value === "") return "-"; const number = Number(value); - if (Number.isFinite(number) && Number.isInteger(number)) return String(number); - if (Number.isFinite(number)) return String(Number(number.toFixed(2))); + if (Number.isFinite(number)) { + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } return String(value); } diff --git a/h5/hyapp/bd-center/index.html b/h5/hyapp/bd-center/index.html index d3bd311..467843e 100644 --- a/h5/hyapp/bd-center/index.html +++ b/h5/hyapp/bd-center/index.html @@ -116,6 +116,6 @@ - + diff --git a/h5/hyapp/bd-center/script.js b/h5/hyapp/bd-center/script.js index 1a6ed28..e467bfc 100644 --- a/h5/hyapp/bd-center/script.js +++ b/h5/hyapp/bd-center/script.js @@ -358,14 +358,20 @@ function formatMoney(value) { const number = Number(value); if (!Number.isFinite(number)) return "0.00"; - return number.toFixed(2); + return new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number); } function formatCount(value) { if (value === null || value === undefined || value === "") return "0"; const number = Number(value); - if (Number.isFinite(number) && Number.isInteger(number)) return String(number); - if (Number.isFinite(number)) return String(Number(number.toFixed(2))); + if (Number.isFinite(number)) { + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } return String(value); } diff --git a/h5/hyapp/bd-leader-center/index.html b/h5/hyapp/bd-leader-center/index.html index a8ecf3c..adee6b3 100644 --- a/h5/hyapp/bd-leader-center/index.html +++ b/h5/hyapp/bd-leader-center/index.html @@ -168,6 +168,6 @@ - + diff --git a/h5/hyapp/bd-leader-center/script.js b/h5/hyapp/bd-leader-center/script.js index 8935cc7..58f15fe 100644 --- a/h5/hyapp/bd-leader-center/script.js +++ b/h5/hyapp/bd-leader-center/script.js @@ -391,14 +391,20 @@ function formatMoney(value) { const number = Number(value); if (!Number.isFinite(number)) return "0.00"; - return number.toFixed(2); + return new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number); } function formatCount(value) { if (value === null || value === undefined || value === "") return "0"; const number = Number(value); - if (Number.isFinite(number) && Number.isInteger(number)) return String(number); - if (Number.isFinite(number)) return String(Number(number.toFixed(2))); + if (Number.isFinite(number)) { + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } return String(value); } diff --git a/h5/hyapp/host-center/index.html b/h5/hyapp/host-center/index.html index a2e5b70..5a0fea1 100644 --- a/h5/hyapp/host-center/index.html +++ b/h5/hyapp/host-center/index.html @@ -188,6 +188,6 @@
loading....
- + diff --git a/h5/hyapp/host-center/policy.html b/h5/hyapp/host-center/policy.html index 5d5de8d..3cb15ed 100644 --- a/h5/hyapp/host-center/policy.html +++ b/h5/hyapp/host-center/policy.html @@ -40,6 +40,6 @@ - + diff --git a/h5/hyapp/host-center/policy.js b/h5/hyapp/host-center/policy.js index 2d68c89..ebc6800 100644 --- a/h5/hyapp/host-center/policy.js +++ b/h5/hyapp/host-center/policy.js @@ -221,15 +221,19 @@ function formatPlainValue(value) { if (value === null || value === undefined || value === "") return "0"; + const number = Number(value); + if (Number.isFinite(number)) { + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } return String(value); } function formatTarget(value) { const number = Number(value); if (!Number.isFinite(number)) return formatPlainValue(value); - if (number >= 1000000) return `${(number / 1000000).toFixed(1)}M`; - if (number >= 1000) return `${(number / 1000).toFixed(1)}K`; - return String(number); + return formatPlainValue(number); } function formatSalary(value, policyType) { diff --git a/h5/hyapp/host-center/script.js b/h5/hyapp/host-center/script.js index beb537c..fe25f5b 100644 --- a/h5/hyapp/host-center/script.js +++ b/h5/hyapp/host-center/script.js @@ -637,7 +637,12 @@ function formatCurrentSalary(value) { const numericValue = Number(value); - if (Number.isFinite(numericValue)) return numericValue.toFixed(2); + if (Number.isFinite(numericValue)) { + return new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(numericValue); + } return "0.00"; } diff --git a/h5/hyapp/hosts-bill/index.html b/h5/hyapp/hosts-bill/index.html index 8851b05..311544b 100644 --- a/h5/hyapp/hosts-bill/index.html +++ b/h5/hyapp/hosts-bill/index.html @@ -130,6 +130,6 @@
loading....
- + diff --git a/h5/hyapp/hosts-bill/script.js b/h5/hyapp/hosts-bill/script.js index 7be1ba2..ba2ba1a 100644 --- a/h5/hyapp/hosts-bill/script.js +++ b/h5/hyapp/hosts-bill/script.js @@ -401,12 +401,22 @@ function formatMoney(value) { const number = Number(value); - return Number.isFinite(number) ? `$${number.toFixed(2)}` : "$0.00"; + return Number.isFinite(number) + ? `$${new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number)}` + : "$0.00"; } function formatPlainMoney(value) { const number = Number(value); - return Number.isFinite(number) ? number.toFixed(2) : "0.00"; + return Number.isFinite(number) + ? new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number) + : "0.00"; } function formatCount(value) { @@ -690,7 +700,7 @@ const days = document.createElement("div"); days.className = "bill-member-days"; - days.textContent = `${t("days")}: ${effectiveDay}`; + days.textContent = `${t("days")}: ${formatCount(effectiveDay)}`; side.appendChild(level); side.appendChild(gift); diff --git a/h5/hyapp/manager-center/index.html b/h5/hyapp/manager-center/index.html index 3060638..10408f6 100644 --- a/h5/hyapp/manager-center/index.html +++ b/h5/hyapp/manager-center/index.html @@ -228,6 +228,6 @@ - + diff --git a/h5/hyapp/manager-center/script.js b/h5/hyapp/manager-center/script.js index 1e31b55..a5c44c1 100644 --- a/h5/hyapp/manager-center/script.js +++ b/h5/hyapp/manager-center/script.js @@ -725,11 +725,11 @@ } function formatDays(days) { - return message("days", "{count} days").replace("{count}", String(days || 0)); + return message("days", "{count} days").replace("{count}", new Intl.NumberFormat("en-US").format(Number(days) || 0)); } function formatBDLeaderCount(count) { - return message("bd_leader_count", "{count} BD Leaders").replace("{count}", String(count || 0)); + return message("bd_leader_count", "{count} BD Leaders").replace("{count}", new Intl.NumberFormat("en-US").format(Number(count) || 0)); } function formatDateTime(value) { diff --git a/h5/hyapp/recharge-center/index.html b/h5/hyapp/recharge-center/index.html index 3b45175..2bbbab6 100644 --- a/h5/hyapp/recharge-center/index.html +++ b/h5/hyapp/recharge-center/index.html @@ -238,6 +238,6 @@ - + diff --git a/h5/hyapp/recharge-center/script.js b/h5/hyapp/recharge-center/script.js index 99f9027..ff1176b 100644 --- a/h5/hyapp/recharge-center/script.js +++ b/h5/hyapp/recharge-center/script.js @@ -637,7 +637,10 @@ function formatMoney(value) { const number = Number(value); if (!Number.isFinite(number)) return "0.00"; - return number.toFixed(2); + return new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number); } function pickCoinAmount(body) { @@ -659,7 +662,16 @@ function formatCoins(value) { const number = Number(value); if (!Number.isFinite(number)) return "0"; - return Number.isInteger(number) ? String(number) : String(Number(number.toFixed(2))); + return new Intl.NumberFormat("en-US", { + maximumFractionDigits: 2 + }).format(number); + } + + function formatCoinLabel(value) { + if (value === null || value === undefined || value === "") return "-"; + const number = Number(value); + if (!Number.isFinite(number)) return String(value); + return formatCoins(number); } function normalizeRecordList(body) { @@ -1169,7 +1181,7 @@ coin.appendChild(shine); const content = document.createElement("span"); content.className = "package-content"; - content.textContent = goods?.content || goods?.awardContent || "-"; + content.textContent = formatCoinLabel(goods?.content ?? goods?.awardContent); const price = document.createElement("span"); price.className = "package-price"; price.textContent = state.ordering && state.activeOrderKey === key diff --git a/h5/hyapp/withdraw-exchange/index.html b/h5/hyapp/withdraw-exchange/index.html index 7056a1d..94e02ab 100644 --- a/h5/hyapp/withdraw-exchange/index.html +++ b/h5/hyapp/withdraw-exchange/index.html @@ -165,6 +165,6 @@ - + diff --git a/h5/hyapp/withdraw-exchange/script.js b/h5/hyapp/withdraw-exchange/script.js index 8c6b2b4..9d8bec7 100644 --- a/h5/hyapp/withdraw-exchange/script.js +++ b/h5/hyapp/withdraw-exchange/script.js @@ -471,6 +471,16 @@ } function formatMoney(value) { + const number = Number(value); + return Number.isFinite(number) + ? new Intl.NumberFormat("en-US", { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }).format(number) + : "0.00"; + } + + function formatMoneyInput(value) { const number = Number(value); return Number.isFinite(number) ? number.toFixed(2) : "0.00"; } @@ -635,7 +645,7 @@ if (balanceAmount) balanceAmount.textContent = formatMoney(availableBalance); renderSalarySelector(); Object.values(inputs).forEach((input) => { - if (input) input.max = formatMoney(availableBalance); + if (input) input.max = formatMoneyInput(availableBalance); }); updateSubmitState(); } @@ -1003,7 +1013,7 @@ const parts = raw.split("."); let nextValue = parts.length > 2 ? `${parts[0]}.${parts.slice(1).join("")}` : raw; const amount = Number(nextValue); - if (Number.isFinite(amount) && amount > availableBalance) nextValue = formatMoney(availableBalance); + if (Number.isFinite(amount) && amount > availableBalance) nextValue = formatMoneyInput(availableBalance); input.value = nextValue; updateSubmitState(); } @@ -1238,7 +1248,7 @@ }); document.querySelector(".text-action")?.addEventListener("click", () => { - if (inputs.withdraw) inputs.withdraw.value = formatMoney(availableBalance); + if (inputs.withdraw) inputs.withdraw.value = formatMoneyInput(availableBalance); updateSubmitState(); });