diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts index 3148c1f..e5c2528 100644 --- a/src/i18n/pages/login/zh-cn.ts +++ b/src/i18n/pages/login/zh-cn.ts @@ -9,8 +9,8 @@ export default { two4: '友情链接', }, account: { - accountPlaceholder1: '用户名 admin', - accountPlaceholder2: '密码:123456', + accountPlaceholder1: '请输入用户名', + accountPlaceholder2: '请输入登录密码', accountPlaceholder3: '请输入验证码', accountBtnText: '登 录', }, diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 1033f82..9da6ee8 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -40,9 +40,10 @@ width="100%" height="50px" @handleConfirm="handleVerifyCodeConfirm" + v-if="verifyStatus===2" /> - + - - + + @@ -100,7 +101,7 @@ import { initBackEndControlRoutes } from '/@/router/backEnd'; import { Session } from '/@/utils/storage'; import { formatAxis } from '/@/utils/formatTime'; import { NextLoading } from '/@/utils/loading'; -import {login} from "/@/api/login"; +import {captcha, login} from "/@/api/login"; import GoCaptchaBtn from "/@/components/goCaptcha/GoCaptchaBtn.vue"; export default defineComponent({ name: 'loginAccount', @@ -114,6 +115,7 @@ export default defineComponent({ const router = useRouter(); const loginForm = ref(null) const checkCaptchaResult = ref('default') + const verifyStatus = ref(0) const state = reactive({ isShowPassword: false, ruleForm: { @@ -128,8 +130,7 @@ export default defineComponent({ ], password: [ { required: true, trigger: "blur", message: "密码不能为空" } - ], - verifyCode: [{ required: true, trigger: "blur", message: "请先进行人机验证" }] + ] }, loading: { signIn: false, @@ -141,10 +142,11 @@ export default defineComponent({ }); const getCaptcha = () => { // 验证码V1版 - // captcha().then((res:any)=>{ - // state.captchaSrc = res.data.img - // state.ruleForm.verifyKey = res.data.key - // }) + captcha().then((res:any)=>{ + state.captchaSrc = res.data.img + state.ruleForm.verifyKey = res.data.key + verifyStatus.value = res.data.verifyStatus + }) }; // 时间获取 const currentTime = computed(() => { @@ -190,7 +192,7 @@ export default defineComponent({ state.ruleForm.verifyCode = '' checkCaptchaResult.value = 'default' // 验证码V1版 - //getCaptcha(); + getCaptcha(); }) } }) @@ -229,6 +231,7 @@ export default defineComponent({ checkCaptchaResult, handleVerifyCodeConfirm, loginForm, + verifyStatus, ...toRefs(state), }; },