From f6d7ed27480f689e147d58bc2164eddce4242d74 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Fri, 5 Nov 2021 17:08:43 +0800
Subject: [PATCH] update

---
 src/components/subnav/main.js        | 4 ++--
 src/pages/home/home.less             | 1 +
 src/pages/system/menu/main/main.less | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index 63894b4e..6cf724e9 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -9,7 +9,7 @@ export default class topNav extends React.Component{
       pathname:'',
       pathname2:sessionStorage.getItem('pathname2'),
       navlists:this.props.listnav,
-      menulinklist:JSON.parse( sessionStorage.getItem('menulinklist')),
+      menulinklist:JSON.parse( sessionStorage.getItem('menulinklist'))?JSON.parse( sessionStorage.getItem('menulinklist')):[],
       linkshowname:sessionStorage.getItem('linkshowname'),
       showflag:JSON.parse( sessionStorage.getItem('showflag'))
      
@@ -69,7 +69,7 @@ export default class topNav extends React.Component{
         </div>
         {/* 级联菜单 */}
         {
-         breakflag==false&&routeflag=='true'&&this.state.menulinklist!=''?(
+         this.state.menulinklist!=''&&breakflag==false&&routeflag=='true'?(
             <div className="linkmenu"  >
             {
               this.state.menulinklist.map((item,key)=>{
diff --git a/src/pages/home/home.less b/src/pages/home/home.less
index b0699bf9..c5d7c586 100644
--- a/src/pages/home/home.less
+++ b/src/pages/home/home.less
@@ -45,6 +45,7 @@
   width: 100%;
   flex: 1;
   margin-top: 60px;
+  overflow: hidden;
   .subtitle{
     height: 60px;
     line-height: 60px;
diff --git a/src/pages/system/menu/main/main.less b/src/pages/system/menu/main/main.less
index cb6d24ca..1caa9d6d 100644
--- a/src/pages/system/menu/main/main.less
+++ b/src/pages/system/menu/main/main.less
@@ -1,7 +1,7 @@
 #systemMenu{
   .menu-body{
       width: 100%;
-      height: 700px;
+      height: 660px;
       margin-top: 8px;
       display:flex;
       justify-content: space-between;
@@ -9,6 +9,8 @@
         width: 350px;
         height: 100%;
         margin-right:15px;
+        padding-bottom: 24px;
+        box-sizing: border-box;
         .zent-card-body[data-zv="9.11.0"]{
           padding: 0;
         }