From 0aac56d220f5764313b333ca1e3adcf7475195e3 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 01 八月 2023 11:52:09 +0800
Subject: [PATCH] Merge branch '2023_CR2' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 2023_CR2

---
 PAMapp/components/Consultant/ConsultantCard.vue      |    2 +-
 /dev/null                                            |   15 ---------------
 PAMapp/pages/index.vue                               |    2 +-
 PAMapp/components/Client/ClientCard.vue              |    2 +-
 PAMapp/plugins/filters/consultation-method.filter.ts |   15 +++++++++++++++
 PAMapp/nuxt.config.js                                |    2 +-
 PAMapp/pages/appointment/_appointmentId/index.vue    |    2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 214dda3..051bc23 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -118,7 +118,7 @@
                 <p>�批嚗�<span>{{gender}}</span></p>
                 <p>撟湧翩嚗�<span>{{client.age | toAgeLabel }}</span></p>
                 <p>�璆哨��<span>{{client.job}}</span></p>
-                <p>隢株岷�撘��<span>{{client.consultationMethod | toConsulType }}</span></p>
+                <p>隢株岷�撘��<span>{{client.consultationMethod | toConsultationMethod }}</span></p>
                 <p>��瘙��<span>{{ client.requirement ? client.requirement.split(',').join('��') : '--' }}</span></p>
                 <p v-for="(item, index) in hopeContactTime"
                     :key="index"
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index f034cbd..6a3fd6c 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -76,7 +76,7 @@
                     <p>�批嚗{gender}}</p>
                     <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
                     <p>�璆哨�{appointmentDetail.job}}</p>
-                    <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsulType }}</p>
+                    <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsultationMethod }}</p>
                     <p>��瘙�{appointmentDetail.requirement ? appointmentDetail.requirement.split(',').join('��') : '--'}}</p>
                     <p
                         v-for="(item, index) in hopeContactTime"
diff --git a/PAMapp/nuxt.config.js b/PAMapp/nuxt.config.js
index a5bf824..50af78f 100644
--- a/PAMapp/nuxt.config.js
+++ b/PAMapp/nuxt.config.js
@@ -39,7 +39,7 @@
     '~/plugins/vue-scroll-picker',
     '~/plugins/filters/date.filter.ts',
     '~/plugins/filters/age.filter.ts',
-    '~/plugins/filters/consult-type.filter.ts',
+    '~/plugins/filters/consultation-method.filter.ts',
     '~/plugins/filters/appointment-fail-reason.filter.ts',
     '~/plugins/filters/serve-area.filter.ts',
   ],
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index 7ef609a..0168980 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -39,7 +39,7 @@
 
         <div class="client-detail-demand__demand-list mb-10">
           <div class="client-detail-demand__demand-list-label">隢株岷<br />�撘�</div>
-          <div class="client-detail-demand__demand-list-content">{{ appointmentDetail.consultationMethod | toConsulType }}</div>
+          <div class="client-detail-demand__demand-list-content">{{ appointmentDetail.consultationMethod | toConsultationMethod }}</div>
         </div>
 
         <div class="client-detail-demand__demand-list mb-10">
diff --git a/PAMapp/pages/index.vue b/PAMapp/pages/index.vue
index 9adeb1c..43d3e60 100644
--- a/PAMapp/pages/index.vue
+++ b/PAMapp/pages/index.vue
@@ -59,7 +59,7 @@
                   <p>�批嚗{gender}}</p>
                   <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
                   <p>�璆哨�{appointmentDetail.job}}</p>
-                  <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsulType }}</p>
+                  <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsultationMethod }}</p>
                   <p>��瘙�{ appointmentDetail.requirement ? appointmentDetail.requirement.split(',').join('��') : '--'}}</p>
                   <p
                       v-for="(item, index) in hopeContactTime"
diff --git a/PAMapp/plugins/filters/consult-type.filter.ts b/PAMapp/plugins/filters/consult-type.filter.ts
deleted file mode 100644
index 86f2a9c..0000000
--- a/PAMapp/plugins/filters/consult-type.filter.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Vue from 'vue'
-
-Vue.filter('toConsulType', (value: string): string => {
-
-  if (!value ||  typeof value !== 'string') {
-    return '--';
-  };
-
-  const consultantTypeLabel = {
-    'online': '蝺��',
-    'offline': '蝺��',
-  };
-
-  return  consultantTypeLabel[value];
-})
diff --git a/PAMapp/plugins/filters/consultation-method.filter.ts b/PAMapp/plugins/filters/consultation-method.filter.ts
new file mode 100644
index 0000000..3c6fe42
--- /dev/null
+++ b/PAMapp/plugins/filters/consultation-method.filter.ts
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+
+Vue.filter('toConsultationMethod', (value: string): string => {
+
+  if (!value ||  typeof value !== 'string') {
+    return '--';
+  };
+
+  const consultationMethodLabel = {
+    'online': '蝺��',
+    'offline': '蝺��',
+  };
+
+  return  consultationMethodLabel[value];
+})

--
Gitblit v1.8.0