diff --git a/src/pages/components/DeleteUser.tsx b/src/pages/components/DeleteUser.tsx index 65bf4b8..595ea30 100644 --- a/src/pages/components/DeleteUser.tsx +++ b/src/pages/components/DeleteUser.tsx @@ -31,9 +31,9 @@ export function DeleteUser() { verifyCode: '', token: '', }, - validateOnChange: false, validationSchema: yup.object({ verifyCode: yup.verifyCodeSchema, + password: yup.string().required('请输入密码'), }), onSubmit: async (values) => { await api.user.deleteUser(values) @@ -62,6 +62,7 @@ export function DeleteUser() { + 删除用户 - - - + + + + + - + + + + - @@ -127,16 +129,18 @@ export function DeleteUser() { + + {/* 二次确认对话框 */} 确定删除? - + 该用户的所有数据将被不可逆地抹除! - diff --git a/src/pages/forget-password.tsx b/src/pages/forget-password.tsx index 52d2694..d992c52 100644 --- a/src/pages/forget-password.tsx +++ b/src/pages/forget-password.tsx @@ -3,7 +3,6 @@ import Button from '@mui/material/Button' import TextField from '@mui/material/TextField' import Link from '@mui/material/Link' import Grid from '@mui/material/Unstable_Grid2' -import Box from '@mui/material/Box' import KeyIcon from '@mui/icons-material/Key' import Typography from '@mui/material/Typography' import Container from '@mui/material/Container' @@ -28,7 +27,6 @@ export default function ForgetPassword() { token: '', userId: '', }, - validateOnChange: false, validationSchema: yup.object({ email: yup.emailSchema, password: yup.passwordSchema, @@ -46,7 +44,6 @@ export default function ForgetPassword() { async function sendVerifyCode() { await formik.validateField('email') - if (formik.errors.email) return setCountdown(COUNTDOWN_SECONDS) try { const res = await api.email.sendEmailVerifyCode({ @@ -61,27 +58,29 @@ export default function ForgetPassword() { } return ( - - + + + + + 找回密码 + + - - - - - 找回密码 - - + - - - - - - - - + + + + + + + + - - - - 登录 - - - - + + + 登录 + + ) } diff --git a/src/pages/login.tsx b/src/pages/login.tsx index 99e9162..8989064 100644 --- a/src/pages/login.tsx +++ b/src/pages/login.tsx @@ -2,7 +2,7 @@ import Avatar from '@mui/material/Avatar' import Button from '@mui/material/Button' import TextField from '@mui/material/TextField' import Link from '@mui/material/Link' -import Grid from '@mui/material/Grid' +import Grid from '@mui/material/Unstable_Grid2' import Box from '@mui/material/Box' import LoginIcon from '@mui/icons-material/Login' import Typography from '@mui/material/Typography' @@ -20,10 +20,9 @@ export default function Login() { email: '', password: '', }, - validateOnChange: false, validationSchema: yup.object({ email: yup.emailSchema, - // password: yup.passwordSchema, + password: yup.string().required('请输入密码'), }), onSubmit: async (values) => { const res = await api.user.login(values) @@ -34,68 +33,63 @@ export default function Login() { }) return ( - - - - - - - 登录 - - + + + + + 登录 + + + - - - - - - - 忘记密码? - - - - - 没有账号? - - 注册 - + /> + + + + + + 忘记密码? + - + + + 没有账号? + + 注册 + + ) diff --git a/src/pages/register.tsx b/src/pages/register.tsx index da29533..f8c55f9 100644 --- a/src/pages/register.tsx +++ b/src/pages/register.tsx @@ -3,7 +3,6 @@ import Button from '@mui/material/Button' import TextField from '@mui/material/TextField' import Link from '@mui/material/Link' import Grid from '@mui/material/Unstable_Grid2' -import Box from '@mui/material/Box' import AppRegistrationIcon from '@mui/icons-material/AppRegistration' import Typography from '@mui/material/Typography' import Container from '@mui/material/Container' @@ -26,7 +25,6 @@ export default function Register() { verifyCode: '', token: '', }, - validateOnChange: false, validationSchema: yup.object({ email: yup.emailSchema, password: yup.passwordSchema, @@ -42,7 +40,6 @@ export default function Register() { async function sendVerifyCode() { await formik.validateField('email') - if (formik.errors.email) return setCountdown(COUNTDOWN_SECONDS) try { const res = await api.email.sendEmailVerifyCode({ @@ -56,27 +53,29 @@ export default function Register() { } return ( - - + + + + + 注册 + + - - - - - 注册 - - + - - - - - - - - + + + + + + + + - - - - - 已有账号? - - 登录 - + + + + + 已有账号? + + 登录 - - + + ) }