diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 3417710a8..369de9ac6 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -62,7 +62,7 @@ class Index extends BasicAdmin { $alert = [ 'type' => 'danger', 'title' => '安全提示', - 'content' => '超级管理员默认密码未修改，建议马上修改！' + 'content' => '超级管理员默认密码未修改，建议马上修改！' ]; $this->assign('title', '后台首页'); $this->assign('alert', $alert); diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index f2714addc..15c6f8e80 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -146,7 +146,7 @@ class Menu extends BasicAdmin { */ public function del() { if (Data::update($this->table)) { - $this->success("菜单删除成功！"); + $this->success("菜单删除成功！", ''); } else { $this->error("菜单删除失败，请稍候再试！"); } @@ -157,7 +157,7 @@ class Menu extends BasicAdmin { */ public function forbid() { if (Data::update($this->table)) { - $this->success("菜单禁用成功！"); + $this->success("菜单禁用成功！", ''); } else { $this->error("菜单禁用失败，请稍候再试！"); } @@ -168,30 +168,10 @@ class Menu extends BasicAdmin { */ public function resume() { if (Data::update($this->table)) { - $this->success("菜单启用成功！"); + $this->success("菜单启用成功！", ''); } else { $this->error("菜单启用失败，请稍候再试！"); } } - /** - * 读取菜单节点数据 - * @return array - */ - private function _getMenuNodeData() { - $list = Node::getNodeArrayTree(implode(",", Node::getDir(APP_PATH))); - unset($list['Admin']['Public'], $list['Admin']['Index']); - //只识别菜单属性的节点 - foreach ($list as $key => $module) { - foreach ($module as $_key => $action) { - foreach ($action as $__key => $method) { - if (!isset($method['menu']) || !is_array($method['menu']) || empty($method['menu']['status'])) { - unset($list[$key][$_key][$__key]); - } - } - } - } - return $list; - } - } diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html index c31756dbb..c3b2c533a 100644 --- a/application/admin/view/config.index.html +++ b/application/admin/view/config.index.html @@ -1,11 +1,47 @@ {extend name="extra@admin/content"} {block name="content"} +
网站设置
-
+ +
+ 系统菜单 +
+
友情提示：单击小箭头折叠 + + +
+
+
+
    + +
    +
    +
    +
    diff --git a/public/static/theme/default/css/console.css b/public/static/theme/default/css/console.css index 4e9908905..7fb01b6c5 100644 --- a/public/static/theme/default/css/console.css +++ b/public/static/theme/default/css/console.css @@ -117,6 +117,8 @@ input::-ms-clear {display:none} ::selection {background-color:#ec494e;color:#FFF} ::-moz-selection {background-color:#ec494e;color:#FFF} +.layui-box legend{width:auto!important;border-bottom:none!important} + /** checkbox 优化 */ input[type=checkbox],input[type=radio] {-webkit-appearance:none;appearance:none;width:18px;height:18px;margin:0;cursor:pointer;vertical-align:bottom;background:#fff;border:1px solid #dcdcdc;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative} input[type=checkbox]:active,input[type=radio]:active {border-color:#c6c6c6;background:#ebebeb}