From 9cb6d5f92ad7aeda45ad1fe6482dcfc63d17be2b Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期一, 06 十二月 2021 12:35:26 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

---
 PAMapp/pages/myAppointmentList/contactedList.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/PAMapp/pages/myAppointmentList/contactedList.vue b/PAMapp/pages/myAppointmentList/contactedList.vue
index 857d6cd..15954b7 100644
--- a/PAMapp/pages/myAppointmentList/contactedList.vue
+++ b/PAMapp/pages/myAppointmentList/contactedList.vue
@@ -5,6 +5,7 @@
             placeholder="隢撓���摮�"
             class="mb-30 pam-clientReserved-input"
             v-model="keyWord"
+            @keyup.enter.native="search"
         >
             <i
                 slot="suffix"
@@ -19,7 +20,7 @@
         ></ClientList>
 
         <UiPagination
-            :totalList="contactedList"
+            :totalList="filterList"
             @changePage="changePage"
         ></UiPagination>
     </div>
@@ -42,12 +43,11 @@
     onMyAppointmentListChange() {
         this.contactedList = (this.myAppointmentList || [])
             .filter(item => item.communicateStatus === 'contacted')
-            .sort((a, b) => a.appointmentDate > b.appointmentDate ? -1 : 1);
+            .sort((a, b) => a.contactTime > b.contactTime ? -1 : 1);
+        this.filterList = this.contactedList;
     }
 
     mounted() {
-        console.log('ClientContactedList mounted');
-
         this.onMyAppointmentListChange();
     }
 

--
Gitblit v1.8.0