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

# Conflicts: # src/main/webapp/WEB-INF/manager/login.ftl
7 years ago · 14b4eefd10
parent 42fb675a05 fa9020e2ab
commit 14b4eefd10
3 changed files with 445 additions and 432 deletions
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@ -2,12 +2,14 @@
 <html>
   <head>
      <title></title>
-      <!-- <#include "/include/head-file.ftl"/> -->
-     <!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/index.css"> -->
+      <#include "/include/head-file.ftl"/>
+      <#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="./reset-password.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>
   <body>
@ -174,7 +176,7 @@
        // 菜单列表
        list:function(){
            var that = this;
-            ms.http.get(ms.manager + "/model/list.do")
+            ms.http.post(ms.manager + "/model/list.do")
                .then((data)=>{
                    that.menuList = data.rows
                }, (err) => {
@ -242,6 +244,7 @@
         	ms.http.get(ms.manager + "/basic/manager/get.do")
               .then((data)=>{
                   that.peopleInfo = data
+                   resetPasswordVue.resetPasswordForm.managerName = that.peopleInfo.managerName
               }, (err) => {
                   that.$message.error(err);
               })	
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@ -54,11 +54,12 @@
         loginForm: {
            managerName: '',
            managerPassword: "",
-            rand_code: '',
+            rand_code: ''
         },
         verifCode: ms.manager + "/code?t=" + new Date().getTime(),
         rememberPass: '',
         loginFormRule: {
+
            managerName: [{
                  required: true,
                  message: '请输入用户名',
@ -129,4 +130,5 @@
         this.verifCode = ms.manager + "/code?t=" + new Date().getTime()
      }
   })
+
 </script>
--- a/src/main/webapp/WEB-INF/manager/reset-password.ftl
+++ b/src/main/webapp/WEB-INF/manager/reset-password.ftl
@ -14,7 +14,7 @@
            </el-form>
            <div slot="footer" class="dialog-footer">
                <el-button @click="isShow = false">取 消</el-button>
-                <el-button type="primary" @click="update">更新密码</el-button>
+                <el-button type="primary" @click="updatePassword">更新密码</el-button>
            </div>
    </el-dialog>
 </div>
@ -27,13 +27,21 @@
            resetPasswordForm: {
                managerName: '',
                oldManagerPassword: '',
-                newManagerPassword: "",
+                newManagerPassword: '',
            }
        },
        methods: {
            // 更新密码
-            update: function () {
-                isShow = false
+            updatePassword: function () {
+            	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);
+               })	
            }
        }
    })