From 61695d9b456ad7ef887b15cc9ee332f2e2e3b82e Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期二, 15 二月 2022 16:50:00 +0800
Subject: [PATCH] fix: [ConsultantCard] 滿意度評分功能顯示判斷錯誤

---
 PAMapp/components/Consultant/ConsultantCard.vue |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index d318031..3fb5605 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -8,14 +8,16 @@
                     @click.native="showAgentDetail(agentInfo.agentNo)"
                 ></UiAvatar>
                 <div v-if="!hideReviews" style="display: flex; justify-content: flex-start; align-items: center; margin-top: 6px; font-size: 12px">
-                    <i class="icon-star pam-icon icon--yellow satisfaction" style="margin-top: 0"></i>
-                      <template v-if="isAppointment">
-                      <span v-if="notScoreAppointmentYet">
-                          {{ agentInfo.satisfactionScore }}
+                    <i v-if="isAppointment ? agentInfo.appointmentScore : agentInfo.avgScore"
+                      class="icon-star pam-icon icon--yellow satisfaction"
+                       style="margin-top: 0"></i>
+                    <template v-if="isAppointment">
+                      <span v-if="agentInfo.appointmentScore">
+                          {{ agentInfo.appointmentScore }}
                       </span>
                       <div class="unfilled text--center "
                           style="display:flex"
-                          v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
+                          v-else>�憛�<br />皛踵�漲</div>
                     </template>
                     <template v-else>
                       <span v-if="agentInfo.avgScore">{{ agentInfo.avgScore }}</span>
@@ -75,10 +77,10 @@
                         v-for="(item, index) in hopeContactTime"
                         :key="index"
                     >��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime }}</p>
-                    <div v-if="appointmentDetail.satisfactionScore">
+                    <div v-if="appointmentDetail.appointmentScore">
                         <div class="mdTxt mt-10 mb-10">皛踵�漲</div>
                         <el-rate
-                        :value="appointmentDetail.satisfactionScore"
+                        :value="appointmentDetail.appointmentScore"
                         class="pam-myDemand-dialog__rate"
                         disabled>
                         </el-rate>
@@ -156,7 +158,8 @@
 import { hideReviews } from '~/shared/const/hide-reviews';
 import { Consultant, ConsultantWithAppointmentId } from '~/shared/models/consultant.model';
 import { Appointment } from '~/shared/models/appointment.model';
-import { UserReviewsConsultantsParams } from '~/shared/models/reviews.model';
+import { SatisfactionType } from '~/shared/models/enum/satisfaction-type';
+import { UserReviewParams } from '~/shared/models/reviews.model';
 
 const localStorage = namespace('localStorage');
 @Component({
@@ -217,13 +220,14 @@
         otherRequirement  : null,
         phone             : "",
         requirement       : '',
-        satisfactionScore : 0,
+        appointmentScore : 0,
     };
 
     get notScoreAppointmentYet(): boolean {
       const isAppointment = !!this.agentInfo['appointmentStatus'];
-      if (!isAppointment) return false;
-      return this.agentInfo['appointmentStatus'] !== 'contacted' ? !this.agentInfo['appointmentScore'] : false;
+      return isAppointment
+            ? !this.agentInfo['appointmentScore']
+            : !this.agentInfo.avgScore
     }
 
     get isAppointment(): boolean {
@@ -345,7 +349,7 @@
         appointmentService.getAppointmentDetail(appointmentId!).then(res => {
             this.appointmentDetail = {
                 ...res,
-                satisfactionScore:  this.agentInfo['appointmentScore'],
+                appointmentScore:  this.agentInfo['appointmentScore'],
             };
             this.width = UtilsService.isMobileDevice() ? '80%' : '';
             this.isVisibleDialog = true;
@@ -373,11 +377,12 @@
                           ? this.agentInfo['appointmentId']
                           : this.latestNotClosedAppointment.id;
 
-        const reviewParams: UserReviewsConsultantsParams = {
+        const reviewParams: UserReviewParams = {
             appointmentId: appointmentId,
             score: this.inputScore,
+            type : SatisfactionType.APPOINTMENT,
         }
-        this.appointmentDetail.satisfactionScore = this.inputScore;
+        this.appointmentDetail.appointmentScore = this.inputScore;
 
         reviewsService.userReviewsConsultants(reviewParams).then((res) => {
             this.reviewsBtn = false;

--
Gitblit v1.8.0