Browse Source

bug 修复

lilei 4 years ago
parent
commit
ede3d34e01
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/layouts/BasicLayout.vue

+ 4 - 2
src/layouts/BasicLayout.vue

@@ -39,7 +39,7 @@
         @toggle="toggle"
         @toggle="toggle"
       />
       />
       <!-- layout content -->
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '105px' : '0' }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: multiTab&&fixedHeader ? '105px' : (!multiTab&&fixedHeader?'65px':'0') }">
         <transition name="page-transition">
         <transition name="page-transition">
           <route-view/>
           <route-view/>
         </transition>
         </transition>
@@ -90,7 +90,9 @@ export default {
   computed: {
   computed: {
     ...mapState({
     ...mapState({
       // 动态主路由
       // 动态主路由
-      mainMenu: state => state.permission.routers
+      mainMenu: state => state.permission.routers,
+      multiTab: state => state.app.multiTab,
+      fixedHeader: state => state.app.fixedHeader
     }),
     }),
     contentPaddingLeft () {
     contentPaddingLeft () {
       if (!this.fixSidebar || this.isMobile()) {
       if (!this.fixSidebar || this.isMobile()) {