From f36e617e9e534a4b05f2029724d678bbd6c655b3 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 22 十二月 2021 11:38:54 +0800
Subject: [PATCH] refactor: separate api/consultant.ts into serveral services
---
PAMapp/pages/quickFilter/index.vue | 290 ++++++++++++++++++++++++---------------------------------
1 files changed, 121 insertions(+), 169 deletions(-)
diff --git a/PAMapp/pages/quickFilter/index.vue b/PAMapp/pages/quickFilter/index.vue
index 9f56a03..e8f352f 100644
--- a/PAMapp/pages/quickFilter/index.vue
+++ b/PAMapp/pages/quickFilter/index.vue
@@ -5,50 +5,40 @@
v-for="(question, index) in questionList"
:key="index"
class="subTitle quickBtn"
- :disabled="question.name === 'onlineState'"
+ :class="{'isActive': isActive(question.name)}"
@click="openPopUp(question)"
>{{question.title}}</el-button>
</div>
<h5 class="mdTxt mb-10 mt-30">蝭拚璇辣</h5>
<div>
- <Ui-Tags
- v-if="selectedItem.gender"
- @removeTag="removeTag('gender')"
- >
- {{selectedItem.gender}}
- </Ui-Tags>
- <Ui-Tags
- v-if="selectedItem.satisfaction"
- @removeTag="removeTag('satisfaction')"
- >
- {{selectedItem.satisfaction + '��誑銝遛��漲'}}
- </Ui-Tags>
- <template v-if="selectedItem.style.length > 0">
- <Ui-Tags
- v-for="(item, index) in selectedItem.style"
- :key="index"
- @removeTag="removeTag('style', index)"
+ <template v-if="confirmItem.length > 0">
+ <UiTags
+ v-for="(item, index) in confirmItem" :key="index"
+ @removeTag="removeTag(item.value)"
>
- {{item}}
- </Ui-Tags>
+ <span v-if="item.option === 'gender'">{{item.value === 'male' ? '���' : '憟單��'}}</span>
+ <!-- TODO:���遛��漲 -->
+ <!-- <span v-else-if="item.option === 'avgScore'">{{item.value + '��誑銝遛��漲'}}</span> -->
+ <span v-else>{{item.value}}</span>
+ </UiTags>
</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">
+ <div
+ v-else
+ class="emptyBox text--mid_grey"
+ >
<p class="smTxt">撠蝭拚</p>
</div>
</div>
<div class="mb-10 mt-30">
<span class="mdTxt">敹恍�祟���</span>
- <span class="smTxt_bold text--prudential_grey ml-10">� 0 蝑�</span>
+ <span class="smTxt_bold text--prudential_grey ml-10">� {{consultantList.length}} 蝑�</span>
</div>
- <div class="recommend">
+ <div class="recommend pam-paragraph">
<img class="img" src="~/assets/images/quickFilter/recommend.svg" alt="">
<template v-if="consultantList.length > 0">
- <QuickFilterConsultantList></QuickFilterConsultantList>
+ <QuickFilterConsultantList :consultantList="consultantList"></QuickFilterConsultantList>
</template>
<template v-else>
@@ -58,166 +48,135 @@
</template>
</div>
- <Ui-Drawer
- :isVisible.sync="questionDrawer"
- :size="questionOption.name === 'style' ? '50%' : '30%'"
- @closeDrawer="closePopUp"
+ <PopUpFrame
+ :isOpen.sync="isOpenQuestionPopUp"
+ :dialogWidth="'400px'"
+ class="pam-myDemand-dialog"
>
<QuickFilterSelector
ref="quickFilterRef"
- :drawerVisible.sync="questionDrawer"
+ :isOpenQuestionPopUp="isOpenQuestionPopUp"
:questionOption="questionOption"
- :selectedItem="selectedItem"
+ @confirm="confirm"
+ :confirmItem="confirmItem"
></QuickFilterSelector>
- </Ui-Drawer>
-
- <Ui-Dialog :isVisible.sync="questionDialog"
- @closeDialog="closePopUp"
- >
- <QuickFilterSelector
- ref="quickFilterRef"
- :drawerVisible.sync="questionDrawer"
- :questionOption="questionOption"
- :selectedItem="selectedItem"
- ></QuickFilterSelector>
- </Ui-Dialog>
+ </PopUpFrame>
</div>
</template>
<script lang="ts">
-import { Context } from '@nuxt/types';
-import { Vue, Component } from 'nuxt-property-decorator';
-import { Consultants } from '~/assets/ts/api/consultant';
-import { isMobileDevice } from '~/assets/ts/device';
-import QuickFilterDrawer from '~/components/QuickFilter/QuickFilterSelector.vue';
-import { fastQuery } from '~/assets/ts/api/consultant';
+import { Vue, Component, namespace } from 'nuxt-property-decorator';
+import queryConsultantService from '~/shared/services/query-consultant.service';
+import { Consultant } from '~/shared/models/consultant.model';
+import { questionList } from '~/shared/const/quickFilter-questionList';
+import { FastQueryParams, QuestionOption, Selected } from '~/shared/models/quick-filter.model';
+
+const localStorage = namespace('localStorage');
@Component
export default class QuickFilter extends Vue {
- questionDialog = false;
- consultantList = [];
- questionDrawer = false;
+ @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: [
- {
- value: '���',
- className: 'btn_man'
- }, {
- value: '憟單��',
- className: 'btn_woman'
- }],
- type: 'radio',
- },
- {
- name: 'satisfaction',
- title: '憿批�遛��漲',
- detail: [],
- type: ''
- },
- {
- name: 'style',
- title: '皞�◢�',
- detail: [
- {
- value: '雓寞��祕',
- className: 'btn_owl'
- },{
- value: '��翰銝餃��',
- className: 'btn_tiger'
- },{
- value: '���',
- className: 'btn_koala'
- }, {
- value: '�隢◢頞�',
- className: 'btn_peacock'
- }],
- type: 'checkbox'
- },
- {
- name: 'onlineState',
- title: '銝�����',
- detail: [],
- type: 'radio'
- }
- ];
+ confirmItem: Selected[] = [];
+ questionList = questionList;
- async asyncData(context: Context) {
- let consultantList: Consultants[] = [];
-
- // await context.$service.home.recommendConsultantList().then((result: Consultants[]) => {
- // consultantList = result;
- // })
-
- return {
- consultantList,
+ //////////////// lifecycle ////////////////
+ mounted() {
+ if (this.quickFilterSelectedData && this.quickFilterSelectedData.length > 0) {
+ this.confirmItem = this.quickFilterSelectedData;
+ this.getRecommendList();
}
}
+
+ //////////////////////////////////////////
openPopUp(question: QuestionOption) {
this.questionOption = question;
- isMobileDevice() ? this.questionDrawer = true : this.questionDialog = true;
+ this.isOpenQuestionPopUp =true;
}
- 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)
- }
-
+ removeTag(value: string) {
+ this.confirmItem = this.confirmItem.filter(item => item.value !== value);
+ this.confirmItem.length > 0 ? this.getRecommendList() : this.consultantList = [];
}
- closePopUp() {
- this.selectedItem = JSON.parse(JSON.stringify((this.$refs.quickFilterRef as QuickFilterDrawer).pickedItem));
+ confirm(event: Selected) {
+ this.setConfirmData(event);
+ this.confirmItem.length > 0 ? this.getRecommendList() : this.consultantList = [];
+ this.isOpenQuestionPopUp = false;
+ }
- const data = {
- gender: 'male',
- communicationStyle: '雓寞��祕',
- avgScore: 5,
- status: 'online'
+ isActive(name: string) {
+ return name === 'gender' && !!this.gender()
+ || name === 'avgScore' && !!this.avgScore()
+ || name === 'communicationStyles' && !!this.communicationStyles().length
+ }
+
+
+ //////////////// private ////////////////
+ private gender(): string {
+ const filter = this.confirmItem.filter(item => item.option === 'gender').map(i => i.value);
+ return filter.length === 0 ? '' : filter[0];
+ }
+
+ private avgScore(): number {
+ const filter = this.confirmItem.filter(item => item.option === 'avgScore').map(i => i.value);
+ return filter.length === 0 ? '' : filter[0];
+ }
+
+ private communicationStyles(): string[] {
+ return this.confirmItem.filter(item => item.option === 'communicationStyles').map(i => i.value);
+ }
+
+ 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 {
+ option: 'communicationStyles',
+ value: i
+ }
+ })
+ if (addValue.length > 0) {
+ this.confirmItem.push(...addValue);
+ }
+ }
+
+ private getRecommendList() {
+ const data: FastQueryParams = {
+ gender: this.gender(),
+ communicationStyles: this.communicationStyles(),
+ avgScore: this.avgScore(),
+ status: ''
}
- fastQuery(data).then((res) => console.log(res))
+ queryConsultantService.fastQuery(data).then((consultantList) => {
+ this.consultantList = consultantList;
+ this.storageQuickFilter(JSON.stringify(this.confirmItem))
+ })
}
}
-export interface QuestionOption {
- title: string;
- detail: Detail[];
- type: string;
- name: string;
-}
-
-interface Detail {
- value: string;
- className: string;
-}
-
-export interface selectedItem {
- name?: string;
- gender: string;
- satisfaction: number;
- style: string[];
- onlineState: string;
-}
</script>
<style lang="scss" scoped>
@@ -241,7 +200,7 @@
.quickBtnBlock {
display: flex;
width: 100%;
- height: 132px;
+ // height: 132px;
flex-wrap: wrap;
justify-content: space-between;
@@ -251,17 +210,11 @@
text-align: center;
box-shadow: 0 0 6px #22222229;
border-radius: 10px;
- color: $PRIMARY_WHITE;
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
- background-image: url('~/assets/images/quickFilter/btn_bg.svg');
+ border-color: $CORAL;
- &:disabled {
+ &.isActive {
+ background-color: $CORAL;
color: $PRIMARY_WHITE;
- border-color: $LIGHT_GREY;
- background-color: $LIGHT_GREY;
- background-image: none;
}
}
.quickBtn+.quickBtn {
@@ -278,7 +231,6 @@
top: -50px;
right: 10px;
}
-
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0