Upload 2 files

前端页面/market/资金与钱包_充值组件.js

@@ -48,13 +48,6 @@ export async function openRechargeModal(currentUser, onBalanceChange) {
         container.querySelector('#qr-image')?.removeAttribute('src');
     });
     container._cleanup = () => scope.dispose();
-    let balanceText = t('wallet.recharge.balance_unavailable');
-    try {
-        const wallet = normalizeWalletData(await api.getWallet(account, readOptions));
-        if (!scope.isCurrent()) return;
-        if (Number.isSafeInteger(wallet.balance)) balanceText = String(wallet.balance);
-    } catch (_) { if (!scope.isCurrent()) return; }
-
     container.className = "wallet-modal wallet-modal--recharge";
 
     const rechargeOptions = [
@@ -85,7 +78,7 @@ export async function openRechargeModal(currentUser, onBalanceChange) {
     container.innerHTML = `
         <div class="wallet-recharge__balance">
             <div class="wallet-modal__muted">${t('wallet.recharge.current_balance')}</div>
-            <div class="wallet-recharge__balance-value">${balanceText} <span class="wallet-recharge__balance-unit">${t('wallet.recharge.points_suffix')}</span></div>
+            <div class="wallet-recharge__balance-value" data-recharge-balance role="status" aria-live="polite" aria-busy="true"><span data-recharge-balance-value>${t('common.loading')}</span> <span data-recharge-balance-unit class="wallet-recharge__balance-unit" hidden>${t('wallet.recharge.points_suffix')}</span></div>
         </div>
         
         <div class="wallet-modal__field">
@@ -249,4 +242,15 @@ export async function openRechargeModal(currentUser, onBalanceChange) {
     modalElement = globalModal.activeModals.find(modal => modal.contains(container));
     constructing = false;
     observer.observe(document.body, { childList: true, subtree: true });
+
+    let balance;
+    try {
+        const wallet = normalizeWalletData(await api.getWallet(account, readOptions));
+        if (!scope.isCurrent()) return;
+        if (Number.isSafeInteger(wallet.balance)) balance = wallet.balance;
+    } catch (_) { if (!scope.isCurrent()) return; }
+    container.querySelector('[data-recharge-balance-value]').textContent = balance === undefined
+        ? t('wallet.recharge.balance_unavailable') : String(balance);
+    container.querySelector('[data-recharge-balance-unit]').hidden = balance === undefined;
+    container.querySelector('[data-recharge-balance]').setAttribute('aria-busy', 'false');
 }

前端页面/market/资金与钱包_提现组件.js

@@ -68,6 +68,20 @@ export async function openWithdrawModal(currentUser, onSuccess) {
         container.querySelectorAll('input').forEach(input => { input.value = ''; });
     });
     container._cleanup = () => scope.dispose();
+    if (!scope.isCurrent()) return;
+    container.className = "wallet-modal wallet-modal--withdraw";
+    container.setAttribute('aria-busy', 'true');
+    const status = document.createElement('div');
+    status.setAttribute('role', 'status');
+    status.setAttribute('aria-live', 'polite');
+    status.textContent = t('common.loading');
+    container.append(status);
+    const observer = new MutationObserver(() => { if (!container.isConnected) scope.dispose(); });
+    scope.addCleanup(() => observer.disconnect());
+    globalModal.openModal(t('wallet.withdraw.title'), container, { width: "420px" });
+    modalElement = globalModal.activeModals.find(modal => modal.contains(container));
+    constructing = false;
+    observer.observe(document.body, { childList: true, subtree: true });
     let walletData;
     try {
         walletData = normalizeWalletData(await api.getWallet(account, { noCache: true, componentId,
@@ -76,16 +90,15 @@ export async function openWithdrawModal(currentUser, onSuccess) {
         if (!Number.isSafeInteger(walletData.balance) || !Number.isSafeInteger(walletData.total_withdrawn)) throw new Error('wallet unavailable');
     } catch (_) {
         if (scope.isCurrent()) showToast(t('wallet.withdraw.balance_unavailable'), 'warning');
-        scope.dispose(); return;
+        scope.dispose(); globalModal.closeModal(modalElement); return;
     }
     const maxWithdraw = walletData.balance;
     const totalWithdrawn = walletData.total_withdrawn;
     if (maxWithdraw <= 0) {
-        showToast(t('wallet.withdraw.no_balance'), "warning"); scope.dispose(); return;
+        showToast(t('wallet.withdraw.no_balance'), "warning");
+        scope.dispose(); globalModal.closeModal(modalElement); return;
     }
 
-    container.className = "wallet-modal wallet-modal--withdraw";
-
     container.innerHTML = `
         <div class="wallet-withdraw__summary">
             <div>
@@ -244,10 +257,5 @@ export async function openWithdrawModal(currentUser, onSuccess) {
         const input = label.parentElement.querySelector('input');
         if (input) input.setAttribute('aria-label', label.textContent.trim());
     });
-    const observer = new MutationObserver(() => { if (!container.isConnected) scope.dispose(); });
-    scope.addCleanup(() => observer.disconnect());
-    globalModal.openModal(t('wallet.withdraw.title'), container, { width: "420px" });
-    modalElement = globalModal.activeModals.find(modal => modal.contains(container));
-    constructing = false;
-    observer.observe(document.body, { childList: true, subtree: true });
-}
+    container.setAttribute('aria-busy', 'false');
+}