jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
This commit is contained in:
疯狂的狮子li
2021-07-13 13:34:10 +08:00
parent 79965e30af 7b894da43c
commit fd5414f82e
8 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-ui/src/views/login.vue
View File

@ -18,7 +18,7 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
<el-form-item prop="code" v-if="captchaOnOff">
<el-input
v-model="loginForm.code"
auto-complete="off"
@ -81,8 +81,8 @@ export default {
code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
},
loading: false,
redirect: undefined,
captchaEnabled:false
captchaOnOff: true,
redirect: undefined
};
},
watch: {
@ -100,8 +100,8 @@ export default {
methods: {
getCode() {
getCodeImg().then(res => {
this.captchaEnabled = res.data.enabled;
if(res.data.enabled){
this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
if (this.captchaOnOff) {
this.codeUrl = "data:image/gif;base64," + res.data.img;
this.loginForm.uuid = res.data.uuid;
}
@ -134,7 +134,9 @@ export default {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
this.loading = false;
this.getCode();
if (this.captchaOnOff) {
this.getCode();
}
});
}
});