From 1d6d2d14200ed9432347ef8013e3fc117fa2161b Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 20 一月 2022 14:57:27 +0800
Subject: [PATCH] Merge branch 'master' into Phase3
---
PAMapp/components/QuickFilter/QuickFilterSelector.vue | 93 ++++++++++++++--------------------------------
1 files changed, 29 insertions(+), 64 deletions(-)
diff --git a/PAMapp/components/QuickFilter/QuickFilterSelector.vue b/PAMapp/components/QuickFilter/QuickFilterSelector.vue
index b286ecf..5baa545 100644
--- a/PAMapp/components/QuickFilter/QuickFilterSelector.vue
+++ b/PAMapp/components/QuickFilter/QuickFilterSelector.vue
@@ -33,31 +33,23 @@
</el-checkbox-group>
</div>
<!-------------------- 撟渲�� -------------------->
- <div class="quickBtnBlock pam-radio-group"
+ <div class="quickBtnBlock"
v-else-if="questionOption.name === 'seniority'"
>
- <div
- v-for="(i, index) in questionOption.detail"
- :key="index"
- class="pam-radio"
+ <el-radio-group
+ class="pam-quickFilter-radio pam-radio-group"
+ v-model="pickedItem.seniority"
>
- <input
- :id="i.value"
- type="radio"
- name="seniority"
- :value="i.value"
- class="el-radio-input"
- v-model="pickedItem.seniority"
- >
- <label
- :for="i.value"
- class="el-radio-label"
+ <el-radio
+ v-for="(i, index) in questionOption.detail"
+ :key="index"
+ :label="i.value"
:class="i.className"
>
- <p>{{i.name}}</p>
- <p class="subtitle">{{i.subTitle}}</p>
- </label>
- </div>
+ <div>{{i.name}}</div>
+ <div class="subtitle">{{i.subTitle}}</div>
+ </el-radio>
+ </el-radio-group>
</div>
<!-------------------- �批 -------------------->
<div class="quickBtnBlock"
@@ -79,7 +71,7 @@
<div v-else>
<el-rate
v-if="!hideReviews"
- class="pam-quickFilter-rate"
+ class="pam-rate mt-30"
v-model="pickedItem.avgScore"
></el-rate>
</div>
@@ -98,10 +90,19 @@
<script lang="ts">
import { Vue, Component, Prop, Watch, Emit } from 'nuxt-property-decorator';
-import { hideReviews } from '~/assets/ts/const/hide-reviews';
-import { FastQueryParams, QuestionOption, Selected } from '~/assets/ts/models/quickFilter.model';
+import { hideReviews } from '~/shared/const/hide-reviews';
+import { FastQueryParams, QuestionOption, Selected } from '~/shared/models/quick-filter.model';
@Component
export default class QuickFilterDrawer extends Vue {
+ @Prop()
+ questionOption!: QuestionOption;
+
+ @Prop()
+ isOpenQuestionPopUp!: boolean;
+
+ @Prop()
+ confirmItem!: Selected[];
+
pickedItem: FastQueryParams = {
communicationStyles: [],
status: '',
@@ -111,9 +112,7 @@
}
hideReviews = hideReviews ;
- @Prop() questionOption!: QuestionOption;
- @Prop() isOpenQuestionPopUp!: boolean;
- @Prop() confirmItem!: Selected[];
+ //////////////////////////////////////////////////////////////////
@Watch('isOpenQuestionPopUp', {immediate: true})
onPopUpChange() {
@@ -135,8 +134,8 @@
}
}
-
//////////////////////////////////////////////////////////////////
+
get isDisabled() {
const name = this.questionOption.name;
return name === 'gender' && !this.pickedItem[name]
@@ -151,8 +150,8 @@
}
}
-
//////////////////////////////////////////////////////////////////
+
private getGender(): string {
return this.filterSingleSelected('gender');
}
@@ -190,41 +189,7 @@
.pam-radio-group {
height: 240px;
-
- .pam-radio {
- width: 48%;
- height: 110px;
-
- .el-radio-input {
- display: none;
- }
-
- .el-radio-label {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- width: 100%;
- height: 100%;
- box-shadow: 0 0 6px #22222229;
- border-radius: 10px;
- -webkit-tap-highlight-color: transparent;
- font-size: 20px;
- font-weight: bold;
- color: $PRIMARY_BLACK;
- cursor: pointer;
-
- .subtitle {
- font-size: 16px;
- font-weight: lighter;
- }
- }
-
- .el-radio-input:checked ~ .el-radio-label {
- background-color: $PEACH;
- color: $PRIMARY_WHITE;
- }
- }
+ flex-wrap: wrap;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0