From 75443904d27e8678155616f02ddcf1b8c3c799d2 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 10 十二月 2021 09:34:38 +0800
Subject: [PATCH] fixed 輸入錯誤的url 1. 顧問登入下直接導到/myAppointmentList/appointmentList 2. 其餘狀況導到首頁

---
 PAMapp/components/QuickFilter/QuickFilterConsultantList.vue |   63 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue b/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
index cebf8c7..402eb5e 100644
--- a/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
+++ b/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
@@ -5,7 +5,7 @@
         :autoplay="false"
         indicator-position="none"
         arrow="never"
-        class="pam-consultant-carousel"
+        class="pam-quickFilter-carousel"
         ref="carouselRef"
     >
         <el-carousel-item
@@ -14,16 +14,18 @@
         >
             <div
                 class="fill"
-                @touchstart="touchStart"
-                @touchend="moveCard"
+                @touchstart="moveStart"
+                @touchend="moveEnd"
             >
-                <el-avatar
+                <UiAvatar
                     :size="200"
-                    class="mx-auto cursor--pointer"
-                    @click="$router.push('/agentInfo')"
-                    :src="item.img"
-                />
-                <div class="mdTxt mt-30 mb-30 text--center">{{item.name}}(隡舀��蝬�鈭�)</div>
+                    :fileName="item.img"
+                    class="mx-auto"
+                    @click.native="showAgentDetail(item.agentNo)"
+                ></UiAvatar>
+                <div class="mdTxt mt-30 mb-30 text--center"
+                    >{{item.name}}<span v-if="item.role">({{item.role}})</span>
+                </div>
                 <el-row>
                     <el-col :span="12">
                         <div class="smTxt_bold mb-10 text--prudential_grey">����風</div>
@@ -64,8 +66,12 @@
     >
         <div class="text--center mdTxt">
             <p class="mb-50">{{popUpTxt}}</p>
-            <p class="text--primary cursor--pointer"
-                @click="isVisiblePopUp = false">������</p>
+            <div class="text--center">
+                <el-button
+                    type="primary"
+                    @click="isVisiblePopUp = false"
+                >������</el-button>
+            </div>
         </div>
     </PopUpFrame>
 
@@ -75,24 +81,26 @@
 <script lang="ts">
 import { ElCarousel } from 'element-ui/types/carousel';
 import { Vue, Component, Prop } from 'vue-property-decorator';
-import { Consultants } from '~/assets/ts/api/consultant';
+import { Consultant } from '~/assets/ts/models/consultant.model';
+
 
 @Component
 export default class QuickFilterConsultantList extends Vue {
-    @Prop() consultantList!: Consultants[];
+    @Prop() consultantList!: Consultant[];
     isVisiblePopUp = false;
+    popUpTxt = '����憿批��';
     startPosition = 0;
     endPosition = 0;
-    popUpTxt = '����憿批��';
 
-    touchStart(event: TouchEvent) {
+    moveStart(event: TouchEvent) {
         this.startPosition = event.changedTouches[0].clientX;
     }
 
-    moveCard(event: any) {
+    moveEnd(event: TouchEvent) {
         this.endPosition = event.changedTouches[0].clientX;
         if (this.endPosition < this.startPosition) {
             this.nextCard();
+            return;
         }
 
         if (this.endPosition > this.startPosition) {
@@ -113,7 +121,9 @@
         this.isVisiblePopUp = true;
     }
 
-
+    showAgentDetail(agentNo: string): void {
+        this.$router.push(`/agentInfo/${agentNo}`);
+    }
 }
 </script>
 
@@ -144,7 +154,6 @@
         border-radius: 50px;
         background-color: $LIGHT_GREY;
         color: $CORAL;
-        z-index: 2;
         cursor: pointer;
 
         &:before {
@@ -153,28 +162,26 @@
         }
     }
 
-    .pam-right-arrow {
-        &:before {
-            margin-left: 15px;
-        }
+    .pam-left-arrow:before {
+        margin-left: 25px;
     }
 
-    .pam-left-arrow {
-        &:before {
-            margin-left: 25px;
-        }
+    .pam-right-arrow:before {
+        margin-left: 15px;
     }
 
     .arrow-right-position {
         top: 50%;
-        right: -60px;
+        right: -40px;
         transform: translateY(-50%);
+        z-index: 3;
     }
 
     .arrow-left-position {
         top: 50%;
-        left: -60px;
+        left: -40px;
         transform: translateY(-50%);
+        z-index: 3;
     }
 
     .relative {

--
Gitblit v1.8.0