修复fReset

sysucats · Dec 12, 2021 · 65b80ac · 65b80ac
1 parent 8964ec3
commit 65b80ac
Showing 1 changed file with 9 additions and 5 deletions.
diff --git 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,15 +592,15 @@ Page({
     }
     return res.length ? _.and(res) : {};
   },
-  fComfirm: function () {
+  fComfirm: function (e, toggleStatus) {
     if (!this.data.filters_legal) {
       return false;
     }
 
     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);
     });
   },
   // 发起文字搜索