From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/pages/quickFilter/index.vue | 454 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 243 insertions(+), 211 deletions(-)
diff --git a/PAMapp/pages/quickFilter/index.vue b/PAMapp/pages/quickFilter/index.vue
index 146abaf..5ec1194 100644
--- a/PAMapp/pages/quickFilter/index.vue
+++ b/PAMapp/pages/quickFilter/index.vue
@@ -1,240 +1,272 @@
<template>
- <div>
- <div class="quickBtnBlock">
- <el-button
- v-for="(question, index) in questionList"
- :key="index"
- class="subTitle quickBtn"
- :disabled="question.name === 'onlineState'"
-
- @click="openDrawer(question)"
- >{{question.title}}</el-button>
- </div>
-
- <h5 class="mdTxt mb-10 mt-30">蝭拚璇辣</h5>
- <div>
- <el-tag
- v-if="selectedItem.gender"
- class="pam-tag p"
- closable
- type="''"
- @close="removeTag('gender')"
- >{{selectedItem.gender}}</el-tag>
- <el-tag
- v-if="selectedItem.satisfaction"
- class="pam-tag p"
- closable
- type="''"
- @close="removeTag('satisfaction')"
- >{{selectedItem.satisfaction + '��誑銝遛��漲'}}</el-tag>
-
- <template v-if="selectedItem.style.length > 0"
- >
- <el-tag
- v-for="(item, index) in selectedItem.style"
- :key="index"
- class="pam-tag p"
- closable
- type="''"
- @close="removeTag('style', index)"
- >{{item}}</el-tag>
- </template>
-
- <div class="mb-10" v-if="selectedItem.onlineState"></div>
- <div class="emptyBox text--mid_grey"
- v-if="!selectedItem.gender && !selectedItem.satisfaction && selectedItem.style.length === 0 && !selectedItem.onlineState">
- <p class="smTxt">撠蝭拚</p>
- </div>
- </div>
-
- <h5 class="mdTxt mb-10 mt-30">敹恍�祟���</h5>
- <template v-if="consultantList.length > 0">
- <QuickFilterConsultantCarousel></QuickFilterConsultantCarousel>
- </template>
-
- <template v-else>
- <div class="emptyBox bg-white"></div>
- </template>
-
- <QuickFilterDrawer
- :drawerVisible.sync="questionDrawer"
- :questionOption="questionOption"
- :selectedItem="selectedItem"
- @selected="selected"
- ></QuickFilterDrawer>
+ <div>
+ <div class="pam-paragraph pam-quick-filter__options">
+ <el-button v-for="(question, index) in questionList"
+ :key="index"
+ class="subTitle pam-quick-filter__btn"
+ :class="{'is-active': isActive(question.name)}"
+ @click="openPopUp(question)">{{question.title}}</el-button>
</div>
+
+ <div class="pam-paragraph">
+ <div class="mdTxt">蝭拚璇辣</div>
+ <div class="mt-10">
+ <template v-if="confirmItem.length > 0">
+ <UiTags v-for="(item, index) in confirmItem"
+ :key="index"
+ @removeTag="removeTag(item.value)">
+ <span v-if="item.option === 'gender'">
+ {{item.value === 'male' ? '���' : '憟單��'}}
+ </span>
+ <span v-else-if="item.option === 'seniority'">
+ {{item.value | formatSeniorityTitle}}
+ <span class="smTxt">{{item.value | formatSenioritySubTitle}}</span>
+ </span>
+ <span v-else-if="item.option === 'avgScore' && !hideReviews">{{item.value + '��誑銝遛��漲'}}</span>
+ <span v-else>{{item.value}}</span>
+ </UiTags>
+ </template>
+ <div v-else
+ class="pam-quick-filter__empty text--mid_grey">
+ <p class="smTxt">撠蝭拚</p>
+ </div>
+ </div>
+ </div>
+
+ <div class="pam-paragraph">
+ <span class="mdTxt">敹恍�祟���</span>
+ <span class="smTxt_bold text--prudential_grey ml-10">� {{consultantList.length}} 蝑�</span>
+ </div>
+
+ <div class="pam-paragraph pam-quick-filter__recommend">
+ <img class="img"
+ alt=""
+ src="~/assets/images/quickFilter/recommend.svg">
+ <template v-if="consultantList.length > 0">
+ <QuickFilterConsultantList :consultantList="consultantList"></QuickFilterConsultantList>
+ </template>
+ <template v-else>
+ <div class="pam-quick-filter__empty text--mid_grey pam-quick-filter__empty--white">
+ <p class="smTxt">撠��鞈��</p>
+ </div>
+ </template>
+ </div>
+
+ <PopUpFrame class="pam-myDemand-dialog"
+ dialogWidth="400px"
+ :isOpen.sync="isOpenQuestionPopUp">
+ <QuickFilterSelector ref="quickFilterRef"
+ :isOpenQuestionPopUp="isOpenQuestionPopUp"
+ :questionOption="questionOption"
+ @confirm="confirm"
+ :confirmItem="confirmItem"></QuickFilterSelector>
+ </PopUpFrame>
+ </div>
</template>
<script lang="ts">
-import { Context } from '@nuxt/types';
-import { Vue, Component } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+ import { Consultant } from '~/shared/models/consultant.model';
+ import { FastQueryParams, QuestionOption, Selected } from '~/shared/models/quick-filter.model';
+ import { questionList } from '~/shared/const/quickFilter-questionList';
+ import { Seniority } from '~/shared/models/enum/seniority';
+ import { Vue, Component, namespace } from 'nuxt-property-decorator';
+ import queryConsultantService from '~/shared/services/query-consultant.service';
+ import _ from 'lodash';
-@Component
-export default class QuickFilter extends Vue {
- consultantList = [];
- questionDrawer = false;
+ const localStorage = namespace('localStorage');
+ const seniorityMap={
+ [Seniority.SENIOR]:{
+ title:'鞈楛',
+ subTitle:'����麾'
+ },
+ [Seniority.YOUNG]:{
+ title:'撟渲��',
+ subTitle:'蝯血僑頛犖銝�����'
+ },
+ [Seniority.UNLIMITED]:{
+ title:'銝��',
+ subTitle:'撟湧翩銝����'
+ },
+ }
+ @Component({
+ filters: {
+ formatSeniorityTitle(value): string{
+ return seniorityMap[value].title
+ },
+ formatSenioritySubTitle(value): string {
+ return seniorityMap[value].subTitle
+ }
+ }
+ })
+ export default class QuickFilter extends Vue {
+ @localStorage.Mutation
+ storageQuickFilter!: (token: string) => void;
+
+ @localStorage.Getter
+ quickFilterSelectedData!: Selected[];
+
+ isOpenQuestionPopUp = false;
+ consultantList: Consultant[] = [];
questionOption = {};
- selectedItem: selectedItem = {
- gender: '',
- satisfaction: 0,
- style: [],
- onlineState: ''
- };
- questionList: QuestionOption[] = [
- {
- name: 'gender',
- title: '憿批��批',
- detail: ['���', '憟單��'],
- type: 'radio'
- },
- {
- name: 'satisfaction',
- title: '憿批�遛��漲',
- detail: [],
- type: ''
- },
- {
- name: 'style',
- title: '皞�◢�',
- detail: ['雓寞��祕', '��翰銝餃��', '���', '�隢◢頞�'],
- type: 'checkbox'
- },
- {
- name: 'onlineState',
- title: '銝�����',
- detail: [],
- type: 'radio'
- }
- ];
+ confirmItem: Selected[] = [];
+ questionList = questionList;
- async asyncData(context: Context) {
- let consultantList: Agents[] = [];
+ ////////////////////////////////////////////////////////////////////// Vue lifeCycle
+ mounted() {
+ if (this.quickFilterSelectedData && this.quickFilterSelectedData.length > 0) {
+ this.confirmItem = this.quickFilterSelectedData;
+ this.getRecommendList();
+ }
+ }
- await context.$service.home.recommendConsultantList().then((result: Agents[]) => {
- consultantList = result;
- })
+ //////////////////////////////////////////////////////////////////////
+ openPopUp(question: QuestionOption) {
+ this.questionOption = question;
+ this.isOpenQuestionPopUp = true;
+ }
+
+ removeTag(value: string) {
+ this.confirmItem = this.confirmItem.filter(item => item.value !== value);
+ this.confirmItem.length > 0 ? this.getRecommendList() : this.consultantList = [];
+ }
+
+ confirm(event: Selected) {
+ this.setConfirmData(event);
+ this.confirmItem.length > 0 ? this.getRecommendList() : this.consultantList = [];
+ this.isOpenQuestionPopUp = false;
+ }
+
+ isActive(name: string) {
+ return name === 'gender' && !!this.getGender()
+ || name === 'avgScore' && !!this.getAvgScore()
+ || name === 'communicationStyles' && !!this.getCommunicationStyles().length
+ || name === 'seniority' && !!this.getSeniority()
+ }
+
+
+ //////////////////////////////////////////////////////////////////////
+ private getGender(): string {
+ return this.filterSingleSelected('gender'); // maybe can use enum ?
+ }
+
+ private getAvgScore(): number {
+ return this.filterSingleSelected('avgScore');
+ }
+
+ private getSeniority(): string {
+ return this.filterSingleSelected('seniority');
+ }
+
+ private getCommunicationStyles(): string[] {
+ return this.confirmItem.filter(item => item.option === 'communicationStyles').map(i => i.value);
+ }
+
+ private filterSingleSelected(name: string) {
+ const filter = this.confirmItem.filter(item => item.option === name);
+ return filter.length > 0 ?
+ filter[0].value :
+ (name === 'avgScore' ? 0 : '');
+ }
+
+ private setConfirmData(event: Selected) {
+ if (event.option === 'communicationStyles') {
+ this.filterCommunicationStyles(event);
+ } else {
+ const findIndex = this.confirmItem.findIndex(item => item.option === event.option);
+ findIndex === -1 ? this.confirmItem.push(event) : this.confirmItem[findIndex] = event;
+ }
+ }
+
+ private filterCommunicationStyles(event: Selected) {
+ const confirmValue = this.confirmItem
+ .filter(item => item.option === 'communicationStyles')
+ .map(i => i.value);
+ const pickerValue = event.value;
+
+ this.confirmItem = this.confirmItem
+ .filter(item => pickerValue.includes(item.value) || item.option !== 'communicationStyles');
+
+ const addValue = pickerValue.filter(item => !confirmValue.includes(item)).map(i => {
return {
- consultantList,
+ option: 'communicationStyles',
+ value: i
}
+ })
+ if (addValue.length > 0) {
+ this.confirmItem.push(...addValue);
+ }
}
- openDrawer(question: QuestionOption) {
- this.questionDrawer = true;
- this.questionOption = question;
+ private getRecommendList() {
+ const data: FastQueryParams = {
+ gender: this.getGender(),
+ communicationStyles: this.getCommunicationStyles(),
+ avgScore: this.getAvgScore(),
+ status: '',
+ seniority: this.getSeniority()
+ }
+
+ queryConsultantService.fastQuery(data).then((consultantList) => {
+ this.consultantList = consultantList;
+ this.storageQuickFilter(JSON.stringify(this.confirmItem))
+ })
}
- selected(event: selectedItem) {
+ }
- const name = event.name;
- if (name === 'gender') {
- this.selectedItem.gender = event.gender;
- }
-
- if (name === 'satisfaction') {
- this.selectedItem.satisfaction = event.satisfaction;
- }
-
- if (name === 'style'){
- this.selectedItem.style = event.style;
- }
-
- }
-
- removeTag(type: string, index: number = 0) {
-
- if (type === 'gender') {
- this.selectedItem.gender = ''
- }
-
- if (type === 'satisfaction') {
- this.selectedItem.satisfaction = 0
- }
-
- if (type === 'style') {
- this.selectedItem.style.splice(index, 1)
- }
-
- }
-
-}
-
-export interface QuestionOption {
- title: string;
- detail: string[];
- type: string;
- name: string;
-}
-
-export interface selectedItem {
- name?: string;
- gender: string;
- satisfaction: number;
- style: string[];
- onlineState: string;
-}
</script>
<style lang="scss" scoped>
- .emptyBox {
- width: 100%;
- height: 100px;
+ .pam-quick-filter__options {
+ display: flex;
+ width: 100%;
+ height: 132px;
+ flex-wrap: wrap;
+ justify-content: space-between;
- border: solid 1px $LIGHT_GREY;
- text-align: center;
+ .pam-quick-filter__btn {
+ width: 48%;
+ height: 56px;
+ text-align: center;
+ box-shadow: 0 0 6px #22222229;
+ border-radius: 10px;
+ border-color: $CORAL;
- .smTxt {
- line-height: 100px;
- }
+ &.is-active {
+ background-color: $CORAL;
+ color: $PRIMARY_WHITE;
+ }
}
- .bg-white {
- background-color: $PRIMARY_WHITE;
+ .pam-quick-filter__btn+.pam-quick-filter__btn {
+ margin-left: 0;
}
+ }
- .quickBtnBlock {
- display: flex;
- width: 100%;
- height: 132px;
- flex-wrap: wrap;
- justify-content: space-between;
+ .pam-quick-filter__empty {
+ width: 100%;
+ height: 100px;
+ border: solid 1px $LIGHT_GREY;
+ text-align: center;
+ border-radius: 10px;
- .quickBtn {
- width: 48%;
- height: 56px;
- text-align: center;
- box-shadow: 0 0 6px #22222229;
- border-color: $PRIMARY_WHITE;
- border-radius: 10px;
- color: $PRIMARY_BLACK;
-
- &:hover,&:focus {
- color: $PRIMARY_BLACK;
- border-color: $PRIMARY_WHITE;
- background-color: $PRIMARY_WHITE;
- }
-
- &:disabled {
- color: $PRIMARY_WHITE;
- border-color: $LIGHT_GREY;
- background-color: $LIGHT_GREY;
- }
- }
- .quickBtn+.quickBtn {
- margin-left: 0;
- }
-
- .is-disabled {
- background-color: $LIGHT_GREY;
- color: $PRIMARY_WHITE;
-
- &:hover,&:focus {
- color: $PRIMARY_WHITE;
- border-color: $LIGHT_GREY;
- background-color: $LIGHT_GREY;
- }
- }
+ .smTxt {
+ line-height: 100px;
}
+ .pam-quick-filter__empty--white{
+ box-shadow: 0 0 6px #00000029;
+ background-color: $PRIMARY_WHITE;
+ }
+ }
-</style>
\ No newline at end of file
+ .pam-quick-filter__recommend {
+ position: relative;
+
+ .img {
+ position: absolute;
+ top: -50px;
+ right: 10px;
+ }
+ }
+</style>
--
Gitblit v1.8.0