From 2ca1a76c216ad83d14121519478b8453b14f9b58 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 10 十二月 2021 11:10:21 +0800
Subject: [PATCH] fixed TODO#132097 快速篩選滑動顧問時會觸發頁面上下滑動
---
PAMapp/components/QuickFilter/QuickFilterConsultantList.vue | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue b/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
index 95cb84a..93250cd 100644
--- a/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
+++ b/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
@@ -14,8 +14,8 @@
>
<div
class="fill"
- @touchstart="touchStart"
- @touchend="moveCard"
+ @touchstart="moveStart"
+ @touchend="moveEnd"
>
<UiAvatar
:size="200"
@@ -23,7 +23,9 @@
class="mx-auto"
@click.native="showAgentDetail(item.agentNo)"
></UiAvatar>
- <div class="mdTxt mt-30 mb-30 text--center">{{item.name}}(隡舀��蝬�鈭�)</div>
+ <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,28 +81,36 @@
<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 = '����憿批��';
+ startYPosition = 0;
+ endYPosition = 0;
- touchStart(event: TouchEvent) {
+ moveStart(event: TouchEvent) {
this.startPosition = event.changedTouches[0].clientX;
+ this.startYPosition = event.changedTouches[0].clientY;
}
- moveCard(event: any) {
+ moveEnd(event: TouchEvent) {
this.endPosition = event.changedTouches[0].clientX;
- if (this.endPosition < this.startPosition) {
- this.nextCard();
- }
+ this.endYPosition = event.changedTouches[0].clientY;
+ if (Math.abs(this.endYPosition - this.startYPosition) < 50) {
+ if (this.endPosition < this.startPosition) {
+ this.nextCard();
+ return;
+ }
- if (this.endPosition > this.startPosition) {
- this.prevCard();
+ if (this.endPosition > this.startPosition) {
+ this.prevCard();
+ }
}
}
@@ -112,11 +126,10 @@
this.popUpTxt = txt;
this.isVisiblePopUp = true;
}
+
showAgentDetail(agentNo: string): void {
this.$router.push(`/agentInfo/${agentNo}`);
}
-
-
}
</script>
--
Gitblit v1.8.0