From 1e1a1294f86d52ff0c9313aed89d2cdd6ba1e347 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 25 一月 2022 08:53:07 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
PAMapp/pages/index.vue | 6 +++---
PAMapp/assets/scss/utilities/_utilities.scss | 4 ++++
PAMapp/pages/appointment/_appointmentId/index.vue | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_utilities.scss b/PAMapp/assets/scss/utilities/_utilities.scss
index ebf13d7..c0281b9 100644
--- a/PAMapp/assets/scss/utilities/_utilities.scss
+++ b/PAMapp/assets/scss/utilities/_utilities.scss
@@ -108,3 +108,7 @@
font-size: #{$fontSize} + 'px';
}
}
+
+.text--break-all {
+ word-break: break-all
+}
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index fa822d6..a64c274 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -29,7 +29,7 @@
<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>
diff --git a/PAMapp/pages/index.vue b/PAMapp/pages/index.vue
index 1aec34c..d62cb87 100644
--- a/PAMapp/pages/index.vue
+++ b/PAMapp/pages/index.vue
@@ -79,7 +79,7 @@
<PopUpFrame
:isOpen.sync="isShowReAppointmentDialog"
- @closePopUp="removeUrlQueryParameter('notContactAppointmentId')"
+ @closePopUp="removeUrlQueryParameter('notContactAppointmentIdFromMsg')"
>
<div class="pam-dialog-review">
<div class="mt-30 text--middle" v-if="agentInfo">
@@ -338,7 +338,7 @@
this.storeConsultantList();
this.storageStrickQueryItem({ requirements: requirements });
this.storageClearNotContactAppointmentIdFromMsg();
- this.removeUrlQueryParameter('notContactAppointmentId');
+ this.removeUrlQueryParameter('notContactAppointmentIdFromMsg');
this.$router.push('/recommendConsultant');
});
}
@@ -347,7 +347,7 @@
appointmentService.cancelAppointment(this.appointmentDetail.id).then(() => {
this.storeConsultantList();
this.storageClearNotContactAppointmentIdFromMsg();
- this.removeUrlQueryParameter('notContactAppointmentId');
+ this.removeUrlQueryParameter('notContactAppointmentIdFromMsg');
this.$router.push('');
});
}
--
Gitblit v1.8.0