|
@@ -39,7 +39,7 @@
|
|
|
@toggle="toggle"
|
|
|
/>
|
|
|
<!-- 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">
|
|
|
<route-view/>
|
|
|
</transition>
|
|
@@ -90,7 +90,9 @@ export default {
|
|
|
computed: {
|
|
|
...mapState({
|
|
|
// 动态主路由
|
|
|
- mainMenu: state => state.permission.routers
|
|
|
+ mainMenu: state => state.permission.routers,
|
|
|
+ multiTab: state => state.app.multiTab,
|
|
|
+ fixedHeader: state => state.app.fixedHeader
|
|
|
}),
|
|
|
contentPaddingLeft () {
|
|
|
if (!this.fixSidebar || this.isMobile()) {
|