diff --git a/src/apis/login.js b/src/apis/login.js index 67b146f..d5d19ec 100644 --- a/src/apis/login.js +++ b/src/apis/login.js @@ -15,6 +15,35 @@ export function register(data) { }) } +/** + * @description 登录 + * @params email,password,code + * @returns data + */ +export function login(data) { + return request({ + url: `/api/user/loginByEmail`, + method: 'post', + data + }) +} + +/** +/** + * @description:重新发送邮件 + * @param {string} data + * @return: data + */ +export function sendRegisterEmail(email) { + return request({ + url: `/api/user/sendRegisterEmail`, + method: 'post', + data: { + email + } + }) +} + /** * @description:获取图形验证码 * @return: 验证码地址 diff --git a/src/apis/signSucceed.js b/src/apis/signSucceed.js new file mode 100644 index 0000000..2cc4f28 --- /dev/null +++ b/src/apis/signSucceed.js @@ -0,0 +1,16 @@ +import request from "@/utils/request.js"; + +/** + * @description 通过ticket激活账户 + * @params ticket + * @returns data + */ +export function activateByTicket(ticket) { + return request({ + url: `/api/user/doActivation`, + method: 'post', + data: { + ticket + } + }) +} \ No newline at end of file diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts index 638ae1a..f95a529 100644 --- a/src/lang/package/en.ts +++ b/src/lang/package/en.ts @@ -9,7 +9,9 @@ export default { login: { title: "Metavatar-PC", username: "Username", + email: "E-mail", password: "Password", + confirmPassword: "Confirm Password", login: "Sign in", register: "Sign up", loginBtn: "Sign in", @@ -84,6 +86,15 @@ export default { Alipay: "Alipay", }, signSucceed: { - title: "Sign Succeed !", + title: "Confirm your email", + succeed: "Sign Succeed !", + welcome: "Welcome to Metavatar !", + createSuccess: + "Your account has been created successfully. Enjoy yourself !", + expired: + "Your ticket is expired. You can click the button to resend new email then", + sendSuccess: "The email has been resent, you can check it now", + goLogin: "Login Now", + reSend: "Resend", }, }; diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts index b6b34a5..4493c34 100644 --- a/src/lang/package/zh-cn.ts +++ b/src/lang/package/zh-cn.ts @@ -9,7 +9,9 @@ export default { login: { title: "Metavatar-PC", username: "用户名", + email: "电子邮件", password: "密码", + confirmPassword: "确认密码", login: "登录", register: "注册", loginBtn: "登 录", @@ -84,6 +86,14 @@ export default { Alipay: "支付宝支付", }, signSucceed: { - title: "注册成功!", + title: "确认邮箱", + succeed: "注册成功", + welcome: "欢迎加入Metavatar!", + createSuccess: "您的账户已成功创建", + expired: + "您的通行密钥已过期。稍后,您可以点击下面的按钮重新发送一封新的邮件。", + sendSuccess: "您的邮件已重新发送,请注意查收。", + goLogin: "即将登录", + reSend: "重新发送", }, }; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index fb5fb08..e9ba6af 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -124,14 +124,7 @@ function logout() { cancelButtonText: cancel, }).then(() => { router.push(`/login`); - // userStore - // .logout() - // .then(() => { - // tagsViewStore.delAllViews(); - // }) - // .then(() => { - // router.push(`/login?redirect=${route.fullPath}`); - // }); + localStorage.removeItem("AccessToken"); }); } diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 3b6c7b6..06afedc 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -95,7 +95,7 @@ watch( route, () => { addTags(); - moveToCurrentTag(); + // moveToCurrentTag(); }, { //初始化立即执行 diff --git a/src/layout/index.vue b/src/layout/index.vue index b9d8d52..e2d439a 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,5 +1,5 @@