修复: 修改不分页面布局问题;

This commit is contained in:
iczer
2020-06-19 17:43:11 +08:00
parent 2e9ebf7b1d
commit 5bbe94728e
12 changed files with 34 additions and 37 deletions

View File

@@ -85,6 +85,7 @@ export default {
padding: 0 12px 0 0;
-webkit-box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-shadow: 0 1px 4px rgba(0,21,41,.08);
z-index: 99;
position: relative;
&.light{
background: #fff;

View File

@@ -30,6 +30,7 @@ import GlobalFooter from './GlobalFooter'
import Drawer from '../components/tool/Drawer'
import SiderMenu from '../components/menu/SiderMenu'
import Setting from '../components/setting/Setting'
import {mapState} from 'vuex'
const minHeight = window.innerHeight - 64 - 24 - 122
@@ -52,21 +53,7 @@ export default {
}
},
computed: {
isMobile () {
return this.$store.state.setting.isMobile
},
theme () {
return this.$store.state.setting.theme
},
layout () {
return this.$store.state.setting.layout
},
linkList () {
return this.$store.state.setting.footerLinks
},
copyright () {
return this.$store.state.setting.copyright
}
...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright']),
},
methods: {
toggleCollapse () {

View File

@@ -5,7 +5,7 @@
@contextmenu.native="e => onContextmenu(e)"
v-if="multiPage"
:active-key="activePage"
style="margin-top: -8px; margin-bottom: 8px"
:style="`margin: -16px auto 8px; ${layout == 'head' ? 'max-width: 1400px;' : ''}`"
:hide-add="true"
type="editable-card"
@change="changePage"
@@ -48,7 +48,7 @@ export default {
}
},
computed: {
...mapState('setting', ['multiPage', 'animate'])
...mapState('setting', ['multiPage', 'animate', 'layout'])
},
created () {
this.pageList.push(this.$route)

View File

@@ -5,7 +5,7 @@
<slot slot="content" name="headerContent"></slot>
<div slot="content" v-if="!this.$slots.headerContent && desc">
<p style="font-size: 14px;line-height: 1.5;color: rgba(0,0,0,.65)">{{desc}}</p>
<div class="link">
<div v-if="this.linkList" class="link">
<template v-for="(link, index) in linkList">
<a :key="index" :href="link.href"><a-icon :type="link.icon" />{{link.title}}</a>
</template>
@@ -54,7 +54,7 @@ export default {
margin: -24px -24px 0;
}
.link{
margin-top: 16px;
/*margin-top: 16px;*/
line-height: 24px;
a{
font-size: 14px;