diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue index 94aa1517..d7178fd8 100644 --- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue @@ -102,7 +102,7 @@ let formRules = ref({}) const emailValidCodeReqNo = ref('') - // 点击获取短信验证码 + // 点击获取邮箱验证码 const getEmailValidCode = () => { formRules.value.email = [required(), rules.email] delete formRules.value.emailValidCode @@ -144,7 +144,6 @@ const emailLoginFormModalRef = ref() const emailFormModalData = ref({}) const validCodeBase64 = ref('') - const validCodeReqNo = ref('') const formModalRules = { validCode: [required(), rules.lettersNum] } @@ -158,10 +157,10 @@ visible.value = false } const handleOk = () => { - // 获取到里面的验证码,并发送短信 + // 获取到里面的验证码,并发送邮箱 emailLoginFormModalRef.value.validate().then(() => { visible.value = false - // 发送短信,首先拿到刚刚输入的手机号 + // 发送邮箱,首先拿到刚刚输入的邮箱 emailFormModalData.value.email = emailFormData.value.email // 禁用发送按钮,并设置为倒计时 state.value.smsSendBtn = true @@ -180,13 +179,15 @@ emailValidCodeReqNo.value = data visible.value = false setTimeout(hide, 500) - emailFormModalData.value.validCode = '' }) .catch(() => { setTimeout(hide, 100) clearInterval(interval) state.value.smsSendBtn = false }) + .finally(() => { + emailFormModalData.value.validCode = '' + }) }) } diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue index 194fd253..406f98f6 100644 --- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue @@ -145,7 +145,6 @@ const phoneLoginFormModalRef = ref() const phoneFormModalData = ref({}) const validCodeBase64 = ref('') - const validCodeReqNo = ref('') const formModalRules = { validCode: [required(), rules.lettersNum] } @@ -181,13 +180,15 @@ phoneValidCodeReqNo.value = data visible.value = false setTimeout(hide, 500) - phoneFormModalData.value.validCode = '' }) .catch(() => { setTimeout(hide, 100) clearInterval(interval) state.value.smsSendBtn = false }) + .finally(() => { + phoneFormModalData.value.validCode = '' + }) }) } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java index 86f2fe9b..e0057bdf 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java @@ -74,7 +74,7 @@ public class SysUserCenterController { @ApiOperation("找回密码获取手机验证码") @GetMapping("/sys/userCenter/findPasswordGetPhoneValidCode") public CommonResult findPasswordGetPhoneValidCode(@Valid SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) { - return CommonResult.ok(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam)); + return CommonResult.data(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam)); } /** @@ -87,7 +87,7 @@ public class SysUserCenterController { @ApiOperation("找回密码获取邮箱验证码") @GetMapping("/sys/userCenter/findPasswordGetEmailValidCode") public CommonResult findPasswordGetEmailValidCode(@Valid SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) { - return CommonResult.ok(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam)); + return CommonResult.data(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam)); } /**