sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
master
ms-dev 7 years ago
parent 42fb675a05 fa9020e2ab
commit 14b4eefd10
3 changed files with 445 additions and 432 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/main/webapp/WEB-INF/manager/index.ftl
  2. 4
      src/main/webapp/WEB-INF/manager/login.ftl
  3. 16
      src/main/webapp/WEB-INF/manager/reset-password.ftl

11
src/main/webapp/WEB-INF/manager/index.ftl
Unescape View File

@ -2,12 +2,14 @@
<html> <html>
<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/index.css"> --> <#include "/reset-password.ftl"/>
<#include "/exit-system.ftl"/>
<link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css">
<!--#include virtual="include/head-file.ftl" --> <!--#include virtual="include/head-file.ftl" -->
<!--#include virtual="./reset-password.ftl" --> <!--#include virtual="./reset-password.ftl" -->
<!--#include virtual="./exit-system.ftl" --> <!--#include virtual="./exit-system.ftl" -->
<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css"> <!--<link rel="stylesheet" href="../../../static/ms-admin/4.7.0/css/index.css">-->
</head> </head>
<body> <body>
@ -174,7 +176,7 @@
// 菜单列表 // 菜单列表
list:function(){ list:function(){
var that = this; var that = this;
ms.http.get(ms.manager + "/model/list.do") ms.http.post(ms.manager + "/model/list.do")
.then((data)=>{ .then((data)=>{
that.menuList = data.rows that.menuList = data.rows
}, (err) => { }, (err) => {
@ -242,6 +244,7 @@
ms.http.get(ms.manager + "/basic/manager/get.do") ms.http.get(ms.manager + "/basic/manager/get.do")
.then((data)=>{ .then((data)=>{
that.peopleInfo = data that.peopleInfo = data
resetPasswordVue.resetPasswordForm.managerName = that.peopleInfo.managerName
}, (err) => { }, (err) => {
that.$message.error(err); that.$message.error(err);
}) })

4
src/main/webapp/WEB-INF/manager/login.ftl
Unescape View File

@ -54,11 +54,12 @@
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: [{ managerName: [{
required: true, required: true,
message: '请输入用户名', message: '请输入用户名',
@ -129,4 +130,5 @@
this.verifCode = ms.manager + "/code?t=" + new Date().getTime() this.verifCode = ms.manager + "/code?t=" + new Date().getTime()
} }
}) })
</script> </script>

16
src/main/webapp/WEB-INF/manager/reset-password.ftl
Unescape View File

@ -14,7 +14,7 @@
</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>
@ -27,13 +27,21 @@
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);
})
} }
} }
}) })

Write Preview
Loading…
Cancel
Save