From 04bc0c7e0606d7d29f5284df07e60a67b3dd883b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 13 十二月 2021 12:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/Consultant/ConsultantCard.vue | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 46a9d5c..5c773f3 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -11,14 +11,15 @@
: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}}
</span>
<div class="unfilled text--center "
- style="display:flex"
- v-if="agentInfo.contactStatus === 'contacted' &&
+ style="display:flex"
+ v-if="agentInfo.contactStatus === 'contacted' &&
latestContactedAppointment && !latestContactedAppointment.satisfactionScore">�憛�<br />皛踵�漲</div>
<span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
</div>
@@ -28,7 +29,7 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(expertise, index) in expertises"
+ v-for="(expertise, index) in agentInfo.expertise"
:key="index"
>#{{expertise}}</span>
</div>
@@ -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 { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment, AppointmentRequests } from '~/assets/ts/api/consultant';
+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 = {
@@ -198,9 +229,6 @@
return this.agentInfo.img;
}
- get expertises() {
- return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertise;
- }
get gender() {
if (this.appointmentDetail.gender) {
return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
@@ -217,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));
@@ -230,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 {
@@ -239,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
@@ -313,7 +339,6 @@
.unfilled {
font-size: 12px;
padding-top: 5px;
- padding-bottom: 5px;
padding-left: 5px;
}
@@ -389,4 +414,4 @@
margin-bottom: 50px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0