Pre Merge pull request !20 from joy/dev

This commit is contained in:
joy
2020-05-19 11:39:12 +08:00
committed by Gitee
9 changed files with 20 additions and 36 deletions

View File

@ -1,8 +1,8 @@
{
"name": "ruoyi",
"version": "2.2.0",
"description": "若依管理系统",
"author": "若依",
"description": "AoLetter管理系统",
"author": "AoLetter",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 KiB

After

Width:  |  Height:  |  Size: 132 KiB

View File

@ -26,7 +26,7 @@ export default {
},
data() {
return {
title: '若依管理系统',
title: 'AoLetter管理系统',
logo: logoImg
}
}

View File

@ -1,5 +1,5 @@
module.exports = {
title: '若依管理系统',
title: 'AoLetter管理系统',
/**
* 是否系统布局配置

View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">若依后台管理系统</h3>
<h3 class="title">AoLetter管理系统</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@ -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">
<!-- <el-form-item prop="code">
<el-input
v-model="loginForm.code"
auto-complete="off"
@ -31,7 +31,7 @@
<div class="login-code">
<img :src="codeUrl" @click="getCode" />
</div>
</el-form-item>
</el-form-item> -->
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-button
@ -48,7 +48,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2019 ruoyi.vip All Rights Reserved.</span>
<span>Copyright © 2019-2020 AoLetter All Rights Reserved.</span>
</div>
</div>
</template>
@ -77,8 +77,8 @@ export default {
],
password: [
{ required: true, trigger: "blur", message: "密码不能为空" }
],
code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
]
// code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
},
loading: false,
redirect: undefined