diff --git a/apps/web-antd/src/locales/langs/zh-CN/page.json b/apps/web-antd/src/locales/langs/zh-CN/page.json index 85fa1597..4cb67081 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -1,9 +1,9 @@ { "auth": { - "login": "登陆", + "login": "登录", "register": "注册", - "codeLogin": "验证码登陆", - "qrcodeLogin": "二维码登陆", + "codeLogin": "验证码登录", + "qrcodeLogin": "二维码登录", "forgetPassword": "忘记密码" }, "dashboard": { diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts index 87ee0cc4..9d64d205 100644 --- a/apps/web-antd/src/store/auth.ts +++ b/apps/web-antd/src/store/auth.ts @@ -1,5 +1,4 @@ -import type { LoginAndRegisterParams } from '@vben/common-ui'; -import type { UserInfo } from '@vben/types'; +import type { Recordable, UserInfo } from '@vben/types'; import { ref } from 'vue'; import { useRouter } from 'vue-router'; @@ -26,7 +25,7 @@ export const useAuthStore = defineStore('auth', () => { * @param params 登录表单数据 */ async function authLogin( - params: LoginAndRegisterParams, + params: Recordable, onSuccess?: () => Promise | void, ) { // 异步处理用户登录操作并获取 accessToken @@ -84,7 +83,7 @@ export const useAuthStore = defineStore('auth', () => { resetAllStores(); accessStore.setLoginExpired(false); - // 回登陆页带上当前路由地址 + // 回登录页带上当前路由地址 await router.replace({ path: LOGIN_PATH, query: redirect diff --git a/apps/web-antd/src/views/_core/authentication/code-login.vue b/apps/web-antd/src/views/_core/authentication/code-login.vue index 03cf5502..556b273a 100644 --- a/apps/web-antd/src/views/_core/authentication/code-login.vue +++ b/apps/web-antd/src/views/_core/authentication/code-login.vue @@ -1,5 +1,6 @@