diff --git a/assets/js/http/http.js b/assets/js/http/http.js
index e094bcd..f136a41 100644
--- a/assets/js/http/http.js
+++ b/assets/js/http/http.js
@@ -1,4 +1,4 @@
- 
+
 let headerDefault = {
   'Accept': 'application/json'
 }
@@ -48,7 +48,7 @@ const http = (method, url, data, header= headerDefault) => {
           });
           wx.navigateTo({
             url: '/pages/login/login',
-          }) 
+          })
           console.error("登录失效3");
         }
       },
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index e62b8f0..3631ca6 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -1,4 +1,5 @@
 // pages/meeting/meeting.js
+import MeetingApi from '../../assets/js/http/meetingApi'
 Page({
 
   /**
@@ -28,20 +29,37 @@ Page({
         active: false,
         tabIndex: 3
       }
-    ]
+    ],
+    // 会议列表数据
+    meetingList:[]
   },
   
   // 会议详情
-  meetingDetail(){
+  meetingDetail(e){
+    // 会议id
+    let meetingInfo =JSON.stringify(e.currentTarget.dataset.meetinginfo)
     wx.navigateTo({
-      url: '../meetingDetailSigned/meetingDetailSigned', // (已报名)
+      url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
     })
   },
+  // 获取会议列表数据
+  queryMeetingList(){
+    const that = this
+    MeetingApi.meetingList().then(res => {
+      console.log(res,'res');
+      if(res.success){
+        that.setData({
+          meetingList:res.result.records
+        })
+      }
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.queryMeetingList()
   },
 
   /**
diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml
index a58bdfa..8f40ef3 100644
--- a/pages/meeting/meeting.wxml
+++ b/pages/meeting/meeting.wxml
@@ -7,18 +7,18 @@
 	</view>
 </view>
 <view class="list">
-	<view class="list-item" wx:for="{{[1,1,1,1]}}" bindtap="meetingDetail" wx:key="item">
+	<view class="list-item" wx:for="{{meetingList}}" bindtap="meetingDetail" data-meetinginfo="{{item}}" wx:key="item">
 		<view class="title">
-			<text>项目名称文字占位符项目名称文字占位符项目名称文字占位符</text>
-			<text>2021-12-12</text>
+			<text>{{item.meetingName}}</text>
+			<text>{{item.startTime}}</text>
 		</view>
 		<view class="content-text">
 			<image mode="aspectFill" src="../../assets/images/personnel.png"></image>
-			<text>标协会议</text>
+			<text>{{item.meetingType_dictText}}</text>
 		</view>
 		<view class="content-text">
 			<image mode="aspectFill" src="../../assets/images/location.png"></image>
-			<text>天津市河西区华鼎大厦502会议室</text>
+			<text>{{item.venue + '/' + item.address}}</text>
 		</view>
 	</view>
 </view>
diff --git a/pages/meeting/meeting.wxss b/pages/meeting/meeting.wxss
index 055ad53..fb5b993 100644
--- a/pages/meeting/meeting.wxss
+++ b/pages/meeting/meeting.wxss
@@ -59,7 +59,7 @@ page {
 .list-item .title text:nth-child(2){
   font-size: 12px;
   color: #999;
-  width: 70px;
+  width: 120px;
   text-align: right;
   flex-shrink: 0;
 }
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index b83c133..e689f1c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -1,11 +1,23 @@
 // pages/meeting/meeting.js
+import {previewFile} from '../../assets/js/preview'
+
+import MeetingApi from '../../assets/js/http/meetingApi'
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    payProveImage: ''
+    payProveImage: '',
+    // 会议详情
+    meetingInfo:{},
+    // 参会人信息
+    singInPersonInfo:{},
+    // 会议通知文件资料数组
+    meetingFilesList:[],
+    // 会议资料文件数组
+    meetingDataList:[]
+
   },
 
   // 上传缴费凭证
@@ -30,10 +42,76 @@ Page({
       payProveImage: ''
     })
   },
+  //参会人信息
+  queryPeronInfo(id){
+    MeetingApi.queryPersongInfoById({id:id}).then(res => {
+      if(res.success){
+        this.setData({
+          singInPersonInfo:res.result
+        })
+      }
+    })
+  },
+  // 通过文件id获取文件的相关信息
+  getFileInfo(id) {
+    return new Promise(resolve => {
+      let result = {}
+      MeetingApi.queryFileInfoById({ id: id }).then(res => {
+        if (res.success) {
+          result = res.result
+        }
+      }).finally(() => {
+        resolve(result)
+      })
+    })
+  },
+  // 获取文件信息
+   async initFileList(fileIds) {
+    if (fileIds) {
+      const fileList = []
+      let arr = fileIds.split(',')
+      for (let i = 0; i < arr.length; i++) {
+        let fileObj = {}
+        fileObj = await this.getFileInfo(arr[i])
+        fileList.push({ id: fileObj.id, name: fileObj.fileName })
+      }
+      return fileList
+    } 
+  },
+  // 预览
+  previewFile(e) {
+    console.log(e);
+    const fileObj = e.currentTarget.dataset.file
+    previewFile(fileObj.id,fileObj.name)
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    // 获取上一个页面的会议数据
+    const meetingInfo = JSON.parse(options.meetingInfo)
+    const that = this
+    this.setData({
+      meetingInfo:meetingInfo
+    })
+    // 
+    let {meetingFiles,meetingData} = meetingInfo
+    // 获取参会人信息
+    this.queryPeronInfo(meetingInfo.id)
+    // this.queryFileInfo(meetingFiles)
+    // 获取会议资料文件
+    this.initFileList(meetingData).then(res => {
+     that.setData({
+      meetingDataList:res
+     })
+    })
+
+    // 会议通知文件
+    this.initFileList(meetingFiles).then(res => {
+      that.setData({
+        meetingFilesList:res
+      })
+     })
 
   },
 
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 28da33a..d64ac85 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -2,56 +2,58 @@
 	<view class="basic-info">
 		<view class="meeting-name">
 			<text>会议名称</text>
-			<text>会议名称会议名称</text>
+			<text>{{meetingInfo.meetingName}}</text>
 		</view>
 		<view>
 			<text>会议类型</text>
-			<text>arff4ds8a3s6651</text>
+			<text>{{meetingInfo.meetingType_dictText}}</text>
 		</view>
 		<view>
 			<text>负责人</text>
-			<text>找找</text>
+			<text>{{meetingInfo.directorName}}</text>
 		</view>
 		<view>
 			<text>召开时间</text>
-			<text>张三</text>
+			<text>{{meetingInfo.startTime + '至' + meetingInfo.endTime}}</text>
 		</view>
 		<view>
 			<text>召开地点</text>
-			<text>500元</text>
+			<text>{{meetingInfo.venue + '/' + meetingInfo.address}}</text>
+		</view>
+		<view>
+			<text>报名截止时间</text>
+			<text>{{meetingInfo.registerDeadline}}</text>
 		</view>
 		<view>
 			<text>会议费用</text>
-			<text>500元</text>
+			<text>{{meetingInfo.meetingCosts}}元</text>
 		</view>
 		<view>
 			<text>年份</text>
-			<text>500元</text>
-		</view>
-		<view>
-			<text>签到时间</text>
-			<text>500元</text>
+			<text>{{meetingInfo.particularYear}}</text>
 		</view>
+		<!-- 标协会议才有 -->
 		<view>
 			<text>会议费用（VIP）</text>
-			<text>500元</text>
+			<text>{{meetingInfo.meetingCostsVip}}</text>
 		</view>
 		<view>
 			<text>会议内容</text>
-			<text>500元</text>
+			<text>{{meetingInfo.meetingContent}}</text>
 		</view>
-		<view>
+		<!-- 原型上没有备注 暂时注释 -->
+		<!-- <view>
 			<text>备注</text>
-			<text>500元</text>
-		</view>
+			<text>{{meetingInfo.remark}}</text>
+		</view> -->
 		<view class="meeting-files">
-			<text>附件</text>
-			<view class="file-name">
+			<text>会议通知</text>
+			<view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
 				<view>
 					<image src="../../assets/images/pdf.png"></image>
-					<text>文件名内阁成员函数的工具包</text>
+					<text>{{item.name}}</text>
 				</view>
-				<text class="look-file">查看</text>
+				<text class="look-file" bindtap="previewFile" data-file ='{{item}}'>查看</text>
 			</view>
 		</view>
 		<view class="meeting-files" style="margin-top: 0;">
@@ -60,42 +62,59 @@
 				<image src="../../assets/images/warn.png"></image>
 				<text>单个账号会议文件只可发送五次</text>
 			</view>
-			<view class="file-name">
+			<view class="file-name"  wx:for="{{meetingDataList}}" wx:key="item">
 				<view>
 					<image src="../../assets/images/pdf.png"></image>
-					<text>文件名内阁成员函数的工具包</text>
+					<text>{{item.name}}</text>
 				</view>
-				<text class="look-file">查看</text>
+				<text class="look-file" bindtap="previewFile" data-file ='{{item}}'>查看</text>
 			</view>
 		</view>
 	</view>
+	<!-- 报名信息begin -->
 	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
 			<text>报名信息</text>
 		</view>
 		<view>
-			<text>参会人1</text>
-			<text>会议名称会议名称</text>
+			<text>参会单位</text>
+			<text>{{singInPersonInfo.companyName}}</text>
 		</view>
 		<view>
-			<text>参会人2</text>
-			<text>会议名称会议名称</text>
+			<text>参会人</text>
+			<text>{{singInPersonInfo.companyContactName}}</text>
+		</view>
+		<view>
+			<text>是否住酒店</text>
+			<text>{{singInPersonInfo.checkInHotel_dictText}}</text>
+		</view>
+		<view>
+			<text>抵达时间</text>
+			<text>{{singInPersonInfo.arrivalTime}}</text>
+		</view>
+		<view>
+			<text>离开时间</text>
+			<text>{{singInPersonInfo.departureTime}}</text>
+		</view>
+		<view>
+			<text>邮寄联系人</text>
+			<text>{{singInPersonInfo.postContactName}}</text>
 		</view>
 		<view>
 			<text>缴费方式</text>
-			<text>会议名称会议名称</text>
+			<text>{{singInPersonInfo.payMode_dictText}}</text>
 		</view>
 		<view>
 			<text>是否需要发票</text>
-			<text>会议名称会议名称</text>
+			<text>{{singInPersonInfo.needInvoice_dictText}}</text>
 		</view>
 		<view>
 			<text>邮寄地址</text>
-			<text>会议名称会议名称</text>
+			<text>{{singInPersonInfo.postContactAddress}}</text>
 		</view>
 		<view>
 			<text>邮编</text>
-			<text>会议名称会议名称</text>
+			<text>{{singInPersonInfo.postCode}}</text>
 		</view>
 		<view class="pay-prove-box">
 			<text>缴费凭证</text>
@@ -110,6 +129,7 @@
 			</view>
 		</view>
 	</view>
+	<!-- 报名信息end -->
 	<view class="sign-up-empty"></view>
 	<view class="sign-up">
 		<text>确定</text>