From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
PAMapp/components/Client/ClientCard.vue | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index f203dd0..7cbde5d 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -54,7 +54,6 @@
></el-avatar>
<div class="satisfaction" v-if="!hideReviews">
<template v-if="client.satisfactionScore">
- TODO:���遛��漲
<i class="icon-star pam-icon icon--yellow satisfaction"></i>
<span>{{client.satisfactionScore}}</span>
</template>
@@ -179,6 +178,7 @@
import { ElRow } from 'element-ui/types/row';
import { Appointment, AppointmentMemoInfo } from '~/shared/models/appointment.model';
import { ContactStatus } from '~/shared/models/enum/contact-status';
+import reviewsService from '~/shared/services/reviews.service';
const appointmentStore = namespace('appointment.store');
const localStorage = namespace('localStorage');
@@ -211,6 +211,9 @@
@appointmentStore.Action
getAppointmentDetail!: (appointmentId: number) => Promise<Appointment>;
+
+ @appointmentStore.Action
+ updateAppointmentDetail!: (id: number) => Appointment;
@appointmentStore.Getter
appointmentProgress!: ContactStatus;
@@ -257,6 +260,10 @@
viewAppointmentDetail(): void {
this.getAppointmentDetail(this.client.id).then((_) => {
+ const unread = !this.client.consultantReadTime;
+ if (unread) {
+ this.readAppointment();
+ }
this.$router.push(`/appointment/${this.client.id}`);
});
}
@@ -266,11 +273,15 @@
}
navigateToCloseAppointment(): void {
- this.$router.push(`/appointment/${this.client.id}/close`);
+ this.getAppointmentDetail(this.client.id).then((_) => {
+ this.$router.push(`/appointment/${this.client.id}/close`);
+ });
}
inviteReview(): void {
- this.isShowInviteReviewDialog = true ;
+ reviewsService.sendSatisfactionToClient(this.client.id).then(res => {
+ this.isShowInviteReviewDialog = true ;
+ })
}
openDetail() {
@@ -289,16 +300,18 @@
}
closeInformDialog(): void {
- const unread = !this.client.consultantReadTime;
- if (unread) {
- appointmentService.recordRead(this.client.id).then((_) => {
- const updatedClient = {...this.client};
- updatedClient.consultantReadTime = new Date().toString();
- this.updateMyAppointmentList(updatedClient);
- });
- };
+ this.readAppointment();
this.isEdit = false;
this.clearAppointmentIdFromMsg();
+ }
+
+ private readAppointment(): void {
+ appointmentService.recordRead(this.client.id).then((_) => {
+ const updatedClient = {...this.client};
+ updatedClient.consultantReadTime = new Date().toString();
+ this.updateMyAppointmentList(updatedClient);
+ this.updateAppointmentDetail(this.client.id);
+ });
}
private clearAppointmentIdFromMsg() {
@@ -451,10 +464,14 @@
.professionals {
overflow : hidden;
text-overflow: ellipsis;
- white-space : nowrap;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
.professionalsTxt {
font-size : 12px;
margin-right: 5px;
+
+
}
.noProfessionalsTxt {
color : $PRUDENTIAL_GREY;
@@ -502,6 +519,7 @@
display: flex;
}
.invite-msg{
+ width: 96px;
color: $PRIMARY_RED;
@extend .text--underline;
}
--
Gitblit v1.8.0