From 56b344b4951ebc0da8709989afe6500c78e259e7 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Fri, 25 Jan 2019 16:28:35 +0800
Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com>

---
 src/main/webapp/WEB-INF/manager/include/head-file.ftl |  5 +++--
 src/main/webapp/WEB-INF/manager/login.ftl             | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/manager/include/head-file.ftl b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
index 7a4e0efa..f2d130a4 100644
--- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl
+++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
@@ -25,6 +25,7 @@
     <script>
         // ms.base = "${base}";
         // ms.manager = "${managerPath}";
-        ms.manager = "http://192.168.0.54:82";
-        ms.base = "http://192.168.0.54:82/apis";
+
+        ms.base = "http://192.168.0.54:82";
+        ms.manager = "http://192.168.0.54:82/apis";
     </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index 7ed2b605..b006ae3c 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -12,7 +12,7 @@
         <el-container class="ms-admin-login-container">
             <el-main class="ms-admin-login-main">
                 <div class="ms-admin-login-warp">
-                    <img :src="ms.manager+'/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">
                         <h1><span>账户登录 / </span>User login</h1>
                         <el-form-item prop="name" class="ms-admin-form-item">
@@ -49,7 +49,7 @@ var loginVue = new Vue({
             managerPassword: "",
             rand_code: '',
         },
-        code: ms.base + "/code?t=" + new Date().getTime(),
+        code: ms.manager + "/code?t=" + new Date().getTime(),
         rememberPass: '',
         loginFormRule: {
             managerName: [{
@@ -101,7 +101,7 @@ var loginVue = new Vue({
                         message: '登录成功',
                         type: 'success'
                     });
-                    location.href = ms.manager+"/index.do";
+                    location.href = ms.base+"/index.do";
                 } else {
                     that.$notify({
                         title: '失败',
@@ -114,12 +114,12 @@ var loginVue = new Vue({
             })
         },
         code: function() {
-            code: ms.base + "/code?t=" + new Date().getTime();
+            code: ms.manager + "/code?t=" + new Date().getTime();
         },
 
     },
     mounted:function(){
-        this.code = ms.base + "/code?t=" + new Date().getTime()
+        this.code = ms.manager + "/code?t=" + new Date().getTime()
     }
 })
 </script>
\ No newline at end of file