From 97e093b1117b68948d0f9adefacc5368014db380 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期日, 14 十一月 2021 22:43:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/pages/quickFilter/index.vue | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/PAMapp/pages/quickFilter/index.vue b/PAMapp/pages/quickFilter/index.vue
index dd7dd5a..52889a6 100644
--- a/PAMapp/pages/quickFilter/index.vue
+++ b/PAMapp/pages/quickFilter/index.vue
@@ -48,7 +48,7 @@
<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,44 +58,32 @@
</template>
</div>
- <Ui-Drawer
- :isVisible.sync="questionDrawer"
- :size="questionOption.name === 'communicationStyles' ? '50%' : '30%'"
- @closeDrawer="closePopUp"
+ <PopUpFrame
+ :isOpen.sync="questionPopUp"
+ :drawerSize="questionOption.name === 'communicationStyles' ? '50%' : '30%'"
+ @update:isOpen="closePopUp"
>
<QuickFilterSelector
ref="quickFilterRef"
- :drawerVisible.sync="questionDrawer"
+ :drawerVisible.sync="questionPopUp"
:questionOption="questionOption"
:selectedItem="selectedItem"
></QuickFilterSelector>
- </Ui-Drawer>
+ </PopUpFrame>
- <Ui-Dialog :isVisible.sync="questionDialog"
- @closeDialog="closePopUp"
- >
- <QuickFilterSelector
- ref="quickFilterRef"
- :drawerVisible.sync="questionDrawer"
- :questionOption="questionOption"
- :selectedItem="selectedItem"
- ></QuickFilterSelector>
- </Ui-Dialog>
</div>
</template>
<script lang="ts">
import { Vue, Component } from 'nuxt-property-decorator';
-import { FastQueryParams } from '~/assets/ts/api/consultant';
-import { isMobileDevice } from '~/assets/ts/device';
+import { Consultants, FastQueryParams } from '~/assets/ts/api/consultant';
import QuickFilterDrawer from '~/components/QuickFilter/QuickFilterSelector.vue';
import { fastQuery } from '~/assets/ts/api/consultant';
@Component
export default class QuickFilter extends Vue {
- questionDialog = false;
- consultantList = [];
- questionDrawer = false;
+ questionPopUp = false;
+ consultantList: Consultants[] = [];
questionOption = {};
selectedItem: FastQueryParams = {
gender: '',
@@ -147,7 +135,7 @@
openPopUp(question: QuestionOption) {
this.questionOption = question;
- isMobileDevice() ? this.questionDrawer = true : this.questionDialog = true;
+ this.questionPopUp =true;
}
removeTag(type: string, index: number = 0) {
--
Gitblit v1.8.0