Skip to content
GitLab
Commit 14b4eefd authored by ms-dev's avatar ms-dev
Browse files

Merge branch '4.7.0' of https://gitee.com/tianbinjie/MCMS into 4.7.0 

# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
parents 42fb675a fa9020e2
Expand all Hide whitespace changes
Inline Side-by-side
src/main/webapp/WEB-INF/manager/index.ftl
View file @ 14b4eefd
This diff is collapsed.
src/main/webapp/WEB-INF/manager/login.ftl
View file @ 14b4eefd
<!DOCTYPE html> <!DOCTYPE html>
<html lang=""> <html lang="">
<head> <head>
<title></title> <title></title>
<!-- <#include "/include/head-file.ftl"/> --> <!-- <#include "/include/head-file.ftl"/> -->
<!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> --> <!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> -->
<!--#include virtual="include/head-file.ftl" --> <!--#include virtual="include/head-file.ftl" -->
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css"> <link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/login.css">
</head> </head>
<body> <body>
<div id="login" class="login"> <div id="login" class="login">
<el-container class="ms-admin-login-container"> <el-container class="ms-admin-login-container">
<el-main class="ms-admin-login-main"> <el-main class="ms-admin-login-main">
<div class="ms-admin-login-warp"> <div class="ms-admin-login-warp">
<img :src="ms.base+'/static/ms-admin/4.7.0/images/login-slogn.png'"> <img :src="ms.base+'/static/ms-admin/4.7.0/images/login-slogn.png'">
<el-form :model="loginForm" status-icon :rules="loginFormRule" ref="loginForm" label-width="100px" class="ms-admin-login-form"> <el-form :model="loginForm" status-icon :rules="loginFormRule" ref="loginForm" label-width="100px" class="ms-admin-login-form">
<h1> <h1>
<span>账户登录 / </span>User login</h1> <span>账户登录 / </span>User login</h1>
<el-form-item prop="name" class="ms-admin-form-item"> <el-form-item prop="name" class="ms-admin-form-item">
<el-input type="text" placeholder='用户名' v-model="loginForm.managerName" autocomplete="off"></el-input> <el-input type="text" placeholder='用户名' v-model="loginForm.managerName" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="pass" class="ms-admin-form-item"> <el-form-item prop="pass" class="ms-admin-form-item">
<el-input type="password" placeholder='密码' v-model="loginForm.managerPassword" autocomplete="off"></el-input> <el-input type="password" placeholder='密码' v-model="loginForm.managerPassword" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" class="ms-admin-form-item ms-admin-form-item-code"> <el-form-item prop="code" class="ms-admin-form-item ms-admin-form-item-code">
<el-input type="text" placeholder='验证码' v-model="loginForm.rand_code" autocomplete="off"></el-input> <el-input type="text" placeholder='验证码' v-model="loginForm.rand_code" autocomplete="off"></el-input>
<img :src="verifCode" class="code-img" @click="code" /> <img :src="verifCode" class="code-img" @click="code" />
<p> <p>
<span>看不清?</span> <span>看不清?</span>
<span @click="code">换一张</span> <span @click="code">换一张</span>
</p> </p>
</el-form-item> </el-form-item>
<el-form-item class="ms-admin-form-item ms-admin-form-item-checkout"> <el-form-item class="ms-admin-form-item ms-admin-form-item-checkout">
<el-checkbox v-model="rememberPass">记住密码</el-checkbox> <el-checkbox v-model="rememberPass">记住密码</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item class="ms-admin-form-item"> <el-form-item class="ms-admin-form-item">
<el-button type="primary" @click="checkLogin" class="ms-admin-login-btn">登录</el-button> <el-button type="primary" @click="checkLogin" class="ms-admin-login-btn">登录</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</el-main> </el-main>
</el-container> </el-container>
</div> </div>
</body> </body>
</html> </html>
<script> <script>
var loginVue = new Vue({ var loginVue = new Vue({
el: '#login', el: '#login',
data: { data: {
loginForm: { loginForm: {
managerName: '', managerName: '',
managerPassword: "", managerPassword: "",
rand_code: '', rand_code: ''
}, },
verifCode: ms.manager + "/code?t=" + new Date().getTime(), verifCode: ms.manager + "/code?t=" + new Date().getTime(),
rememberPass: '', rememberPass: '',
loginFormRule: { loginFormRule: {
managerName: [{
required: true, managerName: [{
message: '请输入用户名', required: true,
trigger: 'blur' message: '请输入用户名',
}, trigger: 'blur'
{ },
min: 3, {
max: 6, min: 3,
message: '长度在 3 到 5 个字符', max: 6,
trigger: 'blur' message: '长度在 3 到 5 个字符',
} trigger: 'blur'
], }
managerPassword: [{ ],
required: true, managerPassword: [{
message: '请输入密码', required: true,
trigger: 'blur' message: '请输入密码',
}, trigger: 'blur'
{ },
min: 6, {
max: 20, min: 6,
message: '长度在 6 到 20 个字符', max: 20,
trigger: 'blur' message: '长度在 6 到 20 个字符',
} trigger: 'blur'
], }
rand_code: [{ ],
required: true, rand_code: [{
message: '请填写验证码', required: true,
trigger: 'blur' message: '请填写验证码',
}, trigger: 'blur'
{ },
min: 1, {
max: 4, min: 1,
message: '长度在1 到 4 个字符', max: 4,
trigger: 'blur' message: '长度在1 到 4 个字符',
} trigger: 'blur'
], }
} ],
}, }
methods: { },
// 登录 methods: {
checkLogin: function() { // 登录
var that = this; checkLogin: function() {
ms.http.post(ms.manager + "/checkLogin.do", that.loginForm).then(function(data) { var that = this;
if(data.result) { ms.http.post(ms.manager + "/checkLogin.do", that.loginForm).then(function(data) {
that.$notify({ if(data.result) {
title: '成功', that.$notify({
message: '登录成功', title: '成功',
type: 'success' message: '登录成功',
}); type: 'success'
location.href = ms.manager + "/index.do"; });
} else { location.href = ms.manager + "/index.do";
that.$notify({ } else {
title: '失败', that.$notify({
message: data.resultMsg, title: '失败',
type: 'warning' message: data.resultMsg,
}); type: 'warning'
} });
}, (err) => { }
that.$message.error(data.resultMsg); }, (err) => {
}) that.$message.error(data.resultMsg);
}, })
code: function() { },
this.verifCode = ms.manager + "/code?t=" + new Date().getTime(); code: function() {
}, this.verifCode = ms.manager + "/code?t=" + new Date().getTime();
},
},
mounted: function() { },
this.verifCode = ms.manager + "/code?t=" + new Date().getTime() mounted: function() {
} this.verifCode = ms.manager + "/code?t=" + new Date().getTime()
}) }
})
</script> </script>
\ No newline at end of file
src/main/webapp/WEB-INF/manager/reset-password.ftl
View file @ 14b4eefd
<!-- 修改密码 --> <!-- 修改密码 -->
<div id="reset-password" class="reset-password"> <div id="reset-password" class="reset-password">
<el-dialog title="修改密码" :visible.sync="isShow"> <el-dialog title="修改密码" :visible.sync="isShow">
<el-form :model="resetPasswordForm" label-width='80px'> <el-form :model="resetPasswordForm" label-width='80px'>
<el-form-item label="账号"> <el-form-item label="账号">
<el-input v-model="resetPasswordForm.managerName" autocomplete="off" readonly disabled></el-input> <el-input v-model="resetPasswordForm.managerName" autocomplete="off" readonly disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="旧密码"> <el-form-item label="旧密码">
<el-input v-model="resetPasswordForm.oldManagerPassword" autocomplete="off"></el-input> <el-input v-model="resetPasswordForm.oldManagerPassword" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码"> <el-form-item label="新密码">
<el-input v-model="resetPasswordForm.newManagerPassword" autocomplete="off"></el-input> <el-input v-model="resetPasswordForm.newManagerPassword" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="isShow = false">取 消</el-button> <el-button @click="isShow = false">取 消</el-button>
<el-button type="primary" @click="update">更新密码</el-button> <el-button type="primary" @click="updatePassword">更新密码</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
<script> <script>
var resetPasswordVue = new Vue({ var resetPasswordVue = new Vue({
el: '#reset-password', el: '#reset-password',
data: { data: {
// 模态框的显示 // 模态框的显示
isShow: false, isShow: false,
resetPasswordForm: { resetPasswordForm: {
managerName: '', managerName: '',
oldManagerPassword: '', oldManagerPassword: '',
newManagerPassword: "", newManagerPassword: '',
} }
}, },
methods: { methods: {
// 更新密码 // 更新密码
update: function () { updatePassword: function () {
isShow = false var that = this;
} ms.http.post(ms.manager + "/updatePassword.do",that.resetPasswordForm)
} .then((data)=>{
}) that.resetPasswordForm.oldManagerPassword = '';
that.resetPasswordForm.newManagerPassword = '';
that.isShow = false;
}, (err) => {
that.$message.error(err);
})
}
}
})
</script> </script>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment