From 4c6e59fbe56a7d591e582c0815e1de0ef205d5b7 Mon Sep 17 00:00:00 2001
From: qian <wuchengqian5@163.com>
Date: Sat, 13 Jun 2026 14:50:41 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/tenant/src/stores/tenant-auth.ts    |  2 +-
 web/tenant/src/views/auth/LoginPage.vue | 40 ++++++++++++-------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/web/tenant/src/stores/tenant-auth.ts b/web/tenant/src/stores/tenant-auth.ts
index 568c00d..a674e24 100644
--- a/web/tenant/src/stores/tenant-auth.ts
+++ b/web/tenant/src/stores/tenant-auth.ts
@@ -122,7 +122,7 @@ export const useTenantAuthStore = defineStore('tenant-auth', () => {
       captcha_key: captcha?.captchaKey,
       captcha_x: captcha?.captchaX,
       turnstile_token: captcha?.turnstileToken,
-    })
+    }, { _suppressErrorMsg: true } as any)
     if (data.data?.totp_required) {
       return data.data
     }
diff --git a/web/tenant/src/views/auth/LoginPage.vue b/web/tenant/src/views/auth/LoginPage.vue
index abf5540..501c554 100644
--- a/web/tenant/src/views/auth/LoginPage.vue
+++ b/web/tenant/src/views/auth/LoginPage.vue
@@ -367,16 +367,6 @@ async function handleOAuthLogin(provider: string) {
 				<Turnstile v-if="useTurnstile" ref="turnstileRef" v-model="turnstileToken" :site-key="settings['turnstile_site_key']" />
 				<SlideCaptcha v-else ref="captchaRef" v-model="captcha" />
 
-				<!-- Error Message -->
-				<transition name="slide-fade">
-					<div v-if="errorMsg" class="rounded-xl border border-red-200 bg-red-50 px-4 py-3">
-						<div class="flex items-start gap-2">
-							<Icon name="exclamationCircle" size="sm" class="mt-0.5 text-red-500 flex-shrink-0" />
-							<p class="text-sm text-red-600">{{ errorMsg }}</p>
-						</div>
-					</div>
-				</transition>
-
 				<!-- Remember & Forgot -->
 				<div class="flex items-center justify-between">
 					<label class="flex items-center gap-2 cursor-pointer select-none">
@@ -400,6 +390,16 @@ async function handleOAuthLogin(provider: string) {
 					<div v-if="loading" class="spinner h-4 w-4 border-white"></div>
 					{{ loading ? '登录中...' : '登录' }}
 				</button>
+				<!-- Error Message -->
+				<transition name="slide-fade">
+					<div v-if="errorMsg" class="rounded-xl border border-red-200 bg-red-50 px-4 py-3">
+						<div class="flex items-start gap-2">
+							<Icon name="exclamationCircle" size="sm" class="mt-0.5 text-red-500 flex-shrink-0" />
+							<p class="text-sm text-red-600">{{ errorMsg }}</p>
+						</div>
+					</div>
+				</transition>
+
 				<p class="mt-4 text-center text-xs text-gray-400">
 					<button type="button" class="hover:text-gray-500 transition-colors" @click="openAgreement('terms')">服务条款</button>
 					<span class="mx-1">·</span>
@@ -465,16 +465,6 @@ async function handleOAuthLogin(provider: string) {
 				<Turnstile v-if="useTurnstile" ref="turnstileRef" v-model="turnstileToken" :site-key="settings['turnstile_site_key']" />
 				<SlideCaptcha v-else ref="captchaRef" v-model="captcha" />
 
-				<!-- Error Message -->
-				<transition name="slide-fade">
-					<div v-if="errorMsg" class="rounded-xl border border-red-200 bg-red-50 px-4 py-3">
-						<div class="flex items-start gap-2">
-							<Icon name="exclamationCircle" size="sm" class="mt-0.5 text-red-500 flex-shrink-0" />
-							<p class="text-sm text-red-600">{{ errorMsg }}</p>
-						</div>
-					</div>
-				</transition>
-
 				<!-- Remember & Forgot -->
 				<div class="flex items-center justify-between">
 					<label class="flex items-center gap-2 cursor-pointer select-none">
@@ -498,6 +488,16 @@ async function handleOAuthLogin(provider: string) {
 					<div v-if="loading" class="spinner h-4 w-4 border-white"></div>
 					{{ loading ? '登录中...' : '登录' }}
 				</button>
+				<!-- Error Message -->
+				<transition name="slide-fade">
+					<div v-if="errorMsg" class="rounded-xl border border-red-200 bg-red-50 px-4 py-3">
+						<div class="flex items-start gap-2">
+							<Icon name="exclamationCircle" size="sm" class="mt-0.5 text-red-500 flex-shrink-0" />
+							<p class="text-sm text-red-600">{{ errorMsg }}</p>
+						</div>
+					</div>
+				</transition>
+
 				<p class="mt-4 text-center text-xs text-gray-400">
 					<button type="button" class="hover:text-gray-500 transition-colors" @click="openAgreement('terms')">服务条款</button>
 					<span class="mx-1">·</span>