From 505f666d3ecf3688778c079a8bbfb366d695cf22 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 12 十一月 2021 17:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/layouts/default.vue | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index ef09d65..84883c3 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -3,7 +3,7 @@
<UiGoToTop></UiGoToTop>
<BackActionBar></BackActionBar>
<div class="banner" :class="bannerClassName"></div>
- <Nuxt class="page-container" :style="{ height: pageHieght}" ref="pageContainer"></Nuxt>
+ <Nuxt class="page-container"></Nuxt>
<Footer ref="defaultLayoutFooter"></Footer>
</div>
</template>
@@ -24,22 +24,7 @@
}
noBanner(routerName : string) {
- return routerName.match('communication') || routerName.match('agentInfo');
- }
-
- mounted() {
- window.addEventListener('resize', this.handleResize);
- this.handleResize();
- }
-
- handleResize(): void {
- const pageContainer: any = this.$refs.pageContainer;
- const footer: any = this.$refs.defaultLayoutFooter;
- const pageAlignPadding = 80;
- const deviceExtraHeight = 36;
- if ((pageContainer.$el.clientHeight + footer.$el.clientHeight) < window.innerHeight) {
- this.pageHieght = (window.innerHeight - footer.$el.clientHeight - pageAlignPadding - deviceExtraHeight) + 'px';
- }
+ return routerName.match('questionnaire') || routerName.match('agentInfo');
}
}
@@ -48,6 +33,12 @@
<style lang="scss" scoped>
.pam-background {
background-color: #F8F9FA;
+ display: flex;
+ flex-direction: column;
+ min-height: 100vh;
+ .page-container {
+ flex: 1;
+ }
}
.page-container {
--
Gitblit v1.8.0