From 2c621a6a62570df61c38d0a50c5fc788b502af64 Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期二, 11 一月 2022 10:54:58 +0800 Subject: [PATCH] update: TODO#133608 保戶-調整滿意度評分畫面與wording --- PAMapp/components/QuickFilter/QuickFilterSelector.vue | 2 +- PAMapp/components/Consultant/ConsultantCard.vue | 43 ++++++++++++++++++++++++++++++++----------- PAMapp/assets/scss/vendors/elementUI/_rate.scss | 3 +-- PAMapp/assets/scss/utilities/_heading.scss | 9 +++++---- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/PAMapp/assets/scss/utilities/_heading.scss b/PAMapp/assets/scss/utilities/_heading.scss index 80f3b16..bad59fd 100644 --- a/PAMapp/assets/scss/utilities/_heading.scss +++ b/PAMapp/assets/scss/utilities/_heading.scss @@ -22,10 +22,6 @@ font-weight: bold; } -.lighter { - font-weight: lighter; -} - .smTxt_bold { font-size: 16px; font-weight: bold; @@ -45,6 +41,11 @@ .text--regular { font-weight: normal !important; + font-weight: lighter; +} + +.text--lighter { + font-weight: lighter; } .text--center { diff --git a/PAMapp/assets/scss/vendors/elementUI/_rate.scss b/PAMapp/assets/scss/vendors/elementUI/_rate.scss index cd069c1..1edb22b 100644 --- a/PAMapp/assets/scss/vendors/elementUI/_rate.scss +++ b/PAMapp/assets/scss/vendors/elementUI/_rate.scss @@ -1,6 +1,5 @@ -.pam-quickFilter-rate { +.pam-rate { height: auto; - margin-top: 30px; display: flex; justify-content: center; @extend .fix-chrome-click--issue; diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue index e47a64d..a6cf709 100644 --- a/PAMapp/components/Consultant/ConsultantCard.vue +++ b/PAMapp/components/Consultant/ConsultantCard.vue @@ -33,17 +33,17 @@ v-if="showRemoveBtn" @click="removeAgent" >蝘駁</div> + <div + v-if="notScoreAppointmentYet" + class="text--primary text--underline cursor--pointer xsTxt text--bold" + @click="reviewsBtn = true">蝯虫�遛��漲閰��</div> </el-col> <el-col class="flex_column" :xs="9" :sm="6"> <el-button class="smTxt_bold outline_btn" - @click="reserveCommunication" + @click="reservedOrShowAppointmentInfo" :class="actionBtnStyle" >{{ actionBtnLabel }}</el-button> - <div - v-if="notScoreAppointmentYet" - class="text--primary mt-10 text--center text--underline cursor--pointer" - @click="reviewsBtn = true">蝯虫�遛��漲閰��</div> <div class="updateTime mt-10"> {{ agentInfo.updateTime | formatDate }} </div> @@ -91,13 +91,23 @@ </div> </div> </Ui-Dialog> + <PopUpFrame :isOpen.sync="reviewsBtn"> <div class="mdTxt"> 靽憿批�遛��漲 <span class="hint">������</span> - <div class="dialogInfo-score"> - <el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate> + <div class="mt-30 reviewDialog-content"> + <UiAvatar :size="80" :agentNo="agentInfo.agentNo"></UiAvatar> + <div class="review-text">撠憿批�� + <span class="text--primary">{{agentInfo.name}}</span> + ��擃���蝯虫�嗾憿��嚗� + </div> </div> + + <div class="dialogInfo-score"> + <el-rate v-model="inputScore" class="pam-rate mt-30"></el-rate> + </div> + <div class="dialogInfo-btn"> <el-button type="primary" @@ -172,7 +182,6 @@ hideReviews = hideReviews; isConfirmPopup = false; - appointmentDetail: any = { age : '', agentNo : '', @@ -203,7 +212,7 @@ } get isAppointment(): boolean { - return !!this.agentInfo['appointmentStatus'];; + return !!this.agentInfo['appointmentStatus']; } get latestReservedAppointment(): Appointment { @@ -290,7 +299,7 @@ @Action storeConsultantList!: () => void; - reserveCommunication() { + reservedOrShowAppointmentInfo() { const isAppointment = !!this.agentInfo['appointmentStatus']; const contactStatus = this.agentInfo.contactStatus; if (!isAppointment && (!contactStatus || contactStatus === 'picked')) { @@ -455,7 +464,19 @@ .dialogInfo-score{ display: flex; justify-content: center; - margin-bottom: 50px; + margin-bottom: 30px; + } + .reviewDialog-content { + display: flex; + flex-direction: row; + justify-content: space-evenly; + + .review-text { + width: 60%; + line-height: 28px; + @extend .p; + @extend .text--lighter; + } } </style> diff --git a/PAMapp/components/QuickFilter/QuickFilterSelector.vue b/PAMapp/components/QuickFilter/QuickFilterSelector.vue index 4b43961..5baa545 100644 --- a/PAMapp/components/QuickFilter/QuickFilterSelector.vue +++ b/PAMapp/components/QuickFilter/QuickFilterSelector.vue @@ -71,7 +71,7 @@ <div v-else> <el-rate v-if="!hideReviews" - class="pam-quickFilter-rate" + class="pam-rate mt-30" v-model="pickedItem.avgScore" ></el-rate> </div> -- Gitblit v1.8.0