|
@@ -727,7 +727,7 @@ class Menu
|
|
|
$data = $this->all();
|
|
|
|
|
|
$html = '';
|
|
|
- $menu = Dever::input('menu');
|
|
|
+ $menu = Dever::input('parent_menu');
|
|
|
if (layadmin()) {
|
|
|
foreach ($data as $k => $v) {
|
|
|
$v['icon'] = $v['icon'] ? "layui-icon " . $v['icon'] : "layui-icon layui-icon-home";
|
|
@@ -747,7 +747,7 @@ class Menu
|
|
|
$html .= '<a '.$link.' lay-tips="'.$v['name'].'" lay-direction="2">';
|
|
|
$html .= '<i class="'.$v['icon'].'"></i><cite>'.$v['name'].'</cite></a>';
|
|
|
|
|
|
- $html .= $this->getHtmlChild($v, $menu);
|
|
|
+ $html .= $this->getHtmlChild($v);
|
|
|
|
|
|
$html .= '</li>';
|
|
|
}
|
|
@@ -757,15 +757,16 @@ class Menu
|
|
|
return $html;
|
|
|
}
|
|
|
|
|
|
- public function getHtmlChild($v, $menu = '')
|
|
|
+ public function getHtmlChild($v)
|
|
|
{
|
|
|
$html = '';
|
|
|
|
|
|
+ $menu = Dever::input('menu');
|
|
|
if (isset($v['child']) && $v['child']) {
|
|
|
$html .= '<dl class="layui-nav-child">';
|
|
|
foreach ($v['child'] as $k1 => $v1) {
|
|
|
$active = '';
|
|
|
- if ($menu && strstr($menu, $v1['key'])) {
|
|
|
+ if ($menu && $menu == $v1['key']) {
|
|
|
$active = 'layui-this';
|
|
|
} elseif ($v1['key'] == 'console.index') {
|
|
|
$active = 'layui-this';
|