From 3ed11c5aacc25c469e8591f66249f5f52c9e8428 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期三, 16 二月 2022 16:38:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3 --- PAMapp/components/Consultant/ConsultantCard.vue | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue index 3fb5605..99e9ba6 100644 --- a/PAMapp/components/Consultant/ConsultantCard.vue +++ b/PAMapp/components/Consultant/ConsultantCard.vue @@ -12,22 +12,27 @@ 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 === 'close' + || 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> - <span v-else>撠<br />皛踵�漲</span> + <span class="unfilled text--center " + style="display:flex" v-else>撠<br />皛踵�漲</span> </template> </div> </el-col> <el-col :xs="10" :sm="15"> <div class="smTxt_bold name">{{agentInfo.name}}</div> + {{agentInfo.appointmentStatus}} <div class="professionals"> <span class="professionalsTxt" @@ -41,7 +46,7 @@ @click="isRemoveAgentPopup = true" >蝘駁</div> <div - v-if="notScoreAppointmentYet" + 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> @@ -87,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> -- Gitblit v1.8.0