diff --git a/app/common.php b/app/common.php index fd497ac..bb08414 100644 --- a/app/common.php +++ b/app/common.php @@ -1026,6 +1026,7 @@ function set_recursion($result, $pid = 0, $level=-1) if ($v['pid'] == $pid) { if ($pid != 0) { $v['title'] = $space[$level] . $v['title']; + $v['level'] = $level+1; } /*将该类别的数据放入list中*/ $list[] = $v; diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php index a53282a..27ed64f 100644 --- a/app/home/controller/Index.php +++ b/app/home/controller/Index.php @@ -95,6 +95,7 @@ class Index extends BaseController } View::assign('menu', $list); View::assign('theme',$admin['theme']); + View::assign('web',get_system_config('web')); return View(); } } diff --git a/app/home/view/conf/index.html b/app/home/view/conf/index.html index 90ac2ee..20b5e91 100644 --- a/app/home/view/conf/index.html +++ b/app/home/view/conf/index.html @@ -1,7 +1,7 @@ {extend name="../../base/view/common/base" /} {block name="body"} -
+
diff --git a/app/home/view/conf/other.html b/app/home/view/conf/other.html index fbac5ce..75e18fc 100644 --- a/app/home/view/conf/other.html +++ b/app/home/view/conf/other.html @@ -5,16 +5,6 @@

其他配置

