From 46da7429ca192bf6a947d79437e8076b94676a05 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期四, 13 一月 2022 16:29:45 +0800 Subject: [PATCH] update: 刪除重複的 interface: clientInfo => appointment --- PAMapp/components/Client/ClientCard.vue | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue index c140e28..79dc475 100644 --- a/PAMapp/components/Client/ClientCard.vue +++ b/PAMapp/components/Client/ClientCard.vue @@ -6,7 +6,7 @@ class="rowStyle cursor--pointer" justify="space-between" :class="{'new': newAppointment }" - @click.native="openDetail" + @click.native="viewDetail" > <div class="test"> <div class="unread" v-if="isReserved"> @@ -29,13 +29,9 @@ >(摰X�����瘙�)</span> </template> </div> - <div class="unread" style="display:flex"> - <div class="circle"></div> - <div class="line"></div> - <div class="circle"></div> - <div class="line"></div> - <div class="circle"></div> - </div> + <AppointmentProgress + :currentStep="'contacted'" + ></AppointmentProgress> </div> </div> <!-- <el-col :xs="5" :sm="3" align="middle"> @@ -53,7 +49,7 @@ </template> </div> </el-col> --> - + <div class="flex-column contactInfo" :xs="4" :sm="6"> <!-- <div class="smTxt_bold fix-chrome-click--issue" @@ -141,9 +137,9 @@ import appointmentService from '~/shared/services/appointment.service'; import UtilsService from '~/shared/services/utils.service'; import { hideReviews } from '~/shared/const/hide-reviews'; -import { AppointmentMemoInfo, ClientInfo } from '~/shared/models/client.model'; import myConsultantService from '~/shared/services/my-consultant.service'; import { ElRow } from 'element-ui/types/row'; +import { Appointment, AppointmentMemoInfo } from '~/shared/models/appointment.model'; const localStorage = namespace('localStorage'); @Component({ @@ -167,10 +163,10 @@ }) export default class ClientList extends Vue { @Action - updateMyAppointment!: (data: ClientInfo) => void; + updateMyAppointment!: (data: Appointment) => void; @Prop() - client!: ClientInfo; + client!: Appointment; @localStorage.Mutation storageClearAppointmentIdFromMsg!: () => void; @@ -204,6 +200,12 @@ ? JSON.parse(JSON.stringify(this.client.appointmentMemoList[0])) : {appointmentId: 0, content: '', id: 0}; this.memo = this.memoInfo.content; + } + + ////////////////////////////////////////////////////////////////////// + + viewDetail(): void { + this.$router.push(`/appointment/${this.client.id}`); } get newAppointment(): boolean { @@ -353,7 +355,7 @@ margin-bottom: 10px; display: flex; justify-content: space-between; - + transition: background-color 0.5s; &.new { border-left: solid 4px $YELLOW; @@ -367,7 +369,7 @@ .circle { width: 10px; height: 10px; - border-radius: 50px; + border-radius: 50%; background-color: $PRIMARY_RED; margin: auto; } @@ -387,7 +389,6 @@ text-overflow: ellipsis; .professionalsTxt { font-size: 12px; - font-weight: bold; margin-right: 5px; } .noProfessionalsTxt { @@ -445,6 +446,6 @@ height: 4px; width: 10px; background-color: $PRUDENTIAL_GREY; - + } </style> -- Gitblit v1.8.0