hy/chatapp-h5
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: route bd leader salary to wallet actions

Browse Source
This commit is contained in:
170-carry 2026-04-28 23:41:46 +08:00
parent 850b340600
commit e9bb86cb94
5 changed files with 184 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
h5/hyapp/bd-leader-center/index.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
<title>BD Leader Center</title> <title>BD Leader Center</title>
<link rel="stylesheet" href="./style.css?v=20260428-2145" /> <link rel="stylesheet" href="./style.css?v=20260428-2215" />
</head> </head>
<body> <body>
<div class="bd-leader-center" aria-label="BD Leader Center" data-i18n-aria="page_label" data-loading="true"> <div class="bd-leader-center" aria-label="BD Leader Center" data-i18n-aria="page_label" data-loading="true">
@ -53,10 +53,10 @@
<section class="card salary-card"> <section class="card salary-card">
<div class="salary-head"> <div class="salary-head">
<div> <div>
<div class="salary-label" data-i18n="my_available_salary">My available salary</div> <div class="salary-label" data-i18n="my_available_salary">salary</div>
<div class="salary-period" id="billTitle">-</div> <div class="salary-period" id="billTitle">-</div>
</div> </div>
<button class="text-link" type="button" data-route="/available-income" data-i18n="details">Details</button> <button class="text-link" type="button" data-route="/hyapp/withdraw-exchange/index.html?identity=BD_LEADER&salaryType=BD_LEADER_SALARY" data-i18n="details">Withdraw/Exchange</button>
</div> </div>
<div class="salary-value"> <div class="salary-value">
<span aria-hidden="true">$</span> <span aria-hidden="true">$</span>
@ -223,6 +223,6 @@
<div class="toast" id="toast" role="status" aria-live="polite" hidden></div> <div class="toast" id="toast" role="status" aria-live="polite" hidden></div>
</div> </div>
<script src="./script.js?v=20260428-2145" defer></script> <script src="./script.js?v=20260428-2215" defer></script>
</body> </body>
</html> </html>

40
h5/hyapp/bd-leader-center/script.js
View File

@ -17,8 +17,8 @@
language_button_aria: "Change language", language_button_aria: "Change language",
role: "BD Leader", role: "BD Leader",
uid_prefix: "UID:", uid_prefix: "UID:",
my_available_salary: "My available salary", my_available_salary: "salary",
details: "Details", details: "Withdraw/Exchange",
bd_number: "BD number", bd_number: "BD number",
team_salary: "Team salary", team_salary: "Team salary",
bd_policy_link: "BD policy", bd_policy_link: "BD policy",
@ -67,8 +67,8 @@
language_button_aria: "تغيير اللغة", language_button_aria: "تغيير اللغة",
role: "قائد BD", role: "قائد BD",
uid_prefix: "UID:", uid_prefix: "UID:",
my_available_salary: "راتبي المتاح", my_available_salary: "الراتب",
details: "التفاصيل", details: "سحب/تبديل",
bd_number: "عدد BD", bd_number: "عدد BD",
team_salary: "راتب الفريق", team_salary: "راتب الفريق",
bd_policy_link: "سياسة BD", bd_policy_link: "سياسة BD",
@ -117,8 +117,8 @@
language_button_aria: "Dili değiştir", language_button_aria: "Dili değiştir",
role: "BD Leader", role: "BD Leader",
uid_prefix: "UID:", uid_prefix: "UID:",
my_available_salary: "Kullanılabilir maaşım", my_available_salary: "Maaş",
details: "Detaylar", details: "Withdraw/Exchange",
bd_number: "BD sayısı", bd_number: "BD sayısı",
team_salary: "Takım maaşı", team_salary: "Takım maaşı",
bd_policy_link: "BD politikası", bd_policy_link: "BD politikası",
@ -167,8 +167,8 @@
language_button_aria: "Ubah bahasa", language_button_aria: "Ubah bahasa",
role: "BD Leader", role: "BD Leader",
uid_prefix: "UID:", uid_prefix: "UID:",
my_available_salary: "Gaji tersedia", my_available_salary: "Gaji",
details: "Detail", details: "Withdraw/Exchange",
bd_number: "Jumlah BD", bd_number: "Jumlah BD",
team_salary: "Gaji tim", team_salary: "Gaji tim",
bd_policy_link: "Kebijakan BD", bd_policy_link: "Kebijakan BD",
@ -451,6 +451,11 @@
if (node) node.textContent = formatMoney(balance); if (node) node.textContent = formatMoney(balance);
} }
function balanceAmount(balance) {
const value = Number(balance?.availableBalance ?? balance?.balance ?? balance?.currentSalary ?? 0);
return Number.isFinite(value) ? value : 0;
}
function renderBill() { function renderBill() {
const bill = state.bill || {}; const bill = state.bill || {};
const members = Array.isArray(bill.memberBillList) ? bill.memberBillList : []; const members = Array.isArray(bill.memberBillList) ? bill.memberBillList : [];
@ -1019,7 +1024,24 @@
} }
async function fetchBalanceTotal() { async function fetchBalanceTotal() {
state.balanceTotal = await requestJSON("/wallet/salary-account/balance/total") || {}; const salaryTypes = ["BD_SALARY", "BD_LEADER_SALARY"];
const results = await Promise.allSettled(
salaryTypes.map((salaryType) => requestJSON(`/wallet/salary-account/balance?salaryType=${encodeURIComponent(salaryType)}`))
);
const balances = {};
results.forEach((result, index) => {
const salaryType = salaryTypes[index];
if (result.status === "fulfilled") {
balances[salaryType] = result.value || {};
} else {
balances[salaryType] = {};
console.warn(`Failed to load ${salaryType} balance:`, result.reason);
}
});
state.balanceTotal = {
...balances,
availableBalance: salaryTypes.reduce((total, salaryType) => total + balanceAmount(balances[salaryType]), 0)
};
renderBalance(); renderBalance();
} }

