

































diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 3fe822c..ecdfd9e 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -201,7 +201,7 @@ const transform: AxiosTransform = { // eslint-disable-next-line ts/no-use-before-define const instance = http.getAxios() const config = response.config - const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token'] + const whitelist = ['/api/captcha/captchatoken', '/api/captcha/captchaImage', '/api/backstage/adminlogin', '/api/oauthweb/token','/api/web/smslogin/login'] const expirationTime = storage.get(TOKEN_EXPIRATION_TIME) // console.log('剩余失效时间(分):', (expirationTime - Date.now()) / 1000 / 60, config.url) diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index 99a1097..afdec29 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -54,7 +54,23 @@ const rules = { enterprisecode: { required: true, message: "请输入企业编码", trigger: "blur" }, agentcode: { required: true, message: "请输入企业编码", trigger: "blur" }, phone: { required: true, message: "请输入手机号", trigger: "blur" }, - phonecode: { required: true, message: "请输入验证码", trigger: "blur" }, + phonecode: [ + { required: true, message: "请输入验证码", trigger: "blur" }, + { + trigger: ["blur"], + level: "error", + validator(_rule, value) { + if (value.length < 4 && value.length > 0) { + return new Error("请正确填写4位手机短信验证码"); + } + if (loginSuccess.value) { + return true; + } else { + return new Error("验证码错误"); + } + }, + }, + ], username: { required: true, message: "请输入用户名", trigger: "blur" }, password: { required: true, message: "请输入密码", trigger: "blur" }, captcha: { required: true, message: "请输入验证码", trigger: "blur" }, @@ -114,6 +130,7 @@ function handleSmsSubmit(e) { }); const { code, message: msg } = res; if (code === ResultEnum.SUCCESS) { + loginSuccess.value = true; // const { code, message: msg } = await userStore.login(params) await userStore.getInformation(); @@ -125,7 +142,10 @@ function handleSmsSubmit(e) { } else { message.destroyAll(); message.info(msg || "登录失败"); + loginSuccess.value = false; } + } + catch(e){ } finally { loading.value = false; } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a71842c..f351a77 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,18 +1,18 @@ @@ -20,87 +20,59 @@ function close() {