From 3bf3ab81cf6123ef231b737ef7495c9968d3ac0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= <yaoyanan@syxysoft.com>
Date: Tue, 2 Nov 2021 15:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meeting/meeting.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 782a2e6..f2d5885 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -13,7 +13,7 @@ Page({
       pageNo: 1,
       pageSize: 10,
       meetingSignUpType: 0, // 可报名：1   全部 0
-      meetingStatus: '', // 会议状态
+      meetingStatus: '', // 会议状态  可报名: meetingSignUpType==1   未开始：2   进行中：3   已结束4
       meetingType: '', // 工作组会议：1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5
       meetingStartTime: '', // 开始时间
       meetingEndTime: '', // 结束时间
@@ -83,19 +83,23 @@ Page({
     this.data.searchParams.pageNo = 1
     if (e.detail.value == 0) {
       this.setData({
+        'searchParams.meetingStatus': '',
         'searchParams.meetingSignUpType': 1
       })
     } else if (e.detail.value == 1) {
       this.setData({
-        'searchParams.meetingStatus': 2
+        'searchParams.meetingStatus': 2,
+        'searchParams.meetingSignUpType': 0
       })
     } else if (e.detail.value == 2) {
       this.setData({
-        'searchParams.meetingStatus': 3
+        'searchParams.meetingStatus': 3,
+        'searchParams.meetingSignUpType': 0
       })
     } else if (e.detail.value == 3) {
       this.setData({
-        'searchParams.meetingStatus': 4
+        'searchParams.meetingStatus': 4,
+        'searchParams.meetingSignUpType': 0
       })
     }
     this.queryMeetingList()