From 167af66c2331e16679aae9f65f5b340c0ba76f47 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Tue, 19 Oct 2021 20:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=A0=87=E5=A7=94=E7=9A=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=9B=B4=E5=A4=9A=E4=B8=8E=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/http/api.js | 2 +- pages/committeeDetail/committeeDetail.js | 10 +++++- pages/committeeDetail/committeeDetail.wxml | 2 +- pages/meeting/meeting.js | 8 +++++ pages/projectDetail/projectDetail.js | 42 ++++++++++++++-------- pages/projectDetail/projectDetail.wxml | 2 +- 6 files changed, 48 insertions(+), 18 deletions(-) diff --git a/assets/js/http/api.js b/assets/js/http/api.js index 5f87d10..5706f35 100644 --- a/assets/js/http/api.js +++ b/assets/js/http/api.js @@ -2,7 +2,7 @@ import http from './http.js' // let baseUrl = 'https://share.hzwlsoft.com' // let baseUrl = 'http://localhost:8080' -let baseUrl = 'http://10.0.1.9:8080' +let baseUrl = 'http://10.0.1.16:8080' let URL_CONFIG = '/jero-boot/' // let baseUrl = 'http://192.168.1.110:8080' /* 配置路径 */ diff --git a/pages/committeeDetail/committeeDetail.js b/pages/committeeDetail/committeeDetail.js index cbe7f29..82d524e 100644 --- a/pages/committeeDetail/committeeDetail.js +++ b/pages/committeeDetail/committeeDetail.js @@ -20,7 +20,15 @@ Page({ // 获取更多会议信息数据 goMoreMeeting(){ wx.navigateTo({ - url: `../meeting/meeting?caseCommitteeId=${this.data.id}&type=caseCommit`, + url: `../meeting/meeting?caseCommitteeId=${this.data.id}`, + }) + }, + // 会议详情 + meetingDetail(e){ + console.log(e); + const meetingInfo = JSON.stringify(e.currentTarget.dataset.meetinginfo) + wx.navigateTo({ + url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, }) }, /** diff --git a/pages/committeeDetail/committeeDetail.wxml b/pages/committeeDetail/committeeDetail.wxml index aaf475d..ba3aea0 100644 --- a/pages/committeeDetail/committeeDetail.wxml +++ b/pages/committeeDetail/committeeDetail.wxml @@ -21,7 +21,7 @@ {{item.meetingName}} - 查看详情 + 查看详情 暂无会议记录！ diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index 3020e51..f1e4ffc 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -132,6 +132,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + console.log(options); if(!!options.workingGroupId){ // 工作组的更多跳转 this.setData({ @@ -139,6 +140,13 @@ Page({ 'searchParams.meetingType':'1', }) } + if(!!options.caseCommitteeId){ + // 分标委的更多跳转 + this.setData({ + 'searchParams.caseCommitteeId':options.caseCommitteeId, + 'searchParams.meetingType':'5', + }) + } this.queryMeetingList() }, diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js index d353efe..7d84e91 100644 --- a/pages/projectDetail/projectDetail.js +++ b/pages/projectDetail/projectDetail.js @@ -1,5 +1,8 @@ import UserApi from '../../assets/js/http/userApi' -import { previewFile, initFileList } from '../../assets/js/preview' +import { + previewFile, + initFileList +} from '../../assets/js/preview' import MeetingApi from '../../assets/js/http/meetingApi' Page({ @@ -9,43 +12,52 @@ Page({ data: { form: {}, id: '', // 在工作组id,项目id - workingGroupId:'',//工作组id + workingGroupId: '', //工作组id showMeeting: false, // 会议信息的显隐 projectFileList: [], // 项目资料文件 notifyFileList: [], // 通知文件 meetingList: [] // 会议文件 }, // 预览 - preview(e){ + preview(e) { const fileObj = e.currentTarget.dataset.file - previewFile(fileObj.id,fileObj.name) + previewFile(fileObj.id, fileObj.name) }, // 获取更多会议信息数据 - goMoreMeeting(){ + goMoreMeeting() { wx.navigateTo({ url: `../meeting/meeting?workingGroupId=${this.data.workingGroupId}`, }) }, + // 会议详情 + meetingDetail(e) { + const meetingInfo = JSON.stringify(e.currentTarget.dataset.meetinginfo) + wx.navigateTo({ + url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, + }) + }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { this.data.id = options.id this.data.workingGroupId = options.workingGroupId - if(options.type == 'work') { // 工作组项目有会议详情 + if (options.type == 'work') { // 工作组项目有会议详情 this.setData({ showMeeting: true }) - MeetingApi.meetingList({workingGroupProjectId: this.data.id}).then(res=>{ + MeetingApi.meetingList({ + workingGroupProjectId: this.data.id + }).then(res => { console.log(res) - if(res.success){ - if(res.result.records && res.result.records.length <= 2){ + if (res.success) { + if (res.result.records && res.result.records.length <= 2) { this.setData({ meetingList: res.result.records }) - }else if(res.result.records && res.result.records.length > 2){ + } else if (res.result.records && res.result.records.length > 2) { this.setData({ - meetingList: res.result.records.slice(0,2) + meetingList: res.result.records.slice(0, 2) }) } } @@ -57,12 +69,14 @@ Page({ }) }) } - UserApi.projectDetail({id: this.data.id}).then(res=>{ + UserApi.projectDetail({ + id: this.data.id + }).then(res => { this.setData({ form: res.result }) // 获取项目资料文件list - if(this.data.form) { + if (this.data.form) { initFileList(this.data.form.files).then(res => { this.setData({ projectFileList: res @@ -132,4 +146,4 @@ Page({ onShareAppMessage: function () { } -}) +}) \ No newline at end of file diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml index 581ae9a..155229c 100644 --- a/pages/projectDetail/projectDetail.wxml +++ b/pages/projectDetail/projectDetail.wxml @@ -82,7 +82,7 @@ {{item.meetingName}} - 查看详情 + 查看详情 暂无会议记录！