11
h5/hyapp/withdraw-exchange/index.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
<title>Withdraw/Exchange</title> <title>Withdraw/Exchange</title>
<link rel="stylesheet" href="./style.css?v=20260428-2030" /> <link rel="stylesheet" href="./style.css?v=20260428-2215" />
</head> </head>
<body> <body>
<div class="wallet-page" aria-label="Withdraw and exchange" data-i18n-aria="page_label"> <div class="wallet-page" aria-label="Withdraw and exchange" data-i18n-aria="page_label">
@ -46,6 +46,13 @@
</div> </div>
</section> </section>
<section class="salary-selector-card" id="salarySelector" hidden>
<div class="salary-selector-tabs">
<button class="salary-selector-tab" type="button" data-salary-type="BD_SALARY" data-i18n="bd_salary">BD salary</button>
<button class="salary-selector-tab" type="button" data-salary-type="BD_LEADER_SALARY" data-i18n="bd_leader_salary">BD Leader salary</button>
</div>
</section>
<section class="mode-card"> <section class="mode-card">
<div class="mode-tabs" role="tablist" aria-label="Withdraw, exchange, or transfer"> <div class="mode-tabs" role="tablist" aria-label="Withdraw, exchange, or transfer">
<button class="mode-tab active" type="button" role="tab" aria-selected="true" data-mode="withdraw" data-i18n="withdraw">Withdraw</button> <button class="mode-tab active" type="button" role="tab" aria-selected="true" data-mode="withdraw" data-i18n="withdraw">Withdraw</button>
@ -147,6 +154,6 @@
<div class="toast" hidden></div> <div class="toast" hidden></div>
<div class="home-indicator" aria-hidden="true"></div> <div class="home-indicator" aria-hidden="true"></div>
</div> </div>
<script src="./script.js?v=20260428-2030" defer></script> <script src="./script.js?v=20260428-2215" defer></script>
</body> </body>
</html> </html>

127
h5/hyapp/withdraw-exchange/script.js
View File

