diff --git a/crop-x/src/app/(auth)/login/components/LoginForm.tsx b/crop-x/src/app/(auth)/login/components/LoginForm.tsx index 6af23e1..de69230 100644 --- a/crop-x/src/app/(auth)/login/components/LoginForm.tsx +++ b/crop-x/src/app/(auth)/login/components/LoginForm.tsx @@ -30,7 +30,7 @@ import { useAuth } from '@/components/auth/AuthContext'; import { authReducer, initialAuthState, AuthState, AuthAction } from './authReducer'; import { getCaptchaApiV1AuthCaptchaGet, loginApiV1AuthLoginPost } from '@/lib/api/sdk.gen'; import type { CaptchaResponse } from '@/lib/api/types.gen'; - +import {PERSONAL_CELTRAL_PAGE} from "@/config/constants" interface LoginFormProps { onRegisterClick: () => void; } @@ -150,7 +150,7 @@ export function LoginForm({ onRegisterClick }: LoginFormProps) { login(userData); toast.success('登录成功!正在跳转...'); // 跳转到个人中心页面 - window.location.href = '/central-config/personal-center/personal-info'; + window.location.href = PERSONAL_CELTRAL_PAGE; } else { dispatch({ type: 'SET_ERROR', payload: '登录失败,请检查用户名和密码' }); toast.error('登录失败,请检查用户名和密码'); @@ -279,6 +279,7 @@ export function LoginForm({ onRegisterClick }: LoginFormProps) { value={state.passwordForm.captcha} onChange={(value) => dispatch({ type: 'UPDATE_PASSWORD_FORM', payload: { captcha: value } })} onCaptchaChange={(captchaData) => setPasswordCaptchaData(captchaData)} + instanceId="password-login" className="mt-2" /> @@ -357,6 +358,7 @@ export function LoginForm({ onRegisterClick }: LoginFormProps) { dispatch({ type: 'UPDATE_PHONE_FORM', payload: { captcha: value } })} + instanceId="phone-login" className="mt-2" /> diff --git a/crop-x/src/app/not-found.tsx b/crop-x/src/app/not-found.tsx index ee3e45e..23ca3bb 100644 --- a/crop-x/src/app/not-found.tsx +++ b/crop-x/src/app/not-found.tsx @@ -17,13 +17,9 @@ export default function NotFound() { }; return ( -
- - {/* 主要内容 */} -
- {/* 404 状态卡片 */} - - + +
404
@@ -43,7 +39,7 @@ export default function NotFound() { - + {/* 错误信息提示 */} @@ -100,7 +96,7 @@ export default function NotFound() {
- + {/* 帮助信息 */}

需要帮助?请联系系统管理员

@@ -113,7 +109,5 @@ export default function NotFound() {
-
-
); } \ No newline at end of file diff --git a/crop-x/src/components/auth/ClientAuthInterceptor.tsx b/crop-x/src/components/auth/ClientAuthInterceptor.tsx index 47f27f5..c47545b 100644 --- a/crop-x/src/components/auth/ClientAuthInterceptor.tsx +++ b/crop-x/src/components/auth/ClientAuthInterceptor.tsx @@ -52,11 +52,6 @@ export function ClientAuthInterceptor({ children }: ClientAuthInterceptorProps) return <>{children}; } - // 如果未认证且不在认证页面,显示跳转状态 - if (!isAuthenticated) { - return ; - } - // 认证通过,渲染子组件 return <>{children}; } \ No newline at end of file diff --git a/crop-x/src/components/layouts/SideBar/components/MainContent.tsx b/crop-x/src/components/layouts/SideBar/components/MainContent.tsx index ed8f090..7bbfbaf 100644 --- a/crop-x/src/components/layouts/SideBar/components/MainContent.tsx +++ b/crop-x/src/components/layouts/SideBar/components/MainContent.tsx @@ -63,7 +63,7 @@ export function MainContent({ return (
-
+
{children}
diff --git a/crop-x/src/config/constants.ts b/crop-x/src/config/constants.ts index d97b851..f2f8eff 100644 --- a/crop-x/src/config/constants.ts +++ b/crop-x/src/config/constants.ts @@ -54,4 +54,7 @@ export const THEME = { warning: '#f59e0b', error: '#ef4444' } -} \ No newline at end of file +} + +// 默认有权限的首页 个人中心 +export const PERSONAL_CELTRAL_PAGE = "central-config/personal-center/personal-info" \ No newline at end of file