From e422239791b35a7c466372eda8c99d2775a6bae1 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 14:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/pages/appointment/_appointmentId/index.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index d96baa5..e825ab2 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -14,12 +14,15 @@
<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>
@@ -161,8 +164,9 @@
}
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;
}
--
Gitblit v1.8.0