分标委的会议更多与查看详情

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'
 /* 配置路径 */

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}`,
     })
   },
   /**

pages/committeeDetail/committeeDetail.wxml

@@ -21,7 +21,7 @@
 		<view style="padding: 0 15px;" wx:for="{{meetingList}}" wx:key="item">
 			<view class="meeting-info">
 				<text>{{item.meetingName}}</text>
-				<text style="color: #069F99;" bindtap="meetingDetail">查看详情</text>
+				<text style="color: #069F99;" bindtap="meetingDetail" data-meetingInfo = "{{item}}">查看详情</text>
 			</view>
 		</view>
 		<text wx:if="{{meetingList.length == 0}}" class="no-data" style="height: 40px;">暂无会议记录！</text>

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()
   },
 

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 () {
 
   }
-})
+})

pages/projectDetail/projectDetail.wxml

@@ -82,7 +82,7 @@
 		<view style="padding: 0 15px;" wx:for="{{meetingList}}" wx:key="item">
 			<view class="meeting-info">
 				<text>{{item.meetingName}}</text>
-				<text style="color: #069F99;" bindtap="meetingDetail">查看详情</text>
+				<text style="color: #069F99;" bindtap="meetingDetail" data-meetinginfo="{{item}}">查看详情</text>
 			</view>
 		</view>
 		<text wx:if="{{meetingList.length == 0}}" class="no-data">暂无会议记录！</text>