From 33d2f7c8e443e10b4fe4f589c1dd15b1ccf40f9b Mon Sep 17 00:00:00 2001 From: bobi Date: Sun, 27 Oct 2019 21:31:06 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/layui/lay/okmodules/okMock.js | 14 +++----------- lib/layui/lay/okmodules/okUtils.js | 6 +++--- pages/member/permission.html | 18 ++++++++++-------- pages/member/role.html | 8 +++++--- pages/txtedit/CKEditor.html | 26 +++++++++++++------------- 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js index 403efa9..0fa2c8c 100644 --- a/lib/layui/lay/okmodules/okMock.js +++ b/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: "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" + list: "http://rap2api.taobao.org/app/mock/233041/permission/list", }, article: { list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/article/list" diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js index 626161b..708dd34 100644 --- a/lib/layui/lay/okmodules/okUtils.js +++ b/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 { diff --git a/pages/member/permission.html b/pages/member/permission.html index e8b628d..fe0e60c 100644 --- a/pages/member/permission.html +++ b/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: "menu", title: "权限路径", width: 100}, - {field: "parentId", title: "父菜单", width: 100}, + {field: "permit", title: "权限标识", width: 150}, + {field: "url", title: "权限路径", width: 150}, + {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 @@ diff --git a/pages/member/role.html b/pages/member/role.html index fdc3bef..415046f 100644 --- a/pages/member/role.html +++ b/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 @@ 启用 {{# } else if(d.status == 1) { }} 停用 + {{# } else if(d.status == 2) { }} + 删除 {{# } }} diff --git a/pages/txtedit/CKEditor.html b/pages/txtedit/CKEditor.html index fffb3c3..5c73e9b 100644 --- a/pages/txtedit/CKEditor.html +++ b/pages/txtedit/CKEditor.html @@ -7,25 +7,25 @@ -
- -
+
+ +
首页 文本编辑 CKEditor - - - + + + +
-
- - - + + }); +