diff --git a/css/sub-page.css b/css/sub.css similarity index 89% rename from css/sub-page.css rename to css/sub.css index c3f517a..30461ab 100644 --- a/css/sub-page.css +++ b/css/sub.css @@ -1,4 +1,6 @@ @import "./common.css"; +@import "../lib/layui/css/layui.css"; + /*主体内容样式*/ .ok-body { padding: 10px @@ -110,21 +112,6 @@ } } -okToolbar { - display: block; - margin-top: 10px; - margin-bottom: 10px; - padding: 5px; - line-height: 22px; - border-radius: 0 2px 2px 0; - background-color: #f2f2f2; -} - -okToolbar span { - float: right; - line-height: 30px; -} - /*form表单*/ .ok-form { margin-top: 10px; diff --git a/data/navs.json b/data/navs.json index ff11226..0c3dac1 100644 --- a/data/navs.json +++ b/data/navs.json @@ -138,19 +138,19 @@ "title": "用户列表", "fontFamily": "layui-icon", "icon": "", - "href": "pages/user/user.html", + "href": "pages/member/user.html", "spread": false }, { "title": "角色列表", "icon": "", - "href": "pages/role/role.html", + "href": "pages/member/role.html", "spread": false }, { "title": "权限列表", "icon": "", - "href": "pages/permission/permission.html", + "href": "pages/member/permission.html", "spread": false } ] diff --git a/pages/login.html b/pages/login.html index 457025b..ffe1167 100644 --- a/pages/login.html +++ b/pages/login.html @@ -7,18 +7,7 @@ - -
