From 4b38e2fdc99e681edfd5ec5d923a9ca8b8de8d38 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期六, 05 八月 2023 16:40:18 +0800 Subject: [PATCH] Fixed: [弱掃] p9.1 Indentation does not match nesting level --- PAMapp/components/Consultant/ConsultantCard.vue | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue index 9dedd37..9163cea 100644 --- a/PAMapp/components/Consultant/ConsultantCard.vue +++ b/PAMapp/components/Consultant/ConsultantCard.vue @@ -1,6 +1,6 @@ <template> <div> - <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }"> + <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime && $route.name !== 'myConsultantList-contactedList' }"> <el-col class="flex_column pl-5" :xs="5" :sm="3"> <UiAvatar :size="50" @@ -12,12 +12,15 @@ class="icon-star pam-icon icon--yellow satisfaction" style="margin-top: 0"></i> <template v-if="isAppointment"> - <span v-if="agentInfo.appointmentScore"> - {{ agentInfo.appointmentScore }} - </span> - <div class="unfilled text--center " - style="display:flex" - v-else>�憛�<br />皛踵�漲</div> + <template v-if="agentInfo.appointmentStatus === 'closed' + || agentInfo.appointmentStatus === 'done'"> + <span v-if="agentInfo.appointmentScore"> + {{ agentInfo.appointmentScore }} + </span> + <div class="unfilled text--center " + style="display:flex" + v-else>�憛�<br />皛踵�漲</div> + </template> </template> <template v-else> <span v-if="agentInfo.avgScore">{{ agentInfo.avgScore }}</span> @@ -42,7 +45,7 @@ @click="isRemoveAgentPopup = true" >蝘駁</div> <div - v-if="notScoreAppointmentYet && (agentInfo.contactStatus !== 'picked' || agentInfo.contactStatus !== 'reserved')" + v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')" class="text--primary text--underline cursor--pointer xsTxt text--bold" @click="reviewsBtn = true">蝯虫�遛��漲閰��</div> </el-col> @@ -73,7 +76,8 @@ <p>�批嚗{gender}}</p> <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p> <p>�璆哨�{appointmentDetail.job}}</p> - <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p> + <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsultationMethod }}</p> + <p>��瘙�{appointmentDetail.requirement ? appointmentDetail.requirement.split(',').join('��') : '--'}}</p> <p v-for="(item, index) in hopeContactTime" :key="index" @@ -88,7 +92,7 @@ </div> </div> - <div v-if="notScoreAppointmentYet " class="reserved-btn"> + <div v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')" class="reserved-btn"> <el-button type="primary" @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button> </div> @@ -171,15 +175,15 @@ return upperNumber[index]; } }, - formatHopeContactTime(item: string): string { + formatHopeContactTime(item: string): string { if (item) { - const [hopeDay, hopeTime] = item.split('��'); - const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay; - const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime; - return `${day}��${time}`; - } - return ''; + const [hopeDay, hopeTime] = item.split('��'); + const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay; + const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime; + return `${day}��${time}`; } + return ''; // 靽格迤嚗宏� if (item) ��� + }, } }) export default class ConsultantCard extends Vue { -- Gitblit v1.8.0