diff --git a/src/locales/en.ts b/src/locales/en.ts index f166e16..7e51fd3 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -86,12 +86,15 @@ export default { message: 'Backstage management system', username: 'Username', password: 'Password', + register: 'Register', + checkPassword: 'Confirm password', login: 'Sign in', otherLogin: 'Sign in with', remember: 'Remember me', + hasUser: 'Existing account? Go to login', forgetPassword: 'Forget password', - usernamePlaceholder: 'username is admin or test', - passwordPlaceholder: 'password is admin or test' + usernamePlaceholder: 'Please input username', + passwordPlaceholder: 'Please input password' }, router: { login: 'Login', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index f1f9e1f..e7fb40a 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -86,12 +86,15 @@ export default { message: '开箱即用的中后台管理系统', username: '用户名', password: '密码', + register: '注册', + checkPassword: '确认密码', login: '登录', otherLogin: '其他登录方式', remember: '记住我', + hasUser: '已有账号?去登录', forgetPassword: '忘记密码', - usernamePlaceholder: '用户名为 admin 或者 test ', - passwordPlaceholder: '密码为 admin 或者 test ' + usernamePlaceholder: '请输入用户名', + passwordPlaceholder: '请输入密码' }, router: { login: '登录', diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index c89089f..12ba80d 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,11 +1,12 @@ @@ -59,7 +70,16 @@ const { t } = useI18n() - + + diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 525df8e..b8e08ce 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -13,6 +13,8 @@ import { usePermissionStore } from '@/store/modules/permission' import { useRouter } from 'vue-router' import type { RouteLocationNormalizedLoaded, RouteRecordRaw } from 'vue-router' +const emit = defineEmits(['to-register']) + const appStore = useAppStore() const permissionStore = usePermissionStore() @@ -162,6 +164,11 @@ const getRole = async () => { push({ path: redirect.value || permissionStore.addRouters[0].path }) } } + +// 去注册页面 +const toRegister = () => { + emit('to-register') +} @@ -186,9 +193,16 @@ const getRole = async () => { - - {{ t('login.login') }} - + + + {{ t('login.login') }} + + + + + {{ t('login.register') }} + + diff --git a/src/views/Login/components/RegisterForm.vue b/src/views/Login/components/RegisterForm.vue new file mode 100644 index 0000000..83afd65 --- /dev/null +++ b/src/views/Login/components/RegisterForm.vue @@ -0,0 +1,109 @@ + + + + + + {{ t('login.register') }} + + + + + + {{ t('login.register') }} + + + + + {{ t('login.hasUser') }} + + + + + diff --git a/src/views/Login/components/index.ts b/src/views/Login/components/index.ts index aee8f27..d08be96 100644 --- a/src/views/Login/components/index.ts +++ b/src/views/Login/components/index.ts @@ -1,3 +1,4 @@ import LoginForm from './LoginForm.vue' +import RegisterForm from './RegisterForm.vue' -export { LoginForm } +export { LoginForm, RegisterForm }