From 056f37f7d511e1caab228a74c7d9eeac51e51933 Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Tue, 27 Aug 2019 09:10:58 +0800
Subject: [PATCH] =?UTF-8?q?del:=E5=A4=9A=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/article.json                 | 115 -----------
 data/permission.json              | 254 -------------------------
 data/role.json                    |  28 ---
 data/tree.json                    |  54 ------
 data/user-list.json               | 128 -------------
 lib/layui/lay/okmodules/okMock.js |   2 +-
 pages/article/article-add.html    |   7 +-
 pages/article/article-edit.html   |   7 +-
 pages/article/article.html        | 305 +++++++++++++++---------------
 pages/member/user.html            |   2 +-
 10 files changed, 154 insertions(+), 748 deletions(-)
 delete mode 100644 data/article.json
 delete mode 100644 data/permission.json
 delete mode 100644 data/role.json
 delete mode 100644 data/tree.json
 delete mode 100644 data/user-list.json

diff --git a/data/article.json b/data/article.json
deleted file mode 100644
index 095e0a3..0000000
--- a/data/article.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 12,
-  "data": [
-    {
-      "id": "001",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "002",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    },
-    {
-      "id": "003",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "004",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    },
-    {
-      "id": "005",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "006",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    },
-    {
-      "id": "007",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "008",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    },
-    {
-      "id": "009",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "010",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    },
-    {
-      "id": "011",
-      "title": "LV降价了！宇宙大牌最值得买的包可以下手啦！",
-      "url": "http://ok-admin.xlbweb.cn/p/100",
-      "readSize": 288,
-      "publisher": "admin",
-      "isTop": true,
-      "status": true
-    },
-    {
-      "id": "012",
-      "title": "这颗彗星时速13.5万公里，有人想抓点样本带回地球",
-      "url": "http://ok-admin.xlbweb.cn/p/101",
-      "readSize": 188,
-      "publisher": "admin",
-      "isTop": false,
-      "status": false
-    }
-  ]
-}
diff --git a/data/permission.json b/data/permission.json
deleted file mode 100644
index e14d00e..0000000
--- a/data/permission.json
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 19,
-  "data": [
-    {
-      "authorityId": 1,
-      "authorityName": "系统管理",
-      "orderNumber": 1,
-      "menuUrl": null,
-      "menuIcon": "layui-icon-set",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": -1
-    },
-    {
-      "authorityId": 2,
-      "authorityName": "用户管理",
-      "orderNumber": 2,
-      "menuUrl": "system/user",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 3,
-      "authorityName": "查询用户",
-      "orderNumber": 3,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:54:16",
-      "authority": "user:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:54:16",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 4,
-      "authorityName": "添加用户",
-      "orderNumber": 4,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:add",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 5,
-      "authorityName": "修改用户",
-      "orderNumber": 5,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 6,
-      "authorityName": "删除用户",
-      "orderNumber": 6,
-      "menuUrl": null,
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "user:delete",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 2
-    },
-    {
-      "authorityId": 7,
-      "authorityName": "角色管理",
-      "orderNumber": 7,
-      "menuUrl": "system/role",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 8,
-      "authorityName": "查询角色",
-      "orderNumber": 8,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:54:59",
-      "authority": "role:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:54:58",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 9,
-      "authorityName": "添加角色",
-      "orderNumber": 9,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:add",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 10,
-      "authorityName": "修改角色",
-      "orderNumber": 10,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 11,
-      "authorityName": "删除角色",
-      "orderNumber": 11,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:delete",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 12,
-      "authorityName": "角色权限管理",
-      "orderNumber": 12,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "role:auth",
-      "checked": 0,
-      "updateTime": "2018/07/13 15:27:18",
-      "isMenu": 1,
-      "parentId": 7
-    },
-    {
-      "authorityId": 13,
-      "authorityName": "权限管理",
-      "orderNumber": 13,
-      "menuUrl": "system/authorities",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/07/13 15:45:13",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 14,
-      "authorityName": "查询权限",
-      "orderNumber": 14,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:55:57",
-      "authority": "authorities:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:55:56",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 15,
-      "authorityName": "添加权限",
-      "orderNumber": 15,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "authorities:add",
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 16,
-      "authorityName": "修改权限",
-      "orderNumber": 16,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/13 09:13:42",
-      "authority": "authorities:edit",
-      "checked": 0,
-      "updateTime": "2018/07/13 09:13:42",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 17,
-      "authorityName": "删除权限",
-      "orderNumber": 17,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/06/29 11:05:41",
-      "authority": "authorities:delete",
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 1,
-      "parentId": 13
-    },
-    {
-      "authorityId": 18,
-      "authorityName": "登录日志",
-      "orderNumber": 18,
-      "menuUrl": "system/loginRecord",
-      "menuIcon": null,
-      "createTime": "2018/06/29 11:05:41",
-      "authority": null,
-      "checked": 0,
-      "updateTime": "2018/06/29 11:05:41",
-      "isMenu": 0,
-      "parentId": 1
-    },
-    {
-      "authorityId": 19,
-      "authorityName": "查询登录日志",
-      "orderNumber": 19,
-      "menuUrl": "",
-      "menuIcon": "",
-      "createTime": "2018/07/21 13:56:43",
-      "authority": "loginRecord:view",
-      "checked": 0,
-      "updateTime": "2018/07/21 13:56:43",
-      "isMenu": 1,
-      "parentId": 18
-    }
-  ]
-}
\ No newline at end of file
diff --git a/data/role.json b/data/role.json
deleted file mode 100644
index 5bec8bf..0000000
--- a/data/role.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "code": 0,
-  "msg": "",
-  "count": 3,
-  "data": [
-    {
-      "id": "001",
-      "name": "ADMIN",
-      "remarks": "管理员",
-      "createUser": "admin",
-      "createTime": "2018-05-06 18:15:28"
-    },
-    {
-      "id": "002",
-      "name": "TEACHER",
-      "remarks": "教师",
-      "createUser": "admin",
-      "createTime": "2018-05-06 19:15:28"
-    },
-    {
-      "id": "003",
-      "name": "STUDENT",
-      "remarks": "学生",
-      "createUser": "admin",
-      "createTime": "2018-05-06 20:15:28"
-    }
-  ]
-}
diff --git a/data/tree.json b/data/tree.json
deleted file mode 100644
index ae46a35..0000000
--- a/data/tree.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "code": 0,
-  "msg": "获取成功",
-  "data": {
-    "trees": [
-      {
-        "name": "用户管理",
-        "value": "xsgl",
-        "checked": true
-      },
-      {
-        "name": "用户组管理",
-        "value": "sbgl",
-        "checked": true,
-        "list": [
-          {
-            "name": "角色管理",
-            "value": "sbgl-sbsjlb",
-            "checked": true,
-            "list": [
-              {
-                "name": "添加角色",
-                "value": "sbgl-sbsjlb-dj",
-                "checked": true
-              },
-              {
-                "name": "角色列表",
-                "value": "sbgl-sbsjlb-yl",
-                "checked": false
-              }
-            ]
-          },
-          {
-            "name": "管理员管理",
-            "value": "sbgl-sbsjlb",
-            "checked": true,
-            "list": [
-              {
-                "name": "添加管理员",
-                "value": "sbgl-sbsjlb-dj",
-                "checked": true
-              },
-              {
-                "name": "管理员列表",
-                "value": "sbgl-sbsjlb-yl",
-                "checked": false
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/data/user-list.json b/data/user-list.json
deleted file mode 100644
index 3c07881..0000000
--- a/data/user-list.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "code": 0,
-  "msg": "操作成功",
-  "count": 11,
-  "data": [
-    {
-      "id": "001",
-      "username": "zhangsan",
-      "name": "张三",
-      "password": "111111",
-      "status": 0,
-      "role": 0,
-      "email": "zhangsan@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "002",
-      "username": "lisi",
-      "name": "李四",
-      "password": "111111",
-      "status": 0,
-      "role": 0,
-      "email": "lisi@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "003",
-      "username": "wangwu",
-      "name": "王五",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "wangwu@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "004",
-      "username": "zhaoliu",
-      "name": "赵六",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "zhaoliu@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "005",
-      "username": "sunqi",
-      "name": "孙七",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "sunqi@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "006",
-      "username": "zhouba",
-      "name": "周八",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "zhouba@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "007",
-      "username": "wujiu",
-      "name": "吴九",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "wujiu@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "008",
-      "username": "zhengshi",
-      "name": "郑十",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "zhengshi@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "009",
-      "username": "liubei",
-      "name": "刘备",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "liubei@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "010",
-      "username": "zhangfei",
-      "name": "张飞",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "zhangfei@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    },
-    {
-      "id": "011",
-      "username": "guanyu",
-      "name": "关羽",
-      "password": "111111",
-      "status": 1,
-      "role": 1,
-      "email": "guanyu@qq.com",
-      "createTime": "2018-05-06 18:15:28",
-      "logins": 24
-    }
-  ]
-}
diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js
index cbfcbd3..dbd7b8f 100644
--- a/lib/layui/lay/okmodules/okMock.js
+++ b/lib/layui/lay/okmodules/okMock.js
@@ -24,7 +24,7 @@ layui.define([], function(exprots) {
                 list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/list2"
             },
             article: {
-                list: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/article/list"
+                list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/article/list"
             },
             log: {
                 list: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/log/list"
diff --git a/pages/article/article-add.html b/pages/article/article-add.html
index f70a81a..128dcbc 100644
--- a/pages/article/article-add.html
+++ b/pages/article/article-add.html
@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>添加文章</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../lib/layui/css/layui.css">
-    <link rel="stylesheet" href="../../css/scroll-bar.css">
-    <link rel="stylesheet" href="../../css/sub-page.css">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_693759_wytlyqhtdtj1nhfr.css">
+    <link rel="stylesheet" href="../../css/sub.css">
 </head>
 <body>
 <div class="ok-body">
diff --git a/pages/article/article-edit.html b/pages/article/article-edit.html
index 6a1b732..4dc7a2e 100644
--- a/pages/article/article-edit.html
+++ b/pages/article/article-edit.html
@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>编辑文章</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../lib/layui/css/layui.css">
-    <link rel="stylesheet" href="../../css/scroll-bar.css">
-    <link rel="stylesheet" href="../../css/sub-page.css">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_693759_wytlyqhtdtj1nhfr.css">
+    <link rel="stylesheet" href="../../css/sub.css">
 </head>
 <body>
 <div class="ok-body">
diff --git a/pages/article/article.html b/pages/article/article.html
index ce351a7..5eef9e8 100644
--- a/pages/article/article.html
+++ b/pages/article/article.html
@@ -1,21 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>文章列表</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../lib/layui/css/layui.css">
-    <link rel="stylesheet" href="../../lib/nprogress/nprogress.css">
+    <link rel="stylesheet" href="../../css/sub.css">
 </head>
 <body>
 <div class="ok-body">
     <!--面包屑导航区域-->
     <div class="ok-body-breadcrumb">
-            <span class="layui-breadcrumb">
-                <a><cite>首页</cite></a>
-                <a><cite>常用页面</cite></a>
-                <a><cite>文章列表</cite></a>
-            </span>
+        <span class="layui-breadcrumb">
+            <a><cite>首页</cite></a>
+            <a><cite>常用页面</cite></a>
+            <a><cite>文章列表</cite></a>
+        </span>
         <a class="layui-btn layui-btn-sm" href="javascript:location.replace(location.href);" title="刷新">
             <i class="layui-icon layui-icon-refresh"></i>
         </a>
@@ -23,206 +22,198 @@
     <!--模糊搜索区域-->
     <div class="layui-row">
         <form class="layui-form layui-col-md12 ok-search">
-            <input class="layui-input" placeholder="开始日期" autocomplete="off" id="startTime">
-            <input class="layui-input" placeholder="截止日期" autocomplete="off" id="endTime">
-            <input class="layui-input" placeholder="请输入标题" autocomplete="off">
+            <input class="layui-input" placeholder="开始日期" autocomplete="off" id="startTime" name="startTime">
+            <input class="layui-input" placeholder="截止日期" autocomplete="off" id="endTime" name="endTime">
+            <input class="layui-input" placeholder="请输入标题" autocomplete="off" name="title">
             <button class="layui-btn" lay-submit="" lay-filter="search">
                 <i class="layui-icon layui-icon-search"></i>
             </button>
         </form>
     </div>
-    <!--工具栏-->
-    <okToolbar>
-        <button class="layui-btn layui-btn-normal" id="batchEnabled">
-            <i class="iconfont icon-shangsheng"></i>批量上架
-        </button>
-        <button class="layui-btn layui-btn-warm" id="batchDisabled">
-            <i class="iconfont icon-web-icon-"></i>批量下架
-        </button>
-        <button class="layui-btn layui-btn-danger" id="batchDel">
-            <i class="layui-icon layui-icon-delete"></i>批量删除
-        </button>
-        <button class="layui-btn" id="addUser">
-            <i class="layui-icon">&#xe61f;</i>添加文章
-        </button>
-        <span>共有数据：<i id="countNum"></i> 条</span>
-    </okToolbar>
     <!--数据表格-->
     <table class="layui-hide" id="tableId" lay-filter="tableFilter"></table>
 </div>
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
-<script src="../../lib/nprogress/nprogress.js"></script>
 <script>
-    // 进度条加载提示
-    NProgress.start();
-    window.onload = function () {
-        NProgress.done();
-    }
-    // layui相关
-    layui.use(['element', 'table', 'form', 'jquery', 'laydate'], function () {
-        var element = layui.element;
+    layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils", "okMock"], function () {
         var table = layui.table;
         var form = layui.form;
-        var $ = layui.jquery;
+        var util = layui.util;
         var laydate = layui.laydate;
+        var okLayer = layui.okLayer;
+        var okUtils = layui.okUtils;
+		var okMock = layui.okMock;
 
-        laydate.render({
-            elem: '#startTime',
-            type: "datetime"
-        });
+        util.fixbar({});
 
-        laydate.render({
-            elem: '#endTime',
-            type: "datetime"
-        });
+        laydate.render({elem: "#startTime", type: "datetime"});
+        laydate.render({elem: "#endTime", type: "datetime"});
 
-        table.render({
-            elem: '#tableId',
-            url: '../../data/article.json',
-            limit: 10,
+        var articleTable = table.render({
+            elem: "#tableId",
+            url: okMock.api.article.list,
+            limit: 20,
             page: true,
             even: true,
+            toolbar: "#toolbarTpl",
+            size: "sm",
             cols: [[
-                {type: 'checkbox'},
-                {field: 'id', title: 'ID', width: 80, sort: true},
-                {field: 'title', title: '标题', width: 350},
-                {field: 'url', title: '链接', width: 250, templet: '#urlTpl'},
-                {field: 'readSize', title: '阅读量', width: 80},
-                {field: 'publisher', title: '发布者', width: 100},
-                {field: 'isTop', title: '置顶', width: 100, templet: '#topTpl'},
-                {field: 'status', title: '状态', width: 100, templet: '#statusTpl'},
-                {title: '操作', width: 200, templet: '#operationTpl', align: 'center'}
+                {type: "checkbox"},
+                {field: "id", title: "ID", width: 80, sort: true},
+                {field: "title", title: "标题", width: 350},
+                {field: "url", title: "链接", width: 250, templet: "#urlTpl"},
+                {field: "readSize", title: "阅读量", width: 80},
+                {field: "publisher", title: "发布者", width: 100},
+                {field: "isTop", title: "是否置顶", width: 100, align: "center", templet: "#topTpl"},
+                {field: "status", title: "发布状态", width: 110, align: "center", templet: "#statusTpl"},
+                {title: "操作", width: 200, align: "center", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
-                $("#countNum").text(count);
+                console.log(res, curr, count)
             }
         });
 
-        form.on('submit(search)', function () {
-            layer.msg('正在查询，请稍后...');
+        form.on("submit(search)", function () {
+            articleTable.reload({
+                where: data.field,
+                page: {curr: 1}
+            });
             return false;
         });
 
-        table.on('tool(tableFilter)', function (obj) {
-            var data = obj.data;
-            var layEvent = obj.event;
-            if (layEvent === 'edit') {
-                layer.open({
-                    title: '编辑用户',
-                    type: 2,
-                    shade: false,
-                    maxmin: true,
-                    shade: 0.5,
-                    area: ['90%', '90%'],
-                    content: 'article-edit.html',
-                    zIndex: layer.zIndex,
-                    end: function () {
-                        $(".layui-laypage-btn")[0].click();
-                    }
-                });
-            } else if (layEvent === 'del') {
-                layer.confirm("确定要删除吗？", {skin: 'layui-layer-lan', icon: 2, title: '提示', anim: 6}, function () {
-                    layer.msg("操作成功！", {icon: 1, time: 1000});
-                });
+        table.on("toolbar(tableFilter)", function (obj) {
+            switch (obj.event) {
+                case "batchEnabled":
+                    batchEnabled();
+                    break;
+                case "batchDisabled":
+                    batchDisabled();
+                    break;
+                case "batchDel":
+                    batchDel();
+                    break;
+                case "add":
+                    add();
+                    break;
             }
         });
 
-        $("#batchEnabled").click(function () {
-            layer.confirm("确定要批量上架吗？", {skin: 'layui-layer-lan', icon: 3, title: '提示', anim: 1}, function () {
-                var checkStatus = table.checkStatus('tableId');
-                var rows = checkStatus.data.length;
-                if (rows > 0) {
-                    var idsStr = "";
-                    for (var i = 0; i < checkStatus.data.length; i++) {
-                        idsStr += checkStatus.data[i].id + ',';
-                    }
-                    console.log("选择的id-->" + idsStr);
-                    layer.msg("操作成功！", {icon: 1, time: 1000}, function () {
-                        $(".layui-laypage-btn")[0].click();
-                    });
-                } else {
-                    layer.msg('未选择有效数据', {
-                        offset: 't',
-                        anim: 6
-                    });
-                }
-            });
-        })
+        table.on("tool(tableFilter)", function (obj) {
+            var data = obj.data;
+            switch (obj.event) {
+                case "edit":
+                    edit(data.id);
+                    break;
+                case "del":
+                    del(data.id);
+                    break;
+            }
+        });
 
-        $("#batchDisabled").click(function () {
-            layer.confirm("确定要批量下架吗？", {skin: 'layui-layer-lan', icon: 3, title: '提示', anim: 2}, function () {
-                var checkStatus = table.checkStatus('tableId');
-                var rows = checkStatus.data.length;
-                if (rows > 0) {
-                    var idsStr = "";
-                    for (var i = 0; i < checkStatus.data.length; i++) {
-                        idsStr += checkStatus.data[i].id + ',';
-                    }
-                    console.log("选择的id-->" + idsStr);
-                    layer.msg("操作成功！", {icon: 1, time: 1000}, function () {
-                        $(".layui-laypage-btn")[0].click();
-                    });
-                } else {
-                    layer.msg('未选择有效数据', {
-                        offset: 't',
-                        anim: 6
+        function batchEnabled() {
+            okLayer.confirm("确定要批量上架吗？", function (index) {
+                layer.close(index);
+                var idsStr = okUtils.table.batchCheck(table);
+                if (idsStr) {
+                    okUtils.ajax("/article/batchNormal", "post", {idsStr: idsStr}).done(function (response) {
+                        console.log(response)
+                        okUtils.table.successMsg("批量上架成功");
+                    }).fail(function (error) {
+                        console.log(error)
                     });
                 }
             });
-        })
+        }
 
-        $("#batchDel").click(function () {
-            layer.confirm("确定要批量删除吗？", {skin: 'layui-layer-lan', icon: 2, title: '提示', anim: 6}, function () {
-                var checkStatus = table.checkStatus('tableId');
-                var rows = checkStatus.data.length;
-                if (rows > 0) {
-                    var idsStr = "";
-                    for (var i = 0; i < checkStatus.data.length; i++) {
-                        idsStr += checkStatus.data[i].id + ',';
-                    }
-                    console.log("选择的id-->" + idsStr);
-                    layer.msg("操作成功！", {icon: 1, time: 1000}, function () {
-                        $(".layui-laypage-btn")[0].click();
-                    });
-                } else {
-                    layer.msg('未选择有效数据', {
-                        offset: 't',
-                        anim: 6
+        function batchDisabled(){
+            okLayer.confirm("确定要批量下架吗？", function (index) {
+                layer.close(index);
+                var idsStr = okUtils.table.batchCheck(table);
+                if (idsStr) {
+                    okUtils.ajax("/article/batchStop", "post", {idsStr: idsStr}).done(function (response) {
+                        console.log(response)
+                        okUtils.table.successMsg("批量下架成功");
+                    }).fail(function (error) {
+                        console.log(error)
                     });
                 }
             });
-        })
+        }
 
-        $("#addUser").click(function () {
-            layer.open({
-                title: '添加文章',
-                type: 2,
-                shade: false,
-                maxmin: true,
-                shade: 0.5,
-                anim: 4,
-                area: ['90%', '90%'],
-                content: 'article-add.html',
-                zIndex: layer.zIndex,
-                // skin: 'layui-layer-molv',
-                end: function () {
-                    $(".layui-laypage-btn")[0].click();
+        function batchDel(){
+            okLayer.confirm("确定要批量删除吗？", function (index) {
+                layer.close(index);
+                var idsStr = okUtils.table.batchCheck(table);
+                if (idsStr) {
+                    okUtils.ajax("/article/batchDel", "post", {idsStr: idsStr}).done(function (response) {
+                        console.log(response)
+                        okUtils.table.successMsg("批量删除成功");
+                    }).fail(function (error) {
+                        console.log(error)
+                    });
                 }
             });
-        })
+        }
+
+        function add () {
+            okLayer.open("添加文章", "article-add.html", "90%", "90%", null, function () {
+                articleTable.reload();
+            })
+        }
+
+        function edit (id) {
+            okLayer.open("编辑文章", "article-edit.html?id=" + id, "90%", "90%", null, function () {
+                articleTable.reload();
+            })
+        }
+
+        function del (id) {
+            okLayer.confirm("确定要删除吗？", function () {
+                okUtils.ajax("/article/batchDel", "post", {idsStr: id}).done(function (response) {
+                    console.log(response)
+                    okUtils.table.successMsg("删除成功");
+                }).fail(function (error) {
+                    console.log(error)
+                });
+            })
+        }
     })
 </script>
-<!--模板-->
+<!-- 头工具栏模板 -->
+<script type="text/html" id="toolbarTpl">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchEnabled"><i class="iconfont icon-shangsheng"></i>批量上架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="batchDisabled"><i class="iconfont icon-web-icon-"></i>批量下架</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i>批量删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe61f;</i>添加文章</button>
+    </div>
+</script>
+<!-- 链接模板 -->
 <script type="text/html" id="urlTpl">
     <a href="{{d.url}}" target="_blank">{{d.url}}</a>
 </script>
-<script type="text/html" id="topTpl">
+<!-- 是否指顶模板
     <input type="checkbox" name="isTop" value="{{d.isTop}}" lay-skin="switch" lay-text="是|否" {{ d.isTop== true ? 'checked' : ''}}>
+-->
+<script type="text/html" id="topTpl">
+    {{#  if(d.isTop == true){ }}
+        <span class="layui-btn layui-btn-normal layui-btn-xs">已置顶</span>
+    {{#  } else if(d.isTop == false) { }}
+        <span class="layui-btn layui-btn-warm layui-btn-xs">未置顶</span>
+    {{#  } }}
 </script>
+<!-- 发布状态模板
+    <input type="checkbox" name="top" value="{{d.status}}" lay-skin="switch" lay-text="已发布|未发布" {{ d.status== true ? 'checked' : ''}}>
+-->
 <script type="text/html" id="statusTpl">
-    <input type="checkbox" name="top" value="{{d.status}}" lay-skin="switch" lay-text="上架|下架" {{ d.status== true ? 'checked' : ''}}>
+    {{#  if(d.status == true){ }}
+        <span class="layui-btn layui-btn-normal layui-btn-xs">已发布</span>
+    {{#  } else if(d.status == false) { }}
+        <span class="layui-btn layui-btn-warm layui-btn-xs">未发布</span>
+    {{#  } }}
 </script>
+<!-- 行工具栏模板 -->
 <script type="text/html" id="operationTpl">
     <a href="javascript:;" title="编辑" lay-event="edit"><i class="layui-icon">&#xe642;</i></a>
     <a href="javascript:;" title="删除" lay-event="del"><i class="layui-icon">&#xe640;</i></a>
diff --git a/pages/member/user.html b/pages/member/user.html
index 49df70e..cc1da81 100644
--- a/pages/member/user.html
+++ b/pages/member/user.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title>用户列表</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../css/sub.css">