From 8b822da7e688aa31e4600f9ea17a0e85f9985c06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 10:20:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/layouts/default.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/PAMapp/layouts/default.vue b/PAMapp/layouts/default.vue
index 3c838af..fe86610 100644
--- a/PAMapp/layouts/default.vue
+++ b/PAMapp/layouts/default.vue
@@ -36,17 +36,18 @@
return this.bannerTextDto[this.route] ? this.bannerTextDto[this.route] : [];
};
- get route(): string {
- return _.split(this.$route.name, '-')[0];
+ get route(): string{
+ const routeName = this.$route.name;
+ return routeName ? routeName:'';
};
get bannerClassName() {
- return this.route ? this.routeFormatBannerClass(this.route) : '';
+ return this.routeFormatBannerClass(this.route);
};
// format to {page}-banner or pam-no-banner tag
private routeFormatBannerClass(route: string): string {
- const needBannerTags = ['recommendConsultant', 'quickFilter', 'myConsultantList'];
+ const needBannerTags = ['recommendConsultant', 'quickFilter', 'myConsultantList-consultantList','myAppointmentList-appointmentList'];
return _.includes(needBannerTags, route) ? route + '-banner' : 'pam-no-banner';
};
@@ -56,7 +57,7 @@
// format to {page}-container tag
private routeFormatContainClass(route: string): string {
- const needContainBgTags = ['recommendConsultant', 'questionnaire'];
+ const needContainBgTags = ['recommendConsultant', 'questionnaire-agentNo'];
return _.includes(needContainBgTags, route) ? route + '-container' : '';
};
}
@@ -160,7 +161,7 @@
}
}
- .myConsultantList {
+ .myConsultantList-consultantList {
&-banner {
background-image: url('~/assets/images/myConsultantList/banner_mob.svg');
}
@@ -172,7 +173,7 @@
}
}
- .questionnaire {
+ .questionnaire-agentNo {
&-container {
background-image: url('~/assets/images/recommendConsultant/bg_flower_mob.svg');
background-size: contain;
@@ -185,4 +186,15 @@
}
}
}
+ .myAppointmentList-appointmentList{
+ &-banner {
+ background-image: url('~/assets/images/myAppointmentList/agent_banner_mob.svg');
+ }
+
+ @media (min-width: 768px) {
+ &-banner {
+ background-image: url('~/assets/images/myAppointmentList/agent_banner_web.svg');
+ }
+ }
+ }
</style>
--
Gitblit v1.8.0