From 945df9fec87c64d45f4a8878f302afe052a9bee3 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 19 十一月 2021 15:15:55 +0800
Subject: [PATCH] update#130453: [諮詢前問項] : b. 再度登入時,進行預約諮詢前的問項資料會自動帶入,此為phase 1範圍,待處理

---
 PAMapp/components/Client/ClientCard.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 6bfcef1..1fffe7c 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -54,8 +54,8 @@
                 <p>�批嚗{gender}}</p>
                 <p>撟湧翩嚗{client.age}}</p>
                 <p>�璆哨�{client.job}}</p>
-                <p>��瘙�{client.requirement.replace(',', '��')}}</p>
-                <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+                <p>��瘙�{client.requirement.split(',').join('��')}}</p>
+                <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime}}</p>
                 </div>
                 <div class="mt-30 text--center" v-if="isReserved">
                     <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
@@ -76,6 +76,15 @@
                 const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���']
                 return upperNumber[index];
             }
+        },
+        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 '';
         }
     }
 })
@@ -205,4 +214,4 @@
     .text-right {
         text-align: right;
     }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.8.0