diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index bffcf4ad..af60e3ce 100644
--- 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);
                })	
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index 83af8897..9f08f962 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -3,15 +3,15 @@
 
 <head>
     <title></title>
-    <!-- <#include "/include/head-file.ftl"/> -->
-    <!-- <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css"> -->
+    <#include "/include/head-file.ftl"/>
+    <link rel="stylesheet" href="${base}/static/ms-admin/4.7.0/css/login.css">
     
     <!--#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>
 
 <body>
-    <div id="login" class="login">
+    <div id="login" class="login" @keydown.enter="checkLogin">
         <el-container class="ms-admin-login-container">
             <el-main class="ms-admin-login-main">
                 <div class="ms-admin-login-warp">
@@ -33,7 +33,7 @@
                             <el-checkbox v-model="rememberPass">记住密码</el-checkbox>
                         </el-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>
                 </div>
@@ -52,7 +52,7 @@ var loginVue = new Vue({
             managerPassword: "",
             rand_code: '',
         },
-        verifCode: ms.manager + "/code?t=" + new Date().getTime(),
+        verifCode: ms.base + "/code?t=" + new Date().getTime(),
         rememberPass: '',
         loginFormRule: {
             managerName: [{
@@ -117,12 +117,12 @@ var loginVue = new Vue({
             })
         },
         code: function() {
-            this.verifCode = ms.manager + "/code?t=" + new Date().getTime();
+            this.verifCode = ms.base + "/code?t=" + new Date().getTime();
         },
 
     },
     mounted:function(){
-        this.verifCode = ms.manager + "/code?t=" + new Date().getTime()
+        this.verifCode = ms.base + "/code?t=" + new Date().getTime()
     }
 })
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/reset-password.ftl b/src/main/webapp/WEB-INF/manager/reset-password.ftl
index ba8c969f..b07e38ef 100644
--- 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);
+               })	
             }
         }
     })
