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/Consultant/ConsultantCard.vue |  172 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 88 insertions(+), 84 deletions(-)

diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index f774135..a6cf709 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,54 +1,52 @@
 <template>
     <div>
         <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }">
-
-            <el-col :xs="2" :sm="1"></el-col>
-            <el-col :xs="22" :sm="23">
-                <el-row type="flex">
-                    <el-col class="flex_column" :xs="5" :sm="3">
-                        <UiAvatar
-                            :size="50"
-                            :fileName="avatarFileName"
-                            @click.native="showAgentDetail(agentInfo.agentNo)"
-                        ></UiAvatar>
-                        <!-- TODO:���遛��漲 -->
-                        <div v-if="!hideReviews">
-                            <i class="icon-star pam-icon icon--yellow satisfaction"  v-if="notScoreAppointmentYet"></i>
-                            <span v-if="notScoreAppointmentYet">
-                                {{ agentInfo.satisfactionScore }}
-                            </span>
-                            <div class="unfilled text--center "
-                                style="display:flex"
-                                v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
-                            <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
-                        </div>
-                    </el-col>
-                    <el-col :xs="10" :sm="15">
-                        <div class="smTxt_bold name">{{agentInfo.name}}</div>
-                        <div class="professionals">
-                            <span
-                                class="professionalsTxt"
-                                v-for="(expertise, index) in agentInfo.expertise"
-                                :key="index"
-                            >#{{expertise}}</span>
-                        </div>
-                        <div
-                            class="delete"
-                            v-if="showRemoveBtn"
-                            @click="removeAgent"
-                        >蝘駁</div>
-                    </el-col>
-                    <el-col class="flex_column" :xs="9" :sm="6">
-                        <el-button
-                            class="smTxt_bold outline_btn"
-                            @click="reserveCommunication"
-                            :class="actionBtnStyle"
-                        >{{ actionBtnLabel }}</el-button>
-                        <div class="updateTime mt-10">
-                            {{ displayTime | formatDate }}
-                        </div>
-                    </el-col>
-                </el-row>
+            <el-col class="flex_column pl-5" :xs="5" :sm="3">
+                <UiAvatar
+                    :size="50"
+                    :agentNo="agentInfo.agentNo"
+                    @click.native="showAgentDetail(agentInfo.agentNo)"
+                ></UiAvatar>
+                <!-- TODO:���遛��漲 -->
+                <div v-if="!hideReviews">
+                    <i class="icon-star pam-icon icon--yellow satisfaction"  v-if="notScoreAppointmentYet"></i>
+                    <span v-if="notScoreAppointmentYet">
+                        {{ agentInfo.satisfactionScore }}
+                    </span>
+                    <div class="unfilled text--center "
+                        style="display:flex"
+                        v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
+                    <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
+                </div>
+            </el-col>
+            <el-col :xs="10" :sm="15">
+                <div class="smTxt_bold name">{{agentInfo.name}}</div>
+                <div class="professionals">
+                    <span
+                        class="professionalsTxt"
+                        v-for="(expertise, index) in agentInfo.expertise"
+                        :key="index"
+                    >#{{expertise}}</span>
+                </div>
+                <div
+                    class="delete"
+                    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="reservedOrShowAppointmentInfo"
+                    :class="actionBtnStyle"
+                >{{ actionBtnLabel }}</el-button>
+                <div class="updateTime mt-10">
+                    {{ agentInfo.updateTime | formatDate }}
+                </div>
             </el-col>
         </el-row>
 
@@ -93,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"
@@ -129,12 +137,13 @@
 <script lang="ts">
 import { Vue, Component, Prop, Action, namespace } from 'nuxt-property-decorator';
 
-import appointmentService from '~/assets/ts/services/appointment.service';
-import { isMobileDevice } from '~/assets/ts/device';
-import { hideReviews } from '~/assets/ts/const/hide-reviews';
-import { UserReviewsConsultantsParams, userReviewsConsultants } from '~/assets/ts/api/consultant';
-import { Consultant, ConsultantWithAppointmentId } from '~/assets/ts/models/consultant.model';
-import { Appointment } from '~/assets/ts/models/appointment.model';
+import appointmentService from '~/shared/services/appointment.service';
+import reviewsService from '~/shared/services/reviews.service';
+import UtilsService from '~/shared/services/utils.service';
+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';
 
 const localStorage = namespace('localStorage');
 @Component({
@@ -173,7 +182,6 @@
     hideReviews = hideReviews;
     isConfirmPopup = false;
 
-
     appointmentDetail: any = {
         age               : '',
         agentNo           : '',
@@ -204,7 +212,7 @@
     }
 
     get isAppointment(): boolean {
-      return !!this.agentInfo['appointmentStatus'];;
+      return !!this.agentInfo['appointmentStatus'];
     }
 
     get latestReservedAppointment(): Appointment {
@@ -226,27 +234,6 @@
       } else {
         return this.agentInfo.contactStatus === 'picked' || !this.agentInfo.contactStatus;
       }
-    }
-
-    get displayTime(): string {
-      const isAppointment = !!this.agentInfo['appointmentStatus'];
-      let time: Date | string = '';
-      if (isAppointment) {
-        time = this.agentInfo['appointmentDate'];
-      } else {
-        switch(this.agentInfo.contactStatus) {
-            case 'reserved':
-                time = this.agentInfo.updateTime;
-                break;
-            case 'picked':
-                time = this.agentInfo.updateTime;
-                break;
-        }
-      }
-        if (typeof time !== 'string') {
-          time.toString();
-        }
-        return time as string;
     }
 
     get avatarFileName() {
@@ -312,7 +299,7 @@
     @Action
     storeConsultantList!: () => void;
 
-    reserveCommunication() {
+    reservedOrShowAppointmentInfo() {
       const isAppointment = !!this.agentInfo['appointmentStatus'];
       const contactStatus = this.agentInfo.contactStatus;
         if (!isAppointment && (!contactStatus || contactStatus === 'picked')) {
@@ -333,7 +320,7 @@
                 ...res,
                 satisfactionScore:  this.agentInfo['appointmentScore'],
             };
-            this.width = isMobileDevice() ? '80%' : '';
+            this.width = UtilsService.isMobileDevice() ? '80%' : '';
             this.isVisibleDialog = true;
         });
     }
@@ -348,13 +335,18 @@
     }
 
     userReviewsConsultants() {
+      const isAppointment = !!this.agentInfo['appointmentStatus'];
+      const appointmentId = isAppointment
+                          ? this.agentInfo['appointmentId']
+                          : this.latestReservedAppointment.id;
+
         const reviewParams: UserReviewsConsultantsParams = {
-            appointmentId: this.appointmentDetail.id,
+            appointmentId: appointmentId,
             score: this.inputScore,
         }
         this.appointmentDetail.satisfactionScore = this.inputScore;
 
-        userReviewsConsultants(reviewParams).then((res) => {
+        reviewsService.userReviewsConsultants(reviewParams).then((res) => {
             this.reviewsBtn = false;
             this.storeConsultantList();
         });
@@ -472,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>

--
Gitblit v1.8.0