From 38b68f92b9a47ca3947985d6b581603fe05106c7 Mon Sep 17 00:00:00 2001 From: charlie <charlie@lvguanqingdeMacBook-Pro.local> Date: 星期六, 22 一月 2022 11:56:00 +0800 Subject: [PATCH] update: 1. 新增約訪預約資訊頭像圖片和型別icon,微調對齊方式 2. 約訪結案列表的樣式修正並調整進度條色彩 --- PAMapp/components/NavBar.vue | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue index 0427666..3754bfb 100644 --- a/PAMapp/components/NavBar.vue +++ b/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; + } + } } } -- Gitblit v1.8.0