Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3

Mila

2022-01-21 b8b97d75dcfce3de0f33071ae554e055b371809b

 PAMapp/components/NavBar.vue

@@ -7,13 +7,29 @@
      <div class="pam-header__title--sub">預約我的幸福守護者</div>
    </div>
    <div class="pam-header__action-bar">
      <!-- <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
        @click="$router.push('/notification')"></i> -->
      <i
        v-if="currentRole"
        class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
        @click="$router.push('/notification')"
      ></i>
        <el-dropdown :class="{'is-open':isOpenDropdown}"
          ref="dropdown"
          trigger="click"
          @command="routerNavigateTo">
          <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue" @click="isOpenDropdown =!isOpenDropdown" @blur="isOpenDropdown =false"></i>
          <div
            @click="isOpenDropdown =!isOpenDropdown"
            @blur="isOpenDropdown =false">
            <template v-if="isAdminLogin">
              <UiAvatar
              :size="30"
              :agentNo="consultantId"
              class="admin-avatar"
              ></UiAvatar>
            </template>
            <template v-else>
              <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue"></i>
            </template>
          </div>
          <el-dropdown-menu
            class="pam-header__dropdown">
            <template v-for="(item,index) in navBarList">
@@ -41,14 +57,22 @@
  @Component
  export default class NavBar extends Vue {

    @roleStorage.Getter idToken!: string | null;
    @roleStorage.Getter currentRole!: string | null;
    @roleStorage.Getter consultantId!: string | null;
    @roleStorage.Getter
    idToken!: string | null;

    @roleStorage.Mutation storageClear!: () => void;
    @roleStorage.Getter
    currentRole!: string | null;

    @roleStorage.Getter
    consultantId!: string | null;

    @roleStorage.Mutation
    storageClear!: () => void;

    @roleStorage.Getter
    isAdminLogin!: boolean;

    isOpenDropdown = false;
    login_role     = Role.NOT_LOGIN;

    navBarList = [{
        authorityOfRoleList: [Role.NOT_LOGIN],
@@ -190,6 +214,13 @@
          padding: 0px 10px;
        }
      }

      .admin-avatar {
        margin: 0px 15px;
        @media screen and (max-width: 352px) {
          margin: 0px 10px;
        }
      }
    }
  }

@@ -210,11 +241,11 @@
      height: $DESKTOP_NAV_BAR;

      .pam-header__logo {
        width: 180px;
        height: 100%;
        width: 160px;
        height: 70px;
        margin: 0;
        background-image: url('~/assets/images/logo.png');
        background-size: cover;
        background-size: contain;
        background-repeat: no-repeat;
        background-position: center;
      }