Commit 3e2a1bc1 authored by Nature's avatar Nature

解决content高度100%页面遮挡问题

parent 52404ae0
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
</template> </template>
<script> <script>
import { detectOS } from '../../common/utils/index'
export default { export default {
name: 'HContent', name: 'HContent',
props: { props: {
...@@ -18,9 +17,20 @@ export default { ...@@ -18,9 +17,20 @@ export default {
type: String, type: String,
default: '', default: '',
}, },
calContent: {
type: Boolean,
default: true,
},
}, },
mounted () { mounted () {
if (this.calContent) {
this.contentHeight() this.contentHeight()
}
},
activated () {
if (this.calContent) {
this.contentHeight()
}
}, },
methods: { methods: {
getHeader () { getHeader () {
...@@ -48,9 +58,9 @@ export default { ...@@ -48,9 +58,9 @@ export default {
return height return height
}, },
contentHeight () { contentHeight () {
const headerEl = this.getHeader() // const headerEl = this.getHeader()
const nextHeight = this.getNextElementHeight() const nextHeight = this.getNextElementHeight()
const winHeight = window.innerHeight /* const winHeight = window.innerHeight
const winWidth = window.innerWidth const winWidth = window.innerWidth
let paddingHeight = 0 let paddingHeight = 0
if (headerEl) { if (headerEl) {
...@@ -63,10 +73,13 @@ export default { ...@@ -63,10 +73,13 @@ export default {
} else { } else {
paddingHeight = 0 paddingHeight = 0
} }
} } */
let content = this.$el let content = this.$el
let offsetTop = content.offsetTop let offsetTop = content.offsetTop
content.style.height = (window.innerHeight - offsetTop - paddingHeight - nextHeight) + 'px' if (offsetTop >= window.innerHeight) {
offsetTop = 0
}
content.style.height = (window.innerHeight - offsetTop - nextHeight) + 'px'
}, },
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment