diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index b911a04..6f0c891 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -17,6 +17,7 @@ Page({ meetingType: '', // 工作组会议:1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5 meetingStartTime: '', // 开始时间 meetingEndTime: '', // 结束时间 + isStandard:false,// 是否时标协会员那里跳转过来的 // 创建时间倒叙排序 column: 'createTime', order: 'desc' @@ -25,6 +26,16 @@ Page({ meetingStatus: ['可报名', '未开始', '进行中', '已结束'], // 会议类型筛选参数 meetingType: ['工作组会议', '标协会议', '国际研讨会', '其他会议', '分标委会议'], + meetingTypeList:[ + {name:'工作组会议',value:'1'}, + {name:'国际研讨会',value:'3'}, + {name:'其他会议',value:'4'}, + {name:'分标委会议',value:'5'}, + {name:'理事会会议',value:'6'}, + {name:'信息交流会',value:'7'}, + {name:'培训会',value:'8'}, + {name:'宣贯会',value:'9'} + ], // 会议列表数据 meetingList: [], // 下拉框送搜索数据 @@ -106,11 +117,35 @@ Page({ }, // 会议类型筛选 bindTypeChange(e) { + let index = this.data.meetingTypeList[e.detail.value].value + console.log(index); this.data.searchParams.pageNo = 1 - let value = Number(e.detail.value) + 1 - this.setData({ - 'searchParams.meetingType': value - }) + // 宣贯会 培训会 信息交流会 需要单独写查询条件 + if(index === '7'){ + // 信息交流会 + this.setData({ + 'searchParams.meetingType': '2', + 'searchParams.tbMeetingType':'3' + }) + }else if(index === '8'){ + // 培训会 + this.setData({ + 'searchParams.meetingType': '2', + 'searchParams.tbMeetingType':'2' + }) + }else if(index === '9' ){ + // 宣贯会 + this.setData({ + 'searchParams.meetingType': '2', + 'searchParams.tbMeetingType':'1' + }) + }else{ + // 其他类型的会议 + this.setData({ + 'searchParams.meetingType': index + }) + } + this.queryMeetingList() }, bindDateChange(e) { @@ -206,6 +241,18 @@ Page({ 'searchParams.meetingType': '5', }) } + if(options.type === 'standard'){ + // 标协会议的跳转 + this.setData({ + isStandard:true, + 'searchParams.meetingType': options.meetingType, + 'searchParams.tbMeetingType':options.tbMeetingType + }) + }else{ + this.setData({ + isStandard:false + }) + } this.queryMeetingList() }, diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml index 7bcb8e2..ad87a38 100644 --- a/pages/meeting/meeting.wxml +++ b/pages/meeting/meeting.wxml @@ -14,8 +14,9 @@ - - + + + 会议类型 diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index bbbe19a..b1ad8da 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -310,8 +310,8 @@ Page({ }) } }) - // 如果会议的报名状态是待签到则显示去签到按钮 这里暂时写个5 不知道待签到的报名状态是几 - if(this.data.meetingInfo.signUpStatus === 4){ + // 如果会议的报名状态是待签到则显示去签到按钮 待签到的报名状态时 6 + if(this.data.meetingInfo.signUpStatus == 6){ this.setData({ showSignInBtn:true }) diff --git a/pages/standardRouter/standardRouter.js b/pages/standardRouter/standardRouter.js index 2c6ac83..153a37d 100644 --- a/pages/standardRouter/standardRouter.js +++ b/pages/standardRouter/standardRouter.js @@ -13,25 +13,25 @@ Page({ name: "基本信息" }, { - path: "../meeting/meeting?type=", // type 是会议类型 + path: "../meeting/meeting?type=standard&meetingType=2&tbMeetingType=1", // type 是会议类型 imgPath:'../../assets/images/notice.png', val: "2", name: "标准宣贯" }, { - path: "../meeting/meeting?type=", + path: "../meeting/meeting?type=standard&meetingType=2&tbMeetingType=2", imgPath:'../../assets/images/train.png', val: "3", name: "培训会" }, { - path: "../meeting/meeting?type=", + path: "../meeting/meeting?type=standard&meetingType=2&tbMeetingType=3", imgPath:'../../assets/images/info.png', val: "4", name: "信息交流会" }, { - path: "../council/council", + path: "../council/council?type=standard&meetingType=6", imgPath:'../../assets/images/lishi.png', val: "5", name: "理事会"