From 647946725fdb607c8dbcabf30e4a5a94eab2561c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 18:17:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/QuickFilter/QuickFilterConsultantList.vue | 61 ++++++++++--------------------
1 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue b/PAMapp/components/QuickFilter/QuickFilterConsultantList.vue
index cebf8c7..5549620 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,16 @@
>
<div
class="fill"
- @touchstart="touchStart"
- @touchend="moveCard"
>
- <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,7 +64,7 @@
>
<div class="text--center mdTxt">
<p class="mb-50">{{popUpTxt}}</p>
- <p class="text--primary cursor--pointer"
+ <p class="text--primary cursor--pointer fix-chrome-click--issue"
@click="isVisiblePopUp = false">������</p>
</div>
</PopUpFrame>
@@ -81,24 +81,7 @@
export default class QuickFilterConsultantList extends Vue {
@Prop() consultantList!: Consultants[];
isVisiblePopUp = false;
- startPosition = 0;
- endPosition = 0;
popUpTxt = '����憿批��';
-
- touchStart(event: TouchEvent) {
- this.startPosition = event.changedTouches[0].clientX;
- }
-
- moveCard(event: any) {
- this.endPosition = event.changedTouches[0].clientX;
- if (this.endPosition < this.startPosition) {
- this.nextCard();
- }
-
- if (this.endPosition > this.startPosition) {
- this.prevCard();
- }
- }
nextCard() {
(this.$refs.carouselRef as ElCarousel).next();
@@ -112,8 +95,9 @@
this.popUpTxt = txt;
this.isVisiblePopUp = true;
}
-
-
+ showAgentDetail(agentNo: string): void {
+ this.$router.push(`/agentInfo/${agentNo}`);
+ }
}
</script>
@@ -144,7 +128,6 @@
border-radius: 50px;
background-color: $LIGHT_GREY;
color: $CORAL;
- z-index: 2;
cursor: pointer;
&:before {
@@ -153,28 +136,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