From 01037b76a03fadcd6f81a9d041b2e3ea7e0aeceb Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Fri, 30 Aug 2019 00:11:39 +0800
Subject: [PATCH] =?UTF-8?q?add:=E7=99=BB=E9=99=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/layui/lay/okmodules/okMock.js  | 10 +++++-----
 lib/layui/lay/okmodules/okUtils.js |  3 ++-
 pages/login.html                   |  2 +-
 pages/member/user.html             | 10 +++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js
index dbd7b8f..b605df2 100644
--- a/lib/layui/lay/okmodules/okMock.js
+++ b/lib/layui/lay/okmodules/okMock.js
@@ -9,11 +9,11 @@ layui.define([], function(exprots) {
             user: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list",
                 list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list2",
-                batchNormal: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchNormal",
-                batchStop: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchStop",
-                batchDel: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchDel",
-                add: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/add",
-                edit: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/edit"
+                batchNormal: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchNormal",
+                batchStop: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchStop",
+                batchDel: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchDel",
+                add: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/add",
+                edit: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/edit"
             },
             role: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/role/list"
diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js
index 6bcd6a1..124400e 100644
--- a/lib/layui/lay/okmodules/okUtils.js
+++ b/lib/layui/lay/okmodules/okUtils.js
@@ -35,7 +35,8 @@ layui.define(["layer"], function (exprots) {
          * @param url
          * @param type
          * @param param
-         * @returns {*|*|*}
+         * @param load
+         * @returns {*|never|{always, promise, state, then}}
          */
         ajax: function (url, type, param, load) {
             var deferred = $.Deferred();
diff --git a/pages/login.html b/pages/login.html
index 3c0d218..fd4886a 100644
--- a/pages/login.html
+++ b/pages/login.html
@@ -68,7 +68,7 @@
          * 表单提交
          */
         form.on("submit(login)", function (data) {
-            okUtils.ajax(okMock.api.login, "post", data.field).done(function (response) {
+            okUtils.ajax(okMock.api.login, "post", data.field, true).done(function (response) {
                 console.log(response);
                 okLayer.msg.greenTick(response.msg, function () {
                     window.location = "../index.html";
diff --git a/pages/member/user.html b/pages/member/user.html
index 8be531e..1f33bf7 100644
--- a/pages/member/user.html
+++ b/pages/member/user.html
@@ -58,7 +58,7 @@
             size: "sm",
             cols: [[
                 {type: "checkbox", fixed: "left"},
-                {field: "id", title: "ID", width: 80, sort: true},
+                {field: "id", title: "ID", width: 160, sort: true},
                 {field: "username", title: "账号", width: 100},
                 {field: "password", title: "密码", width: 100},
                 {field: "reallyName", title: "姓名", width: 100},
@@ -118,7 +118,7 @@
                 layer.close(index);
                 var idsStr = okUtils.table.batchCheck(table);
                 if (idsStr) {
-                    okUtils.ajax(okUtils.mockApi.user.batchNormal, "put", {idsStr: idsStr}).done(function (response) {
+                    okUtils.ajax(okMock.api.user.batchNormal, "put", {idsStr: idsStr}).done(function (response) {
                         console.log(response);
                         okUtils.table.successMsg("批量启用成功");
                     }).fail(function (error) {
@@ -133,7 +133,7 @@
                 layer.close(index);
                 var idsStr = okUtils.table.batchCheck(table);
                 if (idsStr) {
-                    okUtils.ajax(okUtils.mockApi.user.batchStop, "put", {idsStr: idsStr}).done(function (response) {
+                    okUtils.ajax(okMock.api.user.batchStop, "put", {idsStr: idsStr}).done(function (response) {
                         console.log(response);
                         okUtils.table.successMsg("批量停用成功");
                     }).fail(function (error) {
@@ -148,7 +148,7 @@
                 layer.close(index);
                 var idsStr = okUtils.table.batchCheck(table);
                 if (idsStr) {
-                    okUtils.ajax(okUtils.mockApi.user.batchDel, "delete", {idsStr: idsStr}).done(function (response) {
+                    okUtils.ajax(okMock.api.user.batchDel, "delete", {idsStr: idsStr}).done(function (response) {
                         console.log(response);
                         okUtils.table.successMsg("批量删除成功");
                     }).fail(function (error) {
@@ -175,7 +175,7 @@
 
         function del(id) {
             okLayer.confirm("确定要删除吗？", function () {
-                okUtils.ajax(okUtils.mockApi.user.batchDel, "delete", {idsStr: id}).done(function (response) {
+                okUtils.ajax(okMock.api.user.batchDel, "delete", {idsStr: id}).done(function (response) {
                     console.log(response);
                     okUtils.table.successMsg("删除成功");
                 }).fail(function (error) {