From e07866d57c7a310c09213a5ceb166a2a8facd914 Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Tue, 25 Jun 2019 23:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=81=E5=AE=9A=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/okadmin.js          | 20 ++++++++------------
 pages/member/user.html |  3 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/js/okadmin.js b/js/okadmin.js
index 90b20c0..2888dd7 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -1,10 +1,11 @@
-layui.use(["element", "layer", "okTab", "okMenu", "okUtils"], function () {
+layui.use(["element", "layer", "okTab", "okMenu", "okUtils", "okLayer"], function () {
     var element = layui.element;
     var layer = layui.layer;
     var okTab = layui.okTab;
     var okMenu = layui.okMenu;
-    var okUtils = layui.okUtils;
     var $ = layui.jquery;
+    var okUtils = layui.okUtils;
+    var okLayer = layui.okLayer;
 
     /**
      * localhost运行提示
@@ -89,8 +90,8 @@ layui.use(["element", "layer", "okTab", "okMenu", "okUtils"], function () {
      * 退出操作
      */
     $("#logout").click(function () {
-        layer.confirm("确定要退出吗？", {skin: 'layui-layer-lan', icon: 3, title: '提示', anim: 6}, function () {
-            window.location = "pages/user/login.html";
+        okLayer.confirm("确定要退出吗？", function (index) {
+            window.location = "pages/other/login.html";
         });
     });
 
@@ -98,20 +99,15 @@ layui.use(["element", "layer", "okTab", "okMenu", "okUtils"], function () {
      * 锁定账户
      */
     $("#lock").click(function () {
-        layer.confirm("确定要锁定账户吗？", {skin: 'layui-layer-lan', icon: 4, title: '提示', anim: 1}, function (index) {
+        okLayer.confirm("确定要锁定账户吗？", function (index) {
             layer.close(index);
             $(".yy").show();
-            layer.prompt({
-                btn: ['确定'],
-                title: '输入密码解锁(123456)',
-                closeBtn: 0,
-                formType: 1
-            }, function (value, index, elem) {
+            layer.prompt({btn: ['确定'], title: '输入密码解锁(123456)', closeBtn: 0, formType: 1}, function (value, index, elem) {
                 if (value == "123456") {
                     layer.close(index);
                     $(".yy").hide();
                 } else {
-                    layer.msg('密码错误', {anim: 6});
+                    layer.msg('密码错误', {anim: 6, time: 1000});
                 }
             });
         });
diff --git a/pages/member/user.html b/pages/member/user.html
index f9f33c2..a2ede78 100644
--- a/pages/member/user.html
+++ b/pages/member/user.html
@@ -43,7 +43,7 @@
         var util = layui.util;
         var okLayer = layui.okLayer;
         var okUtils = layui.okUtils;
-        
+
         util.fixbar({});
 
         laydate.render({elem: "#startTime", type: "datetime"});
@@ -117,6 +117,7 @@
 
 		function batchEnabled () {
 			okLayer.confirm("确定要批量启用吗？", function (index) {
+			    // TODO
 			    layer.close(index);
 			    var idsStr = okUtils.table.batchCheck(table);
 			    if (idsStr) {