Merge branch 'pollex-dev' into sit

wayne

2022-01-26 6fa4bba623713c396432ba8b863846883d6a1906

 PAMapp/layouts/default.vue

@@ -57,13 +57,13 @@

    // 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'];
      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]        : ['點選下方選項', '尋找你的BEST Match'],
      [FeaturePage.RECOMMEND_CONSULTANT]: ['輸入問題回答', '依照您的需求推薦嚴選顧問'],
      [FeaturePage.QUICK_FILTER]        : ['點選下方選項', '尋找您的BEST Match'],
      [FeaturePage.MY_CONSULTANT_LIST]  : [],
      [FeaturePage.QUESTIONNAIRE]       : [],
    }
@@ -114,6 +114,9 @@
  }

  @include desktop {
    .pam-banner  {
      height: 150px;
    }
    .mt-navBar {
      margin-top: calc($DESKTOP_NAV_BAR + $MOB_NAV_BAR);
    }
@@ -219,4 +222,16 @@
    }
  }

  .notification {
    &-banner {
      background-image: url('~/assets/images/notification/banner_mob.svg');
    }

    @include desktop {
      &-banner {
        background-image: url('~/assets/images/notification/banner_web.svg');
      }
    }
  }

</style>