From 65b80ac2168981cbc14c06868e724f6f3d7ea92f Mon Sep 17 00:00:00 2001
From: zing22 <leezing22@gmail.com>
Date: Sun, 12 Dec 2021 10:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DfReset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/pages/genealogy/genealogy.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/miniprogram/pages/genealogy/genealogy.js b/miniprogram/pages/genealogy/genealogy.js
index bb6a2e1a..422ad720 100644
--- a/miniprogram/pages/genealogy/genealogy.js
+++ b/miniprogram/pages/genealogy/genealogy.js
@@ -424,10 +424,13 @@ Page({
   // mask滑动事件catch
   voidMove: function () {},
   // toggle filters
-  fToggle: function () {
+  fToggle: function (status) {
     // 这里只管显示和隐藏，类似取消键的功能
+    if (status === undefined) {
+      status = !this.data.filters_show
+    }
     this.setData({
-      filters_show: !this.data.filters_show
+      filters_show: status
     });
   },
   // 点击main filter，切换sub的
@@ -589,7 +592,7 @@ Page({
     }
     return res.length ? _.and(res) : {};
   },
-  fComfirm: function () {
+  fComfirm: function (e, toggleStatus) {
     if (!this.data.filters_legal) {
       return false;
     }
@@ -597,7 +600,7 @@ Page({
     this.lockBtn();
 
     this.reloadCats();
-    this.fToggle();
+    this.fToggle(toggleStatus);
   },
   fReset: function () {
     // 重置所有分类
@@ -620,7 +623,8 @@ Page({
       filters: filters,
       filters_legal: fLegal
     }, () => {
-      that.fComfirm();
+      // 确认过滤器并关闭展板
+      that.fComfirm(null, false);
     });
   },
   // 发起文字搜索