rabin 2 years ago
parent
commit
ef849aa27b
3 changed files with 7 additions and 6 deletions
  1. 1 1
      assets/layadmin/html/home.html
  2. 1 1
      assets/layadmin/html/inc/script.html
  3. 5 4
      src/Menu.php

+ 1 - 1
assets/layadmin/html/home.html

@@ -57,7 +57,7 @@
   <script>
   <script>
     layui.config({
     layui.config({
         base: '../script/lib/layui/admin/' //静态资源所在路径
         base: '../script/lib/layui/admin/' //静态资源所在路径
-        ,version:true
+        ,version:false
     }).extend({
     }).extend({
         index: 'lib/index' //主入口模块
         index: 'lib/index' //主入口模块
     }).use('index');
     }).use('index');

+ 1 - 1
assets/layadmin/html/inc/script.html

@@ -39,4 +39,4 @@
 <script type="text/javascript" src="../script/lib/excel/excel.js?v16"></script>
 <script type="text/javascript" src="../script/lib/excel/excel.js?v16"></script>
 
 
 <!-- 加载主要js,很乱,后续优化 -->
 <!-- 加载主要js,很乱,后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?v308"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v309"></script>

+ 5 - 4
src/Menu.php

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