diff --git a/pages/committeeDetail/committeeDetail.js b/pages/committeeDetail/committeeDetail.js index bba5934..cbe7f29 100644 --- a/pages/committeeDetail/committeeDetail.js +++ b/pages/committeeDetail/committeeDetail.js @@ -20,7 +20,7 @@ Page({ // 获取更多会议信息数据 goMoreMeeting(){ wx.navigateTo({ - url: `../meeting/meeting?caseCommitteeId=${this.data.id}`, + url: `../meeting/meeting?caseCommitteeId=${this.data.id}&type=caseCommit`, }) }, /** diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index 03d4708..3020e51 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -132,6 +132,13 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + if(!!options.workingGroupId){ + // 工作组的更多跳转 + this.setData({ + 'searchParams.workingGroupId':options.workingGroupId, + 'searchParams.meetingType':'1', + }) + } this.queryMeetingList() }, diff --git a/pages/project/project.js b/pages/project/project.js index fb9f50b..3df5e86 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -62,9 +62,8 @@ Page({ }, // 项目详情 projectDetail(e){ - console.log(e) wx.navigateTo({ - url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}`, + url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&workingGroupId=${e.currentTarget.dataset.project.workingGroupId}`, }) }, loadData(){ diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js index f2239dc..d353efe 100644 --- a/pages/projectDetail/projectDetail.js +++ b/pages/projectDetail/projectDetail.js @@ -9,6 +9,7 @@ Page({ data: { form: {}, id: '', // 在工作组id,项目id + workingGroupId:'',//工作组id showMeeting: false, // 会议信息的显隐 projectFileList: [], // 项目资料文件 notifyFileList: [], // 通知文件 @@ -22,7 +23,7 @@ Page({ // 获取更多会议信息数据 goMoreMeeting(){ wx.navigateTo({ - url: `../meeting/meeting?workingGroupProjectId=${this.data.id}`, + url: `../meeting/meeting?workingGroupId=${this.data.workingGroupId}`, }) }, /** @@ -30,6 +31,7 @@ Page({ */ onLoad: function (options) { this.data.id = options.id + this.data.workingGroupId = options.workingGroupId if(options.type == 'work') { // 工作组项目有会议详情 this.setData({ showMeeting: true