Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

Jack

2021-11-14 97e093b1117b68948d0f9adefacc5368014db380

 PAMapp/components/NavBar.vue

@@ -1,6 +1,6 @@
<template>
    <header class="pam-header">
      <img class="pam-header__logo" src="~/assets/images/logo.png" alt="" @click="$router.push('/login')">
      <img class="pam-header__logo" src="~/assets/images/logo.png" alt="" @click="$router.push('/')">
        <div class="pam-header__title">
          我的幸福我作主
          <div class="pam-header__sub-title">
@@ -12,6 +12,7 @@
          <el-dropdown @command="handleCommand">
            <i class="icon-avatar text--dark-blue cursor--pointer"></i>
            <el-dropdown-menu slot="dropdown" class="pam-header__dropdown">
              <li class="pam-header__dropdown-item" @click="$router.push('/login')">登入</li>
              <li class="pam-header__dropdown-item" @click="$router.push('/accountSetting')">個人帳號設定</li>
              <li class="pam-header__dropdown-item" @click="$router.push('/record/contactRecord')">查看紀錄</li>
              <li class="pam-header__dropdown-item" @click="$router.push('/myConsultantList/consultantList')">我的顧問清單</li>
@@ -49,14 +50,14 @@
    border-left: 1px solid #CCCCCC;
    font-size: 16px;
    font-weight: bold;
    color: #68737A;
    color: $PRUDENTIAL_GREY;
    letter-spacing: 3.6px;
    flex-basis: 140px;
    .pam-header__sub-title {
      padding-top: 2px;
      font-size: 13px;
      font-weight: bold;
      color: #F09491;
      color: $CORAL;
      letter-spacing: 1.2px
    }
  }