@ -16,6 +16,8 @@
title: "Withdraw/Exchange", title: "Withdraw/Exchange",
language_button_aria: "Change language", language_button_aria: "Change language",
available_income: "salary", available_income: "salary",
bd_salary: "BD salary",
bd_leader_salary: "BD Leader salary",
withdraw: "Withdraw", withdraw: "Withdraw",
exchange: "Exchange", exchange: "Exchange",
transfer: "Transfer", transfer: "Transfer",
@ -66,6 +68,8 @@
title: "سحب/تبديل", title: "سحب/تبديل",
language_button_aria: "تغيير اللغة", language_button_aria: "تغيير اللغة",
available_income: "الراتب", available_income: "الراتب",
bd_salary: "راتب BD",
bd_leader_salary: "راتب قائد BD",
withdraw: "سحب", withdraw: "سحب",
exchange: "تبديل", exchange: "تبديل",
transfer: "تحويل", transfer: "تحويل",
@ -116,6 +120,8 @@
title: "Çek/Değiştir", title: "Çek/Değiştir",
language_button_aria: "Dili değiştir", language_button_aria: "Dili değiştir",
available_income: "Maaş", available_income: "Maaş",
bd_salary: "BD maaşı",
bd_leader_salary: "BD Leader maaşı",
withdraw: "Withdraw", withdraw: "Withdraw",
exchange: "Exchange", exchange: "Exchange",
transfer: "Transfer", transfer: "Transfer",
@ -166,6 +172,8 @@
title: "Tarik/Tukar", title: "Tarik/Tukar",
language_button_aria: "Ubah bahasa", language_button_aria: "Ubah bahasa",
available_income: "Gaji", available_income: "Gaji",
bd_salary: "Gaji BD",
bd_leader_salary: "Gaji BD Leader",
withdraw: "Tarik", withdraw: "Tarik",
exchange: "Tukar", exchange: "Tukar",
transfer: "Transfer", transfer: "Transfer",
@ -215,8 +223,11 @@
const params = readURLParams(); const params = readURLParams();
let currentLang = normalizeLanguage(params.get("lang")); let currentLang = normalizeLanguage(params.get("lang"));
let currentMode = normalizeMode(params.get("mode")) || "withdraw"; let currentMode = normalizeMode(params.get("mode")) || "withdraw";
const pageIdentity = normalizeIdentity(params.get("identity"));
let currentSalaryType = normalizeSalaryType(params.get("salaryType")) || defaultSalaryTypeForIdentity(pageIdentity);
let currentMessages = translations[currentLang] || translations.en; let currentMessages = translations[currentLang] || translations.en;
let availableBalance = 0; let availableBalance = 0;
let salaryBalances = {};
let selectedPaymentInfo = null; let selectedPaymentInfo = null;
let selectedPayee = null; let selectedPayee = null;
let currentProfile = null; let currentProfile = null;
@ -242,6 +253,7 @@
const transferAccountInput = document.querySelector("#transferAccount"); const transferAccountInput = document.querySelector("#transferAccount");
const searchPayeeButton = document.querySelector("#searchPayeeButton"); const searchPayeeButton = document.querySelector("#searchPayeeButton");
const exchangeRateText = document.querySelector("#exchangeRateText"); const exchangeRateText = document.querySelector("#exchangeRateText");
const salarySelector = document.querySelector("#salarySelector");
function readURLParams() { function readURLParams() {
const result = new URLSearchParams(window.location.search); const result = new URLSearchParams(window.location.search);
@ -289,6 +301,35 @@
return ["withdraw", "exchange", "transfer"].includes(mode) ? mode : ""; return ["withdraw", "exchange", "transfer"].includes(mode) ? mode : "";
} }
function normalizeIdentity(identity) {
const value = String(identity || "").trim().toUpperCase();
return ["HOST", "BD", "BD_LEADER", "ADMIN"].includes(value) ? value : "";
}
function normalizeSalaryType(type) {
const value = String(type || "").trim().toUpperCase();
return ["HOST_SALARY", "BD_SALARY", "BD_LEADER_SALARY", "ADMIN_SALARY"].includes(value) ? value : "";
}
function defaultSalaryTypeForIdentity(identity) {
if (identity === "BD_LEADER") return "BD_LEADER_SALARY";
if (identity === "BD") return "BD_SALARY";
if (identity === "ADMIN") return "ADMIN_SALARY";
return "";
}
function isSalaryAccountMode() {
return Boolean(currentSalaryType && currentSalaryType !== "HOST_SALARY");
}
function activeSalaryType() {
return currentSalaryType || "HOST_SALARY";
}
function responseBody(data) {
return data?.body ?? data?.data ?? null;
}
function apiBaseURL() { function apiBaseURL() {
const override = window.HYAPP_API_BASE_URL || params.get("apiBase"); const override = window.HYAPP_API_BASE_URL || params.get("apiBase");
if (override) return String(override).replace(/\/+$/, ""); if (override) return String(override).replace(/\/+$/, "");
@ -360,6 +401,34 @@
return `1$ = ${EXCHANGE_RATE} golds`; return `1$ = ${EXCHANGE_RATE} golds`;
} }
function salaryBalanceValue(type) {
const balance = salaryBalances[type] || {};
return moneyNumber(balance.availableBalance ?? balance.balance ?? balance.currentSalary ?? 0);
}
function renderSalarySelector() {
if (!salarySelector) return;
const showSelector = pageIdentity === "BD_LEADER";
salarySelector.hidden = !showSelector;
if (!showSelector) return;
salarySelector.querySelectorAll("[data-salary-type]").forEach((button) => {
const type = normalizeSalaryType(button.dataset.salaryType);
const active = type === currentSalaryType;
const label = message(type === "BD_SALARY" ? "bd_salary" : "bd_leader_salary");
button.classList.toggle("active", active);
button.setAttribute("aria-pressed", String(active));
button.textContent = `${label} $${formatMoney(salaryBalanceValue(type))}`;
});
}
function setActiveSalaryType(type) {
const nextType = normalizeSalaryType(type);
if (!nextType || nextType === currentSalaryType) return;
currentSalaryType = nextType;
renderBalance(salaryBalanceValue(nextType));
}
function isValidTrc20Address(value) { function isValidTrc20Address(value) {
return /^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(String(value || "").trim()); return /^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(String(value || "").trim());
} }
@ -396,6 +465,7 @@
button.setAttribute("aria-pressed", String(isActive)); button.setAttribute("aria-pressed", String(isActive));
}); });
if (exchangeRateText) exchangeRateText.textContent = formatExchangeRate(); if (exchangeRateText) exchangeRateText.textContent = formatExchangeRate();
renderSalarySelector();
renderPayee(); renderPayee();
updateSubmitState(); updateSubmitState();
} }
@ -456,6 +526,7 @@
function renderBalance(value) { function renderBalance(value) {
availableBalance = moneyNumber(value); availableBalance = moneyNumber(value);
if (balanceAmount) balanceAmount.textContent = formatMoney(availableBalance); if (balanceAmount) balanceAmount.textContent = formatMoney(availableBalance);
renderSalarySelector();
Object.values(inputs).forEach((input) => { Object.values(inputs).forEach((input) => {
if (input) input.max = formatMoney(availableBalance); if (input) input.max = formatMoney(availableBalance);
}); });
@ -524,11 +595,36 @@
async function fetchBalance() { async function fetchBalance() {
try { try {
if (pageIdentity === "BD_LEADER") {
const salaryTypes = ["BD_SALARY", "BD_LEADER_SALARY"];
const results = await Promise.allSettled(
salaryTypes.map((type) => requestJSON(`/wallet/salary-account/balance?salaryType=${encodeURIComponent(type)}`))
);
salaryBalances = {};
results.forEach((result, index) => {
const type = salaryTypes[index];
salaryBalances[type] = result.status === "fulfilled" ? responseBody(result.value) || {} : {};
if (result.status === "rejected") console.warn(`Failed to load ${type} balance:`, result.reason);
});
if (results.every((result) => result.status === "rejected")) throw results[0].reason;
if (!currentSalaryType) currentSalaryType = "BD_LEADER_SALARY";
renderBalance(salaryBalanceValue(currentSalaryType));
return;
}
if (isSalaryAccountMode()) {
const data = await requestJSON(`/wallet/salary-account/balance?salaryType=${encodeURIComponent(currentSalaryType)}`);
const body = responseBody(data) || {};
salaryBalances = { [currentSalaryType]: body };
renderBalance(body.availableBalance ?? body.balance ?? body.currentSalary ?? 0);
return;
}
const data = await requestJSON("/wallet/bank/balance"); const data = await requestJSON("/wallet/bank/balance");
const body = data.body ?? data.data ?? 0; const body = responseBody(data) ?? 0;
renderBalance(typeof body === "number" ? body : body.currentSalary ?? body.availableBalance ?? body.balance ?? 0); renderBalance(typeof body === "number" ? body : body.currentSalary ?? body.availableBalance ?? body.balance ?? 0);
} catch (error) { } catch (error) {
console.error("Failed to load bank balance:", error); console.error("Failed to load balance:", error);
renderBalance(0); renderBalance(0);
showToast("load_balance_failed", error.message); showToast("load_balance_failed", error.message);
} }
@ -683,7 +779,7 @@
body: { body: {
amount: activeAmount(), amount: activeAmount(),
acceptBankCardId: selectedPaymentInfo.id, acceptBankCardId: selectedPaymentInfo.id,
salaryType: "HOST_SALARY" salaryType: activeSalaryType()
} }
}); });
showToast("withdraw_success"); showToast("withdraw_success");
@ -696,11 +792,11 @@
return; return;
} }
await requestJSON("/wallet/bank/exchange/gold", { await requestJSON(isSalaryAccountMode() ? "/wallet/salary-account/exchange/gold" : "/wallet/bank/exchange/gold", {
method: "POST", method: "POST",
body: { body: isSalaryAccountMode()
amount: activeAmount() ? { amount: activeAmount(), salaryType: activeSalaryType() }
} : { amount: activeAmount() }
}); });
showToast("exchange_success"); showToast("exchange_success");
} }
@ -712,13 +808,11 @@
return; return;
} }
await requestJSON("/wallet/bank/transferGold", { await requestJSON(isSalaryAccountMode() ? "/wallet/salary-account/transferGold" : "/wallet/bank/transferGold", {
method: "POST", method: "POST",
body: { body: isSalaryAccountMode()
amount: activeAmount(), ? { amount: activeAmount(), acceptUserId: selectedPayee.id, salaryType: activeSalaryType() }
acceptUserId: selectedPayee.id, : { amount: activeAmount(), acceptUserId: selectedPayee.id, acceptMethod: "BANK_TRANSFER" }
acceptMethod: "BANK_TRANSFER"
}
}); });
showToast("transfer_success"); showToast("transfer_success");
} }
@ -760,7 +854,8 @@
if (token) nextParams.set("token", token); if (token) nextParams.set("token", token);
if (currentLang) nextParams.set("lang", currentLang); if (currentLang) nextParams.set("lang", currentLang);
const query = nextParams.toString(); const query = nextParams.toString();
window.location.href = `../host-center/index.html${query ? `?${query}` : ""}`; const fallbackPage = pageIdentity === "BD_LEADER" ? "../bd-leader-center/index.html" : "../host-center/index.html";
window.location.href = `${fallbackPage}${query ? `?${query}` : ""}`;
}); });
} }
@ -795,6 +890,10 @@
tab.addEventListener("click", () => setMode(tab.dataset.mode)); tab.addEventListener("click", () => setMode(tab.dataset.mode));
}); });
document.querySelectorAll("[data-salary-type]").forEach((button) => {
button.addEventListener("click", () => setActiveSalaryType(button.dataset.salaryType));
});
document.querySelector(".text-action")?.addEventListener("click", () => { document.querySelector(".text-action")?.addEventListener("click", () => {
if (inputs.withdraw) inputs.withdraw.value = formatMoney(availableBalance); if (inputs.withdraw) inputs.withdraw.value = formatMoney(availableBalance);
updateSubmitState(); updateSubmitState();

27
h5/hyapp/withdraw-exchange/style.css
View File

@ -294,6 +294,7 @@ select {
} }
.balance-card, .balance-card,
.salary-selector-card,
.mode-card, .mode-card,
.card-section, .card-section,
.bind-panel { .bind-panel {
@ -332,6 +333,32 @@ select {
line-height: 1; line-height: 1;
} }
.salary-selector-card {
padding: 10px;
}
.salary-selector-tabs {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 6px;
}
.salary-selector-tab {
min-height: 40px;
padding: 0 8px;
border-radius: 8px;
background: #eef1f1;
color: #777a80;
font-size: 13px;
font-weight: 900;
}
.salary-selector-tab.active {
background: #e7fbf8;
color: #0e8f82;
box-shadow: inset 0 0 0 1px rgba(22, 185, 172, 0.22);
}
.mode-card { .mode-card {
padding: 16px; padding: 16px;
} }