From 65c09b0bde45fc9f8f0fcf085082684e3c765975 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 18 十一月 2021 17:42:20 +0800
Subject: [PATCH] updat TODO#130484 所在地區選擇器增加確認按鈕
---
PAMapp/pages/recommendConsultant/index.vue | 14 ++++++++++----
PAMapp/components/AddressPicker.vue | 15 ++++++++-------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/PAMapp/components/AddressPicker.vue b/PAMapp/components/AddressPicker.vue
index 6315ce2..ecf7975 100644
--- a/PAMapp/components/AddressPicker.vue
+++ b/PAMapp/components/AddressPicker.vue
@@ -1,6 +1,6 @@
<template>
- <div class="text--center" @click="close">
- <div class="subTitle mb-10" @click="close">������</div>
+ <div class="text--center">
+ <div class="subTitle mb-10">������</div>
<el-input
type="text"
class="p mt-10"
@@ -13,6 +13,9 @@
:initValue="district"
@change="selectDistrict"
></Ui-ScrollPicker>
+ <div class="text--center mt-10">
+ <el-button type="primary" @click="confirm">蝣箄��</el-button>
+ </div>
</div>
</template>
@@ -31,19 +34,17 @@
this.filterOptions = JSON.parse(JSON.stringify(this.options));
}
-
searchDistrict() {
this.filterOptions = this.options.filter(e => e.match(this.keyWord));
}
- @Emit('change')
selectDistrict(value: string): void {
this.district = value;
}
- @Emit()
- close(): void {
- console.log('close district drawer!');
+ @Emit('confirm')
+ confirm() {
+ return this.district;
}
}
diff --git a/PAMapp/pages/recommendConsultant/index.vue b/PAMapp/pages/recommendConsultant/index.vue
index ff186f9..4ee4d6a 100644
--- a/PAMapp/pages/recommendConsultant/index.vue
+++ b/PAMapp/pages/recommendConsultant/index.vue
@@ -12,9 +12,9 @@
<i class="icon-down down-icon"></i>
</div>
<PopUpFrame :isOpen.sync="showAddress"
- :drawerSize="'45%'">
- <AddressPicker @close="showAddress = false"
- @change="area => strictQueryDto.area = area" />
+ :drawerSize="'65%'">
+ <AddressPicker
+ @confirm="confirmAddress" />
</PopUpFrame>
</div>
<div class="pam-paragraph">
@@ -66,7 +66,7 @@
</div>
</div>
</div>
- <div class="text--center mdTxt mt-30">
+ <div class="text--center mdTxt mt-30 mb-30">
<el-button type="primary" @click="showDialog = false">������</el-button>
</div>
</PopUpFrame>
@@ -241,6 +241,12 @@
const requirementLength = this.strictQueryDto.requirements.length;
return !(area && requirementLength >0)
}
+
+ confirmAddress(area: string) {
+ this.strictQueryDto.area = area;
+ this.showAddress = false;
+ }
+
}
enum Gender{
MALE="male",
--
Gitblit v1.8.0