From 0ef6663d7be9c7f2fe81dd80480858ee6ba3220b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com>
Date: Thu, 26 Aug 2021 10:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E4=BA=B2=E4=BA=A4=E5=8F=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/userList/filter.json  | 25 -------------------------
 pages/userList/userList.vue | 10 ++++++++--
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/pages/userList/filter.json b/pages/userList/filter.json
index 3b182b9..c35cc5a 100644
--- a/pages/userList/filter.json
+++ b/pages/userList/filter.json
@@ -226,31 +226,6 @@
 				"value": "双鱼座"
 			}]
 		},
-		"household_register": {
-			"name": "户籍",
-			"selected": "",
-			"data": [{
-				"value": "不限"
-			},{
-				"value": "良庆区"
-			},{
-				"value": "江南区"
-			},{
-				"value": "青秀区"
-			},{
-				"value": "兴宁区"
-			},{
-				"value": "西乡塘区"
-			},{
-				"value": "武鸣区"
-			},{
-				"value": "空港经济区"
-			},{
-				"value": "五象新区"
-			},{
-				"value": "其他地区"
-			}]
-		},
 		"place_residence": {
 			"name": "居住地区",
 			"selected": "",
diff --git a/pages/userList/userList.vue b/pages/userList/userList.vue
index ec553b2..3fda629 100644
--- a/pages/userList/userList.vue
+++ b/pages/userList/userList.vue
@@ -20,7 +20,7 @@
 						<view v-for="(value, key) in filter[filter_key]" :key="key" v-if="key != 'name'">
 							<block v-if="key == 'search_value'">
 								<view class="filter-title">会员编号搜索</view>
-								<input class="input-search" placeholder="请输入会员编号" :value="value" @blur="inputBlur(key, $event)" />
+								<input class="input-search" :focus="on_focus" placeholder="请输入会员编号" :value="value" @blur="inputBlur(key, $event)" />
 							</block>
 							<block v-else>
 								<view class="filter-title">{{ value.name }}</view>
@@ -64,12 +64,18 @@
 				show_filter: false,
 				filter: this.productionObj(),
 				filter_key: '',
-				name: '最新'
+				name: '最新',
+				on_focus: false
 			}
 		},
 		onLoad(options){
 			console.log(this.filter)
 			this.name = options.name || this.name;
+			if(this.name == '搜索') {
+				this.show_filter = true;
+				this.filter_key = 'search';
+				this.on_focus = true;
+			}
 		},
 		methods: {
 			// 引入数据，并序列化，避免数据引用