add:会员管理模块url

lib/layui/lay/okmodules/okMock.js

@@ -1,6 +1,6 @@
 "use strict";
 layui.define([], function(exprots) {
-	var okMock = {
+	let okMock = {
 		api: {
             login: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/login",
             menu: {
@@ -8,20 +8,12 @@ layui.define([], function(exprots) {
             },
             user: {
                 list: "http://rap2api.taobao.org/app/mock/233041/user/list",
-                list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list2",
-                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"
+                list: "http://rap2api.taobao.org/app/mock/233041/role/list"
             },
             permission: {
-                tree: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/tree",
+                list: "http://rap2api.taobao.org/app/mock/233041/permission/list",
-                list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/list",
-                list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/permission/list2"
             },
             article: {
                 list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/article/list"

lib/layui/lay/okmodules/okUtils.js

@@ -5,11 +5,11 @@ layui.define(["layer"], function (exprots) {
         /**
          * 是否前后端分离
          */
-        isFrontendBackendSeparate: false,
+        isFrontendBackendSeparate: true,
         /**
          * 服务器地址
          */
-        baseUrl: "http://localhost:8080",
+        baseUrl: "http://rap2api.taobao.org/app/mock/233041",
         /**
          * 获取body的总宽度
          */
@@ -52,7 +52,7 @@ layui.define(["layer"], function (exprots) {
                     }
                 },
                 success: function (data) {
-                    if (data.status == 1000) {
+                    if (data.code == 0) {
                         // 业务正常
                         deferred.resolve(data)
                     } else {

pages/member/permission.html

@@ -53,7 +53,7 @@
         laydate.render({elem: '#endTime', type: "datetime"});
 
         function initPermissionTree() {
-            okUtils.ajax(okMock.api.permission.tree, "get", null).done(function (response) {
+            okUtils.ajax("/permission/tree", "get", null).done(function (response) {
                 tree.render({
                     elem: '#permissionTree',
                     data: response.data,
@@ -80,11 +80,11 @@
 			    page: true,
 			    size: "sm",
 			    cols: [[
-			        {field: "id", title: "ID", width: 80, sort: true},
+			        {field: "id", title: "ID", width: 170, sort: true, fixed: "left"},
 			        {field: "name", title: "权限名称", width: 100},
-			        {field: "menuName", title: "权限标识", width: 100},
+			        {field: "permit", title: "权限标识", width: 150},
-			        {field: "menu", title: "权限路径", width: 100},
+			        {field: "url", title: "权限路径", width: 150},
-					{field: "parentId", title: "父菜单", width: 100},
+					{field: "parentName", title: "父菜单", width: 100},
 			        {field: "type", title: "类型", width: 100, templet: "#typeTpl"},
 			        {field: "createTime", title: "创建时间", width: 150},
 					{field: "updateTime", title: "创建时间", width: 150},
@@ -107,9 +107,11 @@
 
 <script type="text/html" id="typeTpl">
     {{#  if(d.type == 0){ }}
-        <span class="layui-btn layui-btn-normal layui-btn-xs">菜单</span>
+        <span class="layui-btn layui-btn-normal layui-btn-xs">目录</span>
-    {{#  } else if(d.type == 1) { }}
+    {{#  } else if(d.type == 1){ }}
-        <span class="layui-btn layui-btn-warm layui-btn-xs">按钮</span>
+        <span class="layui-btn layui-btn-warm layui-btn-xs">菜单</span>
+    {{#  } else if(d.type == 2) { }}
+        <span class="layui-btn layui-btn-danger layui-btn-xs">按钮</span>
     {{#  } }}
 </script>
 </body>

pages/member/role.html

@@ -56,13 +56,13 @@
             size: "sm",
             cols: [[
                 {type: "checkbox"},
-                {field: "id", title: "ID", width: 80, sort: true},
+                {field: "id", title: "ID", width: 170, sort: true},
                 {field: "name", title: "角色名", width: 100},
                 {field: "remarks", title: "备注", width: 100},
-                {field: "createUser", title: "创建者", width: 85},
+                {field: "createUsername", title: "创建者", width: 85},
                 {field: "status", title: "状态", width: 85, templet: "#statusTpl"},
                 {field: "createTime", title: "创建时间", width: 150},
-                {title: "操作", width: 200, align: "center", templet: "#operationTpl"}
+                {title: "操作", width: 80, align: "center", templet: "#operationTpl"}
             ]],
             done: function (res, curr, count) {
                 console.log(res, curr, count);
@@ -152,6 +152,8 @@
         <span class="layui-btn layui-btn-normal layui-btn-xs">启用</span>
     {{#  } else if(d.status == 1) { }}
         <span class="layui-btn layui-btn-warm layui-btn-xs">停用</span>
+    {{#  } else if(d.status == 2) { }}
+        <span class="layui-btn layui-btn-danger layui-btn-xs">删除</span>
     {{#  } }}
 </script>
 

pages/txtedit/CKEditor.html

@@ -7,25 +7,25 @@
     <link rel="stylesheet" href="../../css/oksub.css">
 </head>
 <body>
-<div class="ok-body">
+    <div class="ok-body">
-    <!--面包屑导航区域-->
+        <!--面包屑导航区域-->
-    <div class="ok-body-breadcrumb">
+        <div class="ok-body-breadcrumb">
         <span class="layui-breadcrumb">
             <a><cite>首页</cite></a>
             <a><cite>文本编辑</cite></a>
             <a><cite>CKEditor</cite></a>
         </span>
-        <a class="layui-btn layui-btn-sm" href="javascript:location.replace(location.href);" title="刷新">
+            <a class="layui-btn layui-btn-sm" href="javascript:location.replace(location.href);" title="刷新">
-            <i class="layui-icon layui-icon-refresh"></i>
+                <i class="layui-icon layui-icon-refresh"></i>
-        </a>
+            </a>
+        </div>
     </div>
-</div>
+    <!--js逻辑-->
-<!--js逻辑-->
+    <script src="../../lib/layui/layui.js"></script>
-<script src="../../lib/layui/layui.js"></script>
+    <script type="text/javascript">
-<script type="text/javascript">
+        layui.use(["element"], function () {
-    layui.use(["element"], function () {
 
-    });
+        });
-</script>
+    </script>
 </body>
 </html>