diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 998c94a4..7045f6c3 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -163,22 +163,17 @@ const UserAPI = { }); }, - /** - * 发送手机/邮箱验证码 - * - * @param contact 联系方式 手机号/邮箱 - * @param contactType 联系方式类型 MOBILE:手机;EMAIL:邮箱 - */ - sendVerificationCode(contact: string, contactType: string) { + /** 发送短信验证码（绑定或更换手机号）*/ + sendMobileCode(mobile: string) { return request({ - url: `${USER_BASE_URL}/send-verification-code`, - method: "get", - params: { contact: contact, contactType: contactType }, + url: `${USER_BASE_URL}/mobile/code`, + method: "post", + params: { mobile: mobile }, }); }, - /** 绑定个人中心用户手机 */ - bindMobile(data: MobileBindingForm) { + /** 绑定或更换手机号 */ + bindOrChangeMobile(data: MobileUpdateForm) { return request({ url: `${USER_BASE_URL}/mobile`, method: "put", @@ -186,8 +181,17 @@ const UserAPI = { }); }, - /** 绑定个人中心用户邮箱 */ - bindEmail(data: EmailBindingForm) { + /** 发送邮箱验证码（绑定或更换邮箱）*/ + sendEmailCode(email: string) { + return request({ + url: `${USER_BASE_URL}/email/code`, + method: "post", + params: { email: email }, + }); + }, + + /** 绑定或更换邮箱 */ + bindOrChangeEmail(data: EmailUpdateForm) { return request({ url: `${USER_BASE_URL}/email`, method: "put", @@ -364,7 +368,7 @@ export interface PasswordChangeForm { } /** 修改手机表单 */ -export interface MobileBindingForm { +export interface MobileUpdateForm { /** 手机号 */ mobile?: string; /** 验证码 */ @@ -372,7 +376,7 @@ export interface MobileBindingForm { } /** 修改邮箱表单 */ -export interface EmailBindingForm { +export interface EmailUpdateForm { /** 邮箱 */ email?: string; /** 验证码 */ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b40c5e6e..84e7784a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -16,7 +16,7 @@
- +

{{ defaultSettings.title }}

@@ -52,7 +52,7 @@ ({ +const loginFormData = ref({ username: "admin", password: "123456", captchaKey: "", @@ -212,7 +212,7 @@ const loginRules = computed(() => { // 获取验证码 function getCaptcha() { AuthAPI.getCaptcha().then((data) => { - loginData.value.captchaKey = data.captchaKey; + loginFormData.value.captchaKey = data.captchaKey; captchaBase64.value = data.captchaBase64; }); } @@ -223,7 +223,7 @@ async function handleLoginSubmit() { if (valid) { loading.value = true; userStore - .login(loginData.value) + .login(loginFormData.value) .then(async () => { await userStore.getUserInfo(); // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常 @@ -281,8 +281,8 @@ function checkCapslock(event: KeyboardEvent) { // 设置登录凭证 const setLoginCredentials = (username: string, password: string) => { - loginData.value.username = username; - loginData.value.password = password; + loginFormData.value.username = username; + loginFormData.value.password = password; }; onMounted(() => { diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue index a231e051..e36f06b3 100644 --- a/src/views/profile/index.vue +++ b/src/views/profile/index.vue @@ -204,21 +204,17 @@ - + - + @@ -230,21 +226,17 @@ - + - + @@ -265,8 +257,8 @@ import UserAPI, { UserProfileVO, PasswordChangeForm, - MobileBindingForm, - EmailBindingForm, + MobileUpdateForm, + EmailUpdateForm, UserProfileForm, } from "@/api/system/user"; @@ -291,8 +283,8 @@ const dialog = reactive({ const userProfileForm = reactive({}); const passwordChangeForm = reactive({}); -const mobileBindingForm = reactive({}); -const emailBindingForm = reactive({}); +const mobileUpdateForm = reactive({}); +const emailUpdateForm = reactive({}); const mobileCountdown = ref(0); const mobileTimer = ref(null); @@ -361,23 +353,24 @@ const handleOpenDialog = (type: DialogType) => { }; /** - * 发送验证码 - * - * @param contactType 联系方式类型 MOBILE: 手机号码 EMAIL: 邮箱 + * 发送手机验证码 */ -const handleSendVerificationCode = async (contactType: string) => { - if (contactType === "MOBILE") { - if (!mobileBindingForm.mobile) { - ElMessage.error("请输入手机号"); - return; - } - // 验证手机号格式 - const reg = /^1[3-9]\d{9}$/; - if (!reg.test(mobileBindingForm.mobile)) { - ElMessage.error("手机号格式不正确"); - return; - } +function handleSendMobileCode() { + if (!mobileUpdateForm.mobile) { + ElMessage.error("请输入手机号"); + return; + } + // 验证手机号格式 + const reg = /^1[3-9]\d{9}$/; + if (!reg.test(mobileUpdateForm.mobile)) { + ElMessage.error("手机号格式不正确"); + return; + } + // 发送短信验证码 + UserAPI.sendMobileCode(mobileUpdateForm.mobile).then(() => { + ElMessage.success("验证码发送成功"); + // 倒计时 60s 重新发送 mobileCountdown.value = 60; mobileTimer.value = setInterval(() => { if (mobileCountdown.value > 0) { @@ -386,18 +379,28 @@ const handleSendVerificationCode = async (contactType: string) => { clearInterval(mobileTimer.value!); } }, 1000); - } else if (contactType === "EMAIL") { - if (!emailBindingForm.email) { - ElMessage.error("请输入邮箱"); - return; - } - // 验证邮箱格式 - const reg = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/; - if (!reg.test(emailBindingForm.email)) { - ElMessage.error("邮箱格式不正确"); - return; - } + }); +} +/** + * 发送邮箱验证码 + */ +function handleSendEmailCode() { + if (!emailUpdateForm.email) { + ElMessage.error("请输入邮箱"); + return; + } + // 验证邮箱格式 + const reg = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/; + if (!reg.test(emailUpdateForm.email)) { + ElMessage.error("邮箱格式不正确"); + return; + } + + // 发送邮箱验证码 + UserAPI.sendEmailCode(emailUpdateForm.email).then(() => { + ElMessage.success("验证码发送成功"); + // 倒计时 60s 重新发送 emailCountdown.value = 60; emailTimer.value = setInterval(() => { if (emailCountdown.value > 0) { @@ -406,8 +409,8 @@ const handleSendVerificationCode = async (contactType: string) => { clearInterval(emailTimer.value!); } }, 1000); - } -}; + }); +} /** * 提交表单 @@ -429,13 +432,13 @@ const handleSubmit = async () => { dialog.visible = false; }); } else if (dialog.type === DialogType.MOBILE) { - UserAPI.bindMobile(mobileBindingForm).then(() => { + UserAPI.bindOrChangeMobile(mobileUpdateForm).then(() => { ElMessage.success("手机号绑定成功"); dialog.visible = false; loadUserProfile(); }); } else if (dialog.type === DialogType.EMAIL) { - UserAPI.bindEmail(emailBindingForm).then(() => { + UserAPI.bindOrChangeEmail(emailUpdateForm).then(() => { ElMessage.success("邮箱绑定成功"); dialog.visible = false; loadUserProfile();