diff --git a/pages/role/role.html b/pages/role/role.html
index e14d4a8..c3ea6c6 100644
--- a/pages/role/role.html
+++ b/pages/role/role.html
@@ -31,16 +31,6 @@
             </button>
         </form>
     </div>
-    <!--工具栏-->
-    <okToolbar>
-        <button class="layui-btn layui-btn-danger" id="batchDel">
-            <i class="layui-icon layui-icon-delete"></i>批量删除
-        </button>
-        <button class="layui-btn" id="addRole">
-            <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>
@@ -48,16 +38,23 @@
 <script src="../../lib/layui/layui.js"></script>
 <script src="../../lib/nprogress/nprogress.js"></script>
 <script>
-    NProgress.start();
-    window.onload = function () {
-        NProgress.done();
-    }
+//     NProgress.start();
+//     window.onload = function () {
+//         NProgress.done();
+//     }
 
-    layui.use(["element", "table", "form", "jquery", "laydate"], function () {
+    layui.config({
+        base: "../../lib/layui_plugins/"
+    }).extend({
+        okLayer: "okLayer/okLayer",
+        okUtils: "okUtils/okUtils"
+    }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;
         var $ = layui.jquery;
         var laydate = layui.laydate;
+		var okLayer = layui.okLayer;
+		var okUtils = layui.okUtils;
 
         laydate.render({elem: "#startTime", type: "datetime"});
         laydate.render({elem: "#endTime", type: "datetime"});
@@ -67,6 +64,7 @@
             url: "../../data/role.json",
             limit: 10,
             page: true,
+			toolbar: "#toolbarTpl",
             cols: [[
                 {type: "checkbox"},
                 {field: "id", title: "ID", width: 80, sort: true},
@@ -77,7 +75,7 @@
                 {title: "操作", width: 200, align: "center", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
-                $("#countNum").text(count);
+                console.log(res, curr, count);
             }
         });
 
@@ -86,69 +84,77 @@
             return false;
         });
 
-        table.on("tool(tableFilter)", function (obj) {
+		table.on("toolbar(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: "role-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});
-                });
-            }
+			switch (obj.event) {
+				case "add":
+					add();
+					break;
+				case "batchDel":
+					batchDel();
+					break;
+			}
         });
 
-        $("#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});
-                }
-            });
-        })
+        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;
+			}
+        });
 
-        $("#addRole").click(function () {
-            layer.open({
-                title: "添加角色",
-                type: 2,
-                shade: false,
-                maxmin: true,
-                shade: 0.5,
-                anim: 4,
-                area: ["90%", "90%"],
-                content: "role-add.html",
-                zIndex: layer.zIndex,
-                // skin: "layui-layer-molv",
-                end: function () {
-                    $(".layui-laypage-btn")[0].click();
-                }
-            });
-        })
+		function add () {
+			okLayer.open("添加角色", "role-add.html", "90%", "90%", 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("/role/batchDel", "post", {idsStr: idsStr}).done(function (response) {
+			            console.log(response)
+			            okUtils.table.operationSuccessMsg("批量删除成功");
+			        }).fail(function (error) {
+			            console.log(error)
+			        });
+			    }
+			});
+		}
+		
+		function edit (id) {
+			okLayer.open("编辑角色", "role-edit.html?id=" + id, "90%", "90%", function () {
+				$(".layui-laypage-btn")[0].click();
+			})
+		}
+		
+		function del (id) {
+			okLayer.confirm("确定要删除吗？", function () {
+			    okUtils.ajax("/user/batchDel", "post", {idsStr: id}).done(function (response) {
+			        console.log(response)
+			        okUtils.table.operationSuccessMsg("删除成功");
+			    }).fail(function (error) {
+			        console.log(error)
+			    });
+			})
+		}
     })
 </script>
-<!--模板-->
+<!-- 头工具栏模板 -->
+<script type="text/html" id="toolbarTpl">
+	<div class="layui-btn-container">    
+		<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>
+		<div class="layui-inline" lay-event="batchDel"><i class="layui-icon layui-icon-delete"></i></div>
+	</div>
+</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>