From c1f4e7c7aef5a944be9e8cb39e044ee06f998863 Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Thu, 10 Sep 2026 11:42:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(huya):=20=E4=BF=AE=E5=A4=8D=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E9=A1=B5=E7=99=BB=E5=BD=95=E9=98=9F=E5=88=97=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=AF=94=E8=BE=83=E5=AF=BC=E8=87=B4=E7=9A=84=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=9E=84=E5=BB=BA=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 web/frontend/src/pages/HuyaAccountsPage.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/frontend/src/pages/HuyaAccountsPage.tsx b/web/frontend/src/pages/HuyaAccountsPage.tsx
index 2d383fa..4364fc2 100644
--- a/web/frontend/src/pages/HuyaAccountsPage.tsx
+++ b/web/frontend/src/pages/HuyaAccountsPage.tsx
@@ -273,6 +273,7 @@ export default function HuyaAccountsPage() {
   }, [tags]);
 
   const selectedCount = selectedAllMatching ? total : selectedRowKeys.length;
+  const loginQueueBusy = loginQueuePhase === 'login' || loginQueuePhase === 'wait';
   const selectionPayload = useMemo(() => ({
     account_ids: selectedAllMatching ? [] : selectedRowKeys.map((key) => Number(key)),
     all_matching: selectedAllMatching,
@@ -1892,11 +1893,11 @@ export default function HuyaAccountsPage() {
         title={loginModalTitle}
         open={passwordLoginResultOpen}
         onCancel={() => {
-          if (loginQueuePhase === 'login' || loginQueuePhase === 'wait') return;
+          if (loginQueueBusy) return;
           setPasswordLoginResultOpen(false);
         }}
         footer={[
-          (loginQueuePhase === 'login' || loginQueuePhase === 'wait') ? (
+          loginQueueBusy ? (
             <Button key="stop" danger onClick={handleStopLoginQueue}>
               停止队列
             </Button>
@@ -1906,7 +1907,6 @@ export default function HuyaAccountsPage() {
             <Button
               key="retry"
               icon={<ReloadOutlined />}
-              disabled={loginQueuePhase === 'login' || loginQueuePhase === 'wait'}
               onClick={() => { void handleRetryFailedLogins(); }}
             >
               重试失败 ({passwordLoginResults.filter((item) => !item.success).length})
@@ -1915,14 +1915,14 @@ export default function HuyaAccountsPage() {
           <Button
             key="ok"
             type="primary"
-            disabled={loginQueuePhase === 'login' || loginQueuePhase === 'wait'}
+            disabled={loginQueueBusy}
             onClick={() => setPasswordLoginResultOpen(false)}
           >
             确定
           </Button>,
         ].filter(Boolean)}
-        maskClosable={loginQueuePhase !== 'login' && loginQueuePhase !== 'wait'}
-        closable={loginQueuePhase !== 'login' && loginQueuePhase !== 'wait'}
+        maskClosable={!loginQueueBusy}
+        closable={!loginQueueBusy}
         width={860}
       >
         <Alert
@@ -1939,7 +1939,7 @@ export default function HuyaAccountsPage() {
                   : '登录说明'
           }
           description={
-            loginQueuePhase === 'login' || loginQueuePhase === 'wait'
+            loginQueueBusy
               ? `默认单线程，同时只登录一个号；失败最多尝试 ${HUYA_LOGIN_MAX_ATTEMPTS} 次再跳下一个。号与号之间间隔 ${loginIntervalSeconds} 秒。`
               : '使用 App 协议登录时，系统已自动识别并通过 safe_auth 乱序滑块；若个别新账号提示“要求扫码验证 (qr_auth)”，则需在手机虎牙 App 上正常登录一次以建立设备信任。失败的账号可一键重试。'
           }
@@ -1951,7 +1951,7 @@ export default function HuyaAccountsPage() {
             min={0}
             max={30}
             value={loginIntervalSeconds}
-            disabled={loginQueuePhase === 'login' || loginQueuePhase === 'wait'}
+            disabled={loginQueueBusy}
             onChange={(value) => {
               const next = Math.min(30, Math.max(0, Number(value ?? HUYA_LOGIN_DEFAULT_INTERVAL)));
               setLoginIntervalSeconds(next);
@@ -1963,7 +1963,7 @@ export default function HuyaAccountsPage() {
             成功 {passwordLoginResults.filter((item) => item.success).length} · 失败 {passwordLoginResults.filter((item) => !item.success).length}
           </Text>
         </Space>
-        {(loginQueuePhase === 'login' || loginQueuePhase === 'wait') && loginQueueTotal > 0 && (
+        {loginQueueBusy && loginQueueTotal > 0 && (
           <Progress
             percent={Math.round(
               ((loginQueuePhase === 'login'