From 8b3eac27e27d437014ebbd308f0e7de24cf1fffa Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 25 一月 2022 12:26:09 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/pages/appointment/_appointmentId/index.vue | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index d96baa5..ce81ede 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -14,19 +14,22 @@
<section class="client-detail">
- <div class="client-detail-info">
+ <div class="client-detail-info mb-30">
<div class="client-detail-info__avatar">
<div class="circle">
{{ appointmentDetail.name || 'NO NAME' }}
- <div class="sm-circle">
- {{ appointmentDetail.gender === 'male' ? '�' : '憟�'}}
+ <div class="sm-circle sm-circle-male" v-if="appointmentDetail.gender === 'male'">
+ <i class="icon-sex-male sex-icon"></i>
+ </div>
+ <div class="sm-circle sm-circle-female" v-if="appointmentDetail.gender === 'female'">
+ <i class="icon-sex-female sex-icon"></i>
</div>
</div>
</div>
<div class="client-detail-info__information">
<div>{{ appointmentDetail.age | toAgeLabel }}</div>
<div>{{ appointmentDetail.phone }}</div>
- <div class="text--underline">
+ <div class="text--underline text--break-all">
{{ appointmentDetail.email }}
</div>
</div>
@@ -58,14 +61,14 @@
<div class="client-detail-action" v-if="showWhenAppointmentHasContacted">
<el-button @click="closeAppointment" >蝯��</el-button>
- <el-button @click="sendMsg" style="margin-left: 0px">�/蝝赤</el-button>
- </div>
-
- <div class="client-detail-action" v-if="showWhenAppointmentHasCreate">
- <el-button @click="sendMsg">���赤�</el-button>
+ <el-button @click="sendMsg" style="margin-left: 0px">�蝝赤</el-button>
</div>
</section>
+
+ <div class="client-detail-action btn-center" v-if="showWhenAppointmentHasCreate">
+ <el-button @click="sendMsg">���赤�</el-button>
+ </div>
<template v-if="showWhenAppointmentHasClosed">
<AppointmentClosedInfo :appointmentDetail="appointmentDetail" />
@@ -156,13 +159,14 @@
}
getHopeContactTimeContent(hopeContactTimeString: string): string[] {
- const result = hopeContactTimeString.replace("'", '').split('��');
+ const result = hopeContactTimeString.replaceAll("'", '').split('��');
return result;
}
inviteReview(): void {
- reviewsService.sendSatisfactionToClient(this.appointmentDetail.id).then(res => res);
- this.isShowInviteReviewDialog = true ;
+ reviewsService.sendSatisfactionToClient(this.appointmentDetail.id).then(res => {
+ this.isShowInviteReviewDialog = true;
+ });
}
}
</script>
@@ -189,8 +193,7 @@
height: 100px;
width: 100px;
border-radius: 50%;
- background-color: #fff;
- border: 1px solid $PRIMARY_BLACK;
+ background-image: url('~/assets/images/appointment/avatar_bg.svg');
position: relative;
display: flex;
justify-content: center;
@@ -201,12 +204,26 @@
width: 30px;
border-radius: 50%;
background-color: #fff;
- border: 1px solid $PRIMARY_BLACK;
bottom: 0;
right: 0;
display: flex;
justify-content: center;
align-items: center;
+ .sex-icon {
+ font-size: 20px;
+ &.icon-sex-male{
+ color: $SKY_BLUE;
+ }
+ &.icon-sex-female{
+ color: $CORAL;
+ }
+ }
+ &-male {
+ border: 1px solid $SKY_BLUE;
+ }
+ &-female {
+ border: 1px solid $LIGHT_RED;
+ }
}
}
}
@@ -230,12 +247,14 @@
@extend .mb-10;
@extend .mdTxt;
@extend .mr-10;
+ line-height: 1.3;
color : $DARK_BLUE;
flex-basis: auto;
min-width : 40px;
}
.client-detail-demand__demand-list-content {
text-align: justify;
+ line-height: 1.3;
text-justify: auto;
word-break: break-all;
}
@@ -267,5 +286,9 @@
.hope-contact-time__line {
border-bottom: 1px solid #CCCCCC;
}
+.btn-center{
+ display: flex;
+ justify-content: center;
+ }
</style>
--
Gitblit v1.8.0