diff --git a/data/log.json b/data/log.json
index 397ed62..f0f532f 100644
--- a/data/log.json
+++ b/data/log.json
@@ -9,7 +9,7 @@
       "method": "GET",
       "ip": "127.0.0.1",
 			"timeConsuming": 100,
-			"isNnormal": true,
+			"status": true,
 			"operator": "admin",
       "operatingTime": "2019-05-15 12:08:08"
     }
diff --git a/js/okadmin.js b/js/okadmin.js
index a6e9b67..8f8b491 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -165,7 +165,7 @@ layui.use(["element", "layer"], function () {
      */
     $("#logout").click(function () {
         layer.confirm("确定要退出吗？", {skin: 'layui-layer-lan', icon: 3, title: '提示', anim: 6}, function () {
-            window.location = "pages/other/login.html";
+            window.location = "pages/user/login.html";
         });
     });
 
diff --git a/pages/other/login.html b/pages/user/login.html
similarity index 80%
rename from pages/other/login.html
rename to pages/user/login.html
index 447a562..ecae553 100644
--- a/pages/other/login.html
+++ b/pages/user/login.html
@@ -41,15 +41,22 @@
 <script src="../../lib/layui/layui.js"></script>
 <script src="../../lib/nprogress/nprogress.js"></script>
 <script type="text/javascript">
-    layui.use(["form", "jquery"], function () {
+    layui.config({
+        base: "../../lib/layui_plugins/"
+    }).extend({
+        okLayer: "okLayer/okLayer",
+        okUtils: "okUtils/okUtils"
+    }).use(["form", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var $ = layui.jquery;
+		var okLayer = layui.okLayer;
+		var okUtils = layui.okUtils;
 
         // 进度条
-        NProgress.start();
-        window.onload = function () {
-            NProgress.done();
-        }
+//         NProgress.start();
+//         window.onload = function () {
+//             NProgress.done();
+//         }
 
         // 修改copyright结束时间
         var data = new Date();
@@ -58,9 +65,19 @@
 
         // 登陆逻辑
         form.on('submit(login)', function (data) {
-            layer.msg("登陆中...", {icon: 6, time: 1000, anim: 4}, function () {
-                window.location = "../../index.html";
-            });
+			/* 登录api
+			 okUtils.ajax("/login", "post", data.field).done(function (response) {
+			    console.log(response)
+				layer.msg("登陆成功", {icon: 6, time: 1000, anim: 4}, function () {
+					window.location = "../../index.html";
+				});
+			}).fail(function (error) {
+			    console.log(error)
+			}); 
+			*/
+		   layer.msg("登陆成功", {icon: 6, time: 1000, anim: 4}, function () {
+				window.location = "../../index.html";
+		   });
             return false;
         });