|
|
@@ -3,7 +3,7 @@
|
|
|
<app-bar ref="bar"></app-bar>
|
|
|
<router-view v-slot="{ Component }">
|
|
|
<keep-alive :include="keeps">
|
|
|
- <component :is="Component" class="scroll-content" ref="content" />
|
|
|
+ <component :is="Component" class="scroll-content" ref="content" :style="scrollStyle" />
|
|
|
</keep-alive>
|
|
|
</router-view>
|
|
|
<phone-ver></phone-ver>
|
|
|
@@ -29,9 +29,16 @@ export default {
|
|
|
changeTab: this.changeTab
|
|
|
};
|
|
|
},
|
|
|
+ inject: ['barHeight'],
|
|
|
computed: {
|
|
|
barValue() {
|
|
|
return this.$refs.bar;
|
|
|
+ },
|
|
|
+ scrollStyle() {
|
|
|
+ return {
|
|
|
+ boxSizing: 'border-box',
|
|
|
+ minHeight: `calc(100vh - ${(this.barHeight || '0') + 'px'})`
|
|
|
+ };
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
|
@@ -87,8 +94,6 @@ export default {
|
|
|
|
|
|
<style lang="less" scoped>
|
|
|
.scroll-content {
|
|
|
- min-height: calc(100vh - 46px);
|
|
|
- min-height: calc(var(--app-height) - 46px);
|
|
|
box-sizing: border-box;
|
|
|
// padding-top: 46px;
|
|
|
}
|