From 60dc6e178e4ab05ea8f62f7baa1dd72a5c20f93c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期一, 13 十二月 2021 16:10:13 +0800
Subject: [PATCH] fixed#132096: 查看完聯絡清單(或登出後再登入)，顧問清單的黃點並不會消失
---
PAMapp/components/Consultant/ConsultantCard.vue | 86 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 30 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 994bd0d..2f161fb 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,8 +1,8 @@
<template>
<div>
- <el-row type="flex" class="rowStyle">
+ <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }">
- <el-col :xs="2" :sm="1" :class="{'state': agentInfo.new}"></el-col>
+ <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">
@@ -11,7 +11,8 @@
:fileName="avatarFileName"
@click.native="showAgentDetail(agentInfo.agentNo)"
></UiAvatar>
- <div>
+ <!-- TODO:���遛��漲 -->
+ <div v-if="!hideReviews">
<i class="icon-star pam-icon icon--yellow satisfaction" v-if="!(latestContactedAppointment && !latestContactedAppointment.satisfactionScore)"></i>
<span v-if="agentInfo.contactStatus === 'contacted' && latestContactedAppointment && latestContactedAppointment.satisfactionScore">
{{ latestContactedAppointment && latestContactedAppointment.satisfactionScore}}
@@ -45,7 +46,9 @@
@click="reserveCommunication"
:class="agentInfo.contactStatus + 'Btn'"
>{{ contactTxt }}</el-button>
- <div class="updateTime" v-if="updateTime">{{updateTime | formatDate}}</div>
+ <div class="updateTime mt-10">
+ {{ displayTime | formatDate }}
+ </div>
</el-col>
</el-row>
</el-col>
@@ -72,14 +75,14 @@
:key="index"
>��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime }}</p>
<div v-if="appointmentDetail.satisfactionScore">
- <div class="mdTxt mt-10 mb-10">皛踵�漲</div>
- <el-rate
- :value="appointmentDetail.satisfactionScore"
- class="pam-myDemand-dialog__rate"
- disabled>
- </el-rate>
+ <div class="mdTxt mt-10 mb-10">皛踵�漲</div>
+ <el-rate
+ :value="appointmentDetail.satisfactionScore"
+ class="pam-myDemand-dialog__rate"
+ disabled>
+ </el-rate>
</div>
- </div>
+ </div>
<div v-if="agentInfo.contactStatus === 'contacted'
&& !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
@@ -93,7 +96,7 @@
</div>
</div>
</Ui-Dialog>
- <PopUpFrame :isOpen.sync="reviewsBtn" drawerSize='30%'>
+ <PopUpFrame :isOpen.sync="reviewsBtn">
<div class="mdTxt">
靽憿批�遛��漲
<span class="hint">������</span>
@@ -120,13 +123,14 @@
</template>
<script lang="ts">
-import { Vue, Component, Prop, Action } from 'nuxt-property-decorator';
+import { Vue, Component, Prop, Action, namespace } from 'nuxt-property-decorator';
import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment } from '~/assets/ts/api/consultant';
import { Consultant, Appointment } from '~/assets/ts/models/consultant.model';
-import { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';
+import { Role } from '~/assets/ts/models/enum/Role';
+import { hideReviews } from '~/assets/ts/const/hide-reviews';
-
+const roleStorage = namespace('localStorage');
@Component({
filters: {
formatNumber(index: number) {
@@ -150,12 +154,15 @@
@Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
@Action storeConsultantList!: any;
@Prop() agentInfo!: Consultant;
+ @roleStorage.Getter currentRole!:string;
+
isVisibleDialog = false;
reviewsBtn = false;
status = false;
width: string = '';
inputScore = 0;
isCancelPopup = false;
+ hideReviews = hideReviews;
get latestContactedAppointment(): Appointment | null {
if (!(this.agentInfo && this.agentInfo.appointments && this.agentInfo.appointments.length)) return null;
@@ -168,7 +175,31 @@
get latestReservedAppointment(): Appointment {
return this.agentInfo.appointments!
.filter((appointment) => appointment.communicateStatus !== 'contacted')
- .sort((preAppointment, nextAppointment) => +nextAppointment.appointmentDate - +preAppointment.appointmentDate)[0];
+ .map((reversedAppointment) => {
+ return {
+ ...reversedAppointment,
+ sortDate: new Date(reversedAppointment.appointmentDate)
+ }
+ })
+ .sort((preAppointment, nextAppointment) => +nextAppointment.sortDate - +preAppointment.sortDate)[0];
+ }
+ get displayTime(): string {
+ let time: Date | string = '';
+ switch(this.agentInfo.contactStatus) {
+ case 'reserved':
+ time = this.agentInfo.updateTime
+ break;
+ case 'contacted':
+ time = this.agentInfo.updateTime
+ break;
+ case 'picked':
+ time = this.agentInfo.createTime
+ break;
+ }
+ if (typeof time !== 'string') {
+ time.toString();
+ }
+ return time as string;
}
appointmentDetail: any = {
@@ -214,10 +245,6 @@
return '�脰����';
}
- get updateTime() {
- return isLogin() ? this.agentInfo.updateTime : '';
- }
-
get hopeContactTime() {
const contactList = this.appointmentDetail.hopeContactTime
.split("'").map(item => item.slice(0, item.length));
@@ -227,7 +254,7 @@
reserveCommunication() {
const contactStatus = this.agentInfo.contactStatus;
if (!contactStatus || contactStatus === 'picked') {
- isLogin()
+ this.currentRole === Role.USER
? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
: this.$router.push('/login');
} else {
@@ -236,9 +263,11 @@
}
openPopUp() {
- getAppointmentDetail(this.latestContactedAppointment
- ? this.latestContactedAppointment.id
- : this.latestReservedAppointment.id).then(res => {
+ const appointmentId = this.agentInfo.contactStatus === 'contacted'
+ ? this.latestContactedAppointment?.id
+ : this.latestReservedAppointment.id;
+
+ getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
...this.appointmentDetail,
...res.data
@@ -293,13 +322,10 @@
margin-bottom: 10px;
display: flex;
justify-content: space-between;
+ border-left: 4px solid transparent;
- .state {
- width: 10px;
- height: 10px;
- border-radius: 50px;
- background-color: $YELLOW;
- margin: auto 0;
+ &.new {
+ border-color: $YELLOW;
}
.satisfaction {
--
Gitblit v1.8.0