From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
PAMapp/layouts/default.vue | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index baab485..605a5b5 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -7,15 +7,15 @@
:class="bannerClassName">
<div class="pam-banner__text text--dark-blue">
<div class="mt-5"
- v-for="(item,index) in getBannerTextList"
+ v-for="(bannerText, index) in bannerTextList"
:key="index">
- {{item}}
+ {{ bannerText }}
</div>
</div>
</div>
<div
class="pam-container"
- :class="[containClassName,{'mt-navBar': bannerClassName === 'pam-no-banner'}]"
+ :class="[containClassName, {'mt-navBar': bannerClassName === 'pam-no-banner'} ]"
>
<Nuxt class="pam-page-container"></Nuxt>
</div>
@@ -27,53 +27,60 @@
import { Vue, Component } from 'vue-property-decorator';
import * as _ from 'lodash';
-
@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:'';
+ 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', 'login'];
- return _.includes(needBannerTags, route) ? route + '-banner' : 'pam-no-banner';
+ get bannerTextList(): string[] {
+ return this.bannerText[this.route];
};
get containClassName(): string {
return this.routeFormatContainClass(this.route);
};
+ get bannerClassName() {
+ return this.routeFormatBannerClass(this.route);
+ };
+
+ //////////////////////////////////////////////////////////////////////
+
// format to {page}-container tag
private routeFormatContainClass(route: string): string {
- const needContainBgTags = ['recommendConsultant', 'questionnaire-agentNo'];
- return _.includes(needContainBgTags, route) ? route + '-container' : '';
+ const needContainBgRoutes = ['recommendConsultant', 'questionnaire-agentNo'];
+ return _.includes(needContainBgRoutes, route) ? route + '-container' : '';
};
+
+ // format to {page}-banner or pam-no-banner tag
+ private routeFormatBannerClass(route: string): string {
+ const needBannerRoutes = ['recommendConsultant', 'quickFilter', 'myConsultantList-consultantList', 'myConsultantList-contactedList', 'myAppointmentList-appointmentList', 'myAppointmentList-contactedList', 'login', 'notification'];
+ return _.includes(needBannerRoutes, route) ? route + '-banner' : 'pam-no-banner';
+ };
+
+ private bannerText: FeatureBannerTitle= {
+ [FeaturePage.RECOMMEND_CONSULTANT]: ['頛詨������', '靘����瘙���憿批��'],
+ [FeaturePage.QUICK_FILTER] : ['暺銝����', '撠���EST Match'],
+ [FeaturePage.MY_CONSULTANT_LIST] : [],
+ [FeaturePage.QUESTIONNAIRE] : [],
+ }
+
}
- enum RouterPage {
+
+ enum FeaturePage {
RECOMMEND_CONSULTANT = 'recommendConsultant',
- QUICK_FILTER = "quickFilter",
- MY_CONSULTANT_LIST = "myConsultantList",
- QUESTIONNAIRE = 'questionnaire',
+ QUICK_FILTER = "quickFilter",
+ MY_CONSULTANT_LIST = "myConsultantList",
+ QUESTIONNAIRE = 'questionnaire',
}
- type BannerDto={
- [x:string]:string[];
+
+ interface FeatureBannerTitle {
+ [x:string]: string[];
};
+
</script>
<style lang="scss"
@@ -107,6 +114,9 @@
}
@include desktop {
+ .pam-banner {
+ height: 150px;
+ }
.mt-navBar {
margin-top: calc($DESKTOP_NAV_BAR + $MOB_NAV_BAR);
}
@@ -120,8 +130,6 @@
margin: 30px auto 0px auto;
}
}
-
-
.pam-banner__text {
font-size: 18px;
@@ -144,8 +152,8 @@
background-image: url('~/assets/images/quickFilter/banner_mob.svg');
}
- @media (min-width: 768px) {
- &-banner {
+ @include desktop {
+ &-banner {
background-image: url('~/assets/images/quickFilter/banner_web.svg');
}
}
@@ -162,7 +170,7 @@
background-size: contain;
}
- @media (min-width: 768px) {
+ @include desktop {
&-banner {
background-image: url('~/assets/images/recommendConsultant/banner_web.svg');
background-size: cover;
@@ -173,6 +181,7 @@
background-size: cover;
}
}
+
}
.myConsultantList-consultantList,.myConsultantList-contactedList {
@@ -180,7 +189,7 @@
background-image: url('~/assets/images/myConsultantList/banner_mob.svg');
}
- @media (min-width: 768px) {
+ @include desktop {
&-banner {
background-image: url('~/assets/images/myConsultantList/banner_web.svg');
}
@@ -193,7 +202,7 @@
background-size: contain;
}
- @media (min-width: 768px) {
+ @include desktop {
&-container {
background-image: url('~/assets/images/recommendConsultant/bg_flower_web.svg');
background-size: cover;
@@ -206,11 +215,23 @@
background-image: url('~/assets/images/login/login_mob.svg');
}
- @media (min-width: 768px) {
+ @include desktop {
&-banner {
background-image: url('~/assets/images/login/login_web.svg');
}
}
}
+ .notification {
+ &-banner {
+ background-image: url('~/assets/images/notification/banner_mob.svg');
+ }
+
+ @include desktop {
+ &-banner {
+ background-image: url('~/assets/images/notification/banner_web.svg');
+ }
+ }
+ }
+
</style>
--
Gitblit v1.8.0