From 0496faa586224dff0a93ba4abcaeafab6df83aa2 Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期五, 26 十一月 2021 10:19:18 +0800 Subject: [PATCH] fix: TODO#130846 各內頁加上 navbar (web 跑版) --- PAMapp/layouts/default.vue | 209 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 181 insertions(+), 28 deletions(-) diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue index eff35a8..c0c6125 100644 --- a/PAMapp/layouts/default.vue +++ b/PAMapp/layouts/default.vue @@ -1,50 +1,203 @@ <template> - <div class="pam-background"> - <UiGoToTop></UiGoToTop> - <BackActionBar></BackActionBar> - <Nuxt class="page-container" :style="{ height: pageHieght}" ref="pageContainer"></Nuxt> - <Footer ref="defaultLayoutFooter"></Footer> + <div class="pam-background"> + <UiGoToTop></UiGoToTop> + <NavBar></NavBar> + <BackActionBar></BackActionBar> + <div class="pam-banner" + :class="bannerClassName"> + <div class="pam-banner__text text--dark-blue"> + <div class="mt-5" + v-for="(item,index) in getBannerTextList" + :key="index"> + {{item}} + </div> + </div> </div> + <div + class="pam-container" + :class="[containClassName,{'mt-navBar': bannerClassName === 'pam-no-banner'}]" + > + <Nuxt class="pam-page-container"></Nuxt> + </div> + <Footer></Footer> + </div> </template> <script lang="ts"> -import { Vue, Component } from 'vue-property-decorator'; + import { Vue, Component } from 'vue-property-decorator'; + import * as _ from 'lodash'; -@Component -export default class DefaultLayout extends Vue { - pageHieght = ''; - 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'; + @Component + export default class DefaultLayout extends Vue { + private bannerTextDto:BannerDto= { + [RouterPage.RECOMMEND_CONSULTANT]: ['頛詨������', '靘雿��瘙���憿批��'], + [RouterPage.QUICK_FILTER]: ['暺銝����', '撠雿�EST Match'], + [RouterPage.MY_CONSULTANT_LIST]:[], + [RouterPage.QUESTIONNAIRE]:[], } + get getBannerTextList(): string[] { + return this.bannerTextDto[this.route] ? this.bannerTextDto[this.route] : []; + }; + + get route(): string{ + const routeName = this.$route.name; + return routeName ? routeName:''; + }; + + get bannerClassName() { + return this.routeFormatBannerClass(this.route); + }; + + // format to {page}-banner or pam-no-banner tag + private routeFormatBannerClass(route: string): string { + const needBannerTags = ['recommendConsultant', 'quickFilter', 'myConsultantList-consultantList', 'myConsultantList-contactedList', 'myAppointmentList-appointmentList', 'myAppointmentList-contactedList']; + return _.includes(needBannerTags, route) ? route + '-banner' : 'pam-no-banner'; + }; + + get containClassName(): string { + return this.routeFormatContainClass(this.route); + }; + + // format to {page}-container tag + private routeFormatContainClass(route: string): string { + const needContainBgTags = ['recommendConsultant', 'questionnaire-agentNo']; + return _.includes(needContainBgTags, route) ? route + '-container' : ''; + }; } -} + enum RouterPage { + RECOMMEND_CONSULTANT = 'recommendConsultant', + QUICK_FILTER = "quickFilter", + MY_CONSULTANT_LIST = "myConsultantList", + QUESTIONNAIRE = 'questionnaire', + } + type BannerDto={ + [x:string]:string[]; + }; </script> -<style lang="scss" scoped> +<style lang="scss" + scoped> .pam-background { background-color: #F8F9FA; + display: flex; + flex-direction: column; + min-height: 100vh; + .pam-container{ + flex: 1; + } } - .page-container { - padding: 30px 40px; + .pam-page-container { + margin: 30px 20px; + } + + .pam-banner { + width: 100%; + height: 120px; + background-size: cover; + background-repeat: no-repeat; + background-position: center; + position: relative; + @extend .mt-navBar; + } + + .mt-navBar { + margin-top: calc($MOB_NAV_BAR * 2); } @include desktop { - .page-container{ + .mt-navBar { + margin-top: calc($DESKTOP_NAV_BAR + $MOB_NAV_BAR); + } + .pam-page-container { width: 700px; - margin: 0 auto; - overflow-x: hidden; + margin: 30px auto 0px auto; + } + .pam-banner__text{ + width: 700px; + position: static !important; + margin: 30px auto 0px auto; + } + } + + + + .pam-banner__text { + font-size: 18px; + font-weight: bold; + position: absolute; + bottom: 15px; + left: 25px; + + div:first-child { + margin: 0px; + } + } + + .pam-no-banner { + display: none; + } + // page + .quickFilter { + &-banner { + background-image: url('~/assets/images/quickFilter/banner_mob.svg'); + } + + @media (min-width: 768px) { + &-banner { + background-image: url('~/assets/images/quickFilter/banner_web.svg'); + } + } + } + + .recommendConsultant { + &-banner { + background-image: url('~/assets/images/recommendConsultant/banner_mob.svg'); + background-size: cover; + } + + &-container { + background-image: url('~/assets/images/recommendConsultant/bg_flower_mob.svg'); + background-size: contain; + } + + @media (min-width: 768px) { + &-banner { + background-image: url('~/assets/images/recommendConsultant/banner_web.svg'); + background-size: cover; + } + + &-container { + background-image: url('~/assets/images/recommendConsultant/bg_flower_web.svg'); + background-size: cover; + } + } + } + + .myConsultantList-consultantList,.myConsultantList-contactedList { + &-banner { + background-image: url('~/assets/images/myConsultantList/banner_mob.svg'); + } + + @media (min-width: 768px) { + &-banner { + background-image: url('~/assets/images/myConsultantList/banner_web.svg'); + } + } + } + + .questionnaire-agentNo { + &-container { + background-image: url('~/assets/images/recommendConsultant/bg_flower_mob.svg'); + background-size: contain; + } + + @media (min-width: 768px) { + &-container { + background-image: url('~/assets/images/recommendConsultant/bg_flower_web.svg'); + background-size: cover; + } } } -- Gitblit v1.8.0