- - - + + + + - - + - - - - - - - - - - - - - - - - - - + - - + - - + + + + + + + + + + + + +
系统主题 - {empty name="$config.theme"} - - - {else/} - - - {/empty} - 开发者 diff --git a/app/home/view/conf/web.html b/app/home/view/conf/web.html index 1619948..492fc29 100644 --- a/app/home/view/conf/web.html +++ b/app/home/view/conf/web.html @@ -11,55 +11,38 @@ 网站名称* + 左侧菜单模式 + {empty name="$config.menu_mode"} + + + {else/} + + + {/empty} +
系统域名* - + 系统大LOGO -
-
系统大LOGO +
+
网站域名* - - - ICP备案号 - -
SEO关键词* - - - 公安备案号 - -
SEO描述* - - - 系统小LOGO -
-
系统小LOGO +
+ @@ -67,21 +50,40 @@
统计代码 - + ICP备案号 +
版权信息 - + 公安备案号 +
系统关键词* + +
系统描述* + + +
代码版本号* 版权信息 + +
@@ -104,7 +106,9 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - tool.sideClose(1000); + setTimeout(function(){ + parent.parent.location.reload(); + },1000) } } tool.post("/home/conf/edit", data.field, callback); diff --git a/app/home/view/index/index.html b/app/home/view/index/index.html index c81bbc0..d5aa6c8 100644 --- a/app/home/view/index/index.html +++ b/app/home/view/index/index.html @@ -6,7 +6,7 @@ {block name="body"}
-
+
@@ -69,51 +69,15 @@
-
-
- - - -
-
- + {empty name="$web.menu_mode"} + {include file="/index/menu_classical" /} + {else/} + {if ($web.menu_mode == 'expand') } + {include file="/index/menu_expand" /} + {else/} + {include file="/index/menu_classical" /} + {/if} + {/empty}
@@ -139,7 +103,7 @@
-
+
@@ -171,11 +135,7 @@ } } admin.loading(); - $('.layui-side-scroll').hover(function(){ - $(this).removeClass('no-scroll'); - },function(){ - $(this).addClass('no-scroll'); - }); + menuInit(); $('#GouguApp').on("click",'[gg-event="logout"]',function () { layer.confirm('确认注销登录吗?', { icon: 7, title: '警告' }, function (index) { diff --git a/app/home/view/index/layout_article.html b/app/home/view/index/layout_article.html index 72f89b3..c3b8e0a 100644 --- a/app/home/view/index/layout_article.html +++ b/app/home/view/index/layout_article.html @@ -1,4 +1,4 @@ -
+
知识列表
diff --git a/app/home/view/index/layout_chartview.html b/app/home/view/index/layout_chartview.html index 22f4339..dbed63c 100644 --- a/app/home/view/index/layout_chartview.html +++ b/app/home/view/index/layout_chartview.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/home/view/index/layout_chartyear.html b/app/home/view/index/layout_chartyear.html index 58bca31..56dd851 100644 --- a/app/home/view/index/layout_chartyear.html +++ b/app/home/view/index/layout_chartyear.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/home/view/index/layout_count.html b/app/home/view/index/layout_count.html index c4108a6..3bfe90b 100644 --- a/app/home/view/index/layout_count.html +++ b/app/home/view/index/layout_count.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/home/view/index/layout_event.html b/app/home/view/index/layout_event.html index 403a878..bbbff97 100644 --- a/app/home/view/index/layout_event.html +++ b/app/home/view/index/layout_event.html @@ -1,4 +1,4 @@ -
+

快捷申请

更多
diff --git a/app/home/view/index/layout_note.html b/app/home/view/index/layout_note.html index f232ce2..1d3301a 100644 --- a/app/home/view/index/layout_note.html +++ b/app/home/view/index/layout_note.html @@ -1,4 +1,4 @@ -
+
公告列表
diff --git a/app/home/view/index/layout_project.html b/app/home/view/index/layout_project.html index 4063e2d..76f1239 100644 --- a/app/home/view/index/layout_project.html +++ b/app/home/view/index/layout_project.html @@ -1,4 +1,4 @@ -
+
项目列表
diff --git a/app/home/view/index/layout_task.html b/app/home/view/index/layout_task.html index fc92827..bc8fca7 100644 --- a/app/home/view/index/layout_task.html +++ b/app/home/view/index/layout_task.html @@ -1,4 +1,4 @@ -
+
任务列表
diff --git a/app/home/view/index/mail_list.html b/app/home/view/index/mail_list.html index fd1c248..edcd27d 100644 --- a/app/home/view/index/mail_list.html +++ b/app/home/view/index/mail_list.html @@ -3,10 +3,10 @@ {/block} {block name="body"} -
-
+
+
{volist name="$layout_selected" id="layout"} @@ -75,8 +75,7 @@ {/volist}
- {volist name="$layout_selected" id="layout"} - + {volist name="$layout_selected" id="layout"} {if ( $layout.row == 2) AND ( $layout.name == 'fastentry') } {include file="/index/layout_fastentry" /} {/if} diff --git a/app/home/view/index/menu_classical.html b/app/home/view/index/menu_classical.html new file mode 100644 index 0000000..39a6754 --- /dev/null +++ b/app/home/view/index/menu_classical.html @@ -0,0 +1,47 @@ +
+ + + +
+ \ No newline at end of file diff --git a/app/home/view/index/menu_expand.html b/app/home/view/index/menu_expand.html new file mode 100644 index 0000000..ab9a51a --- /dev/null +++ b/app/home/view/index/menu_expand.html @@ -0,0 +1,70 @@ +
+ + +
+ \ No newline at end of file diff --git a/app/home/view/module/index.html b/app/home/view/module/index.html index 579d3fd..d4e5384 100644 --- a/app/home/view/module/index.html +++ b/app/home/view/module/index.html @@ -1,7 +1,7 @@ {extend name="../../base/view/common/base" /} {block name="body"} -
+
diff --git a/app/home/view/rule/add.html b/app/home/view/rule/add.html index af6262d..9b1c152 100644 --- a/app/home/view/rule/add.html +++ b/app/home/view/rule/add.html @@ -9,10 +9,10 @@ @@ -52,8 +52,7 @@ - + + + +
模块名称父级菜单/节点* - + {volist name=":set_recursion(admin_rule())" id="v"} - + {/volist}
左侧菜单显示* - 左侧菜单显示* @@ -65,6 +64,9 @@ 如：icon-jichupeizhi[查看图标]
注意：作为菜单显示类型时最多展示三级菜单，所以父级菜单/节点选项最大只能选择到2级，非菜单显示类型无限制；一级菜单需要填写菜单图标。
{else/} @@ -72,10 +74,10 @@ @@ -116,8 +118,7 @@ - + + + +
父级菜单/节点* - + {volist name=":set_recursion(admin_rule())" id="v"} - + {/volist}
左侧菜单显示* - 左侧菜单显示* @@ -128,6 +129,9 @@ [查看图标]
注意：作为菜单显示类型时最多展示三级菜单，所以父级菜单/节点选项最大只能选择到2级，非菜单显示类型无限制；一级菜单需要填写菜单图标。
{/if}
@@ -144,18 +148,34 @@ - - - - +