【修改】酒店信息的显示 会议纪要的显示

pages/meeting/meeting.js

@@ -18,7 +18,7 @@ Page({
       meetingStartTime: '', // 开始时间
       meetingEndTime: '', // 结束时间
       // 创建时间倒叙排序
-      column: 'pm.createTime',
+      column: 'createTime',
       order: 'desc'
     },
     // 会议筛选参数

pages/meetingDetailSigned/meetingDetailSigned.js

@@ -29,6 +29,8 @@ Page({
     meetingFilesList: [],
     // 会议资料文件数组
     meetingDataList: [],
+    // 会议纪要文件数组
+    meetingJiyaoList:[],
     // 演讲ppt
     speechPptList: [],
     // 照片 
@@ -206,7 +208,7 @@ Page({
     // 只有审核通过的才可以去下载
     if (this.data.singInPersonInfo.checkResult !== 1) {
       wx.showToast({
-        title: '您的信息尚未审核通过，请等待审核通过',
+        title: '会议报名并审核通过后才可查看文件',
         icon: 'none',
         duration: 3000
       })
@@ -295,9 +297,19 @@ Page({
     console.log(meetingInfo);
     const that = this
     this.setData({
-      meetingInfo: meetingInfo,
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
     })
+    MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
+      if(res.success){
+        this.setData({
+          meetingInfo:res.result
+        })
+      }else{
+        this.setData({
+          meetingInfo:meetingInfo
+        })
+      }
+    })
     // 如果会议的报名状态是待签到则显示去签到按钮  这里暂时写个5  不知道待签到的报名状态是几 
     if(this.data.meetingInfo.signUpStatus === 4){
       this.setData({
@@ -333,7 +345,8 @@ Page({
     //
     let {
       meetingFiles,
-      meetingData
+      meetingData,
+      meetingMinute
     } = meetingInfo
     // 获取参会人信息
     this.queryPeronInfo(meetingInfo.situationId)
@@ -345,12 +358,18 @@ Page({
       })
     })
 
-    // 会议通知文件
+    // 会议通知文件meetingFiles
     this.initFileList(meetingFiles).then(res => {
       that.setData({
         meetingFilesList: res
       })
     })
+    // 会议纪要文件
+    this.initFileList(meetingMinute).then(res => {
+      that.setData({
+        meetingJiyaoList: res
+      })
+    })
 
   },
 

pages/meetingDetailSigned/meetingDetailSigned.wxml

@@ -33,17 +33,17 @@
 			<text>{{meetingInfo.particularYear}}</text>
 		</view>
 		<!-- 标协会议才有 -->
-		<view wx:if="{{meetingInfo.meetingType === 2 }}">
+		<view wx:if="{{meetingInfo.meetingType === '2' }}">
 			<text>会议费用（VIP）</text>
 			<text>{{meetingInfo.meetingCostsVip}}</text>
 		</view>
 		<!-- 分标委会议 -->
-		<view wx:if="{{meetingInfo.meetingType === 5 }}">
+		<view wx:if="{{meetingInfo.meetingType === '5' }}">
 			<text>所属分标委</text>
 			<text>{{meetingInfo.caseCommitteeName}}</text>
 		</view>
 		<!-- 工作组会议 -->
-		<view wx:if="{{meetingInfo.meetingType === 1 }}">
+		<view wx:if="{{meetingInfo.meetingType === '1' }}">
 			<text>所属工作组</text>
 			<text>{{meetingInfo.workingGroupName}}</text>
 		</view>
@@ -81,9 +81,41 @@
 			</view>
 			<view class="center" wx:if="{{ meetingDataList.length === 0 }}"> <text style="color:#999">暂无</text></view>
 		</view>
+		<view class="meeting-files" style="margin-top: 0;">
+			<!-- 只有报名并审核通过的成员才可进行下载（不需要花钱的可直接下载）、查看操作。否则提示：会议报名并审核通过后才可查看文件。 -->
+			<text>会议纪要</text>
+			<view class="file-name" wx:for="{{meetingJiyaoList}}" wx:key="item">
+				<view>
+					<image src="../../assets/images/pdf.png"></image>
+					<text>{{item.name}}</text>
+				</view>
+				<text class="look-file" bindtap="previewFileMeetingData" data-file='{{item}}'>查看</text>
+			</view>
+			<view class="center" wx:if="{{ meetingJiyaoList.length === 0 }}"> <text style="color:#999">暂无</text></view>
+		</view>
 	</view>
+			<!-- 酒店信息begin -->
+			<view class="hotel-info basic-info">
+			<view class="title to-signup">
+				<text>酒店信息</text>
+			</view>
+			<view>
+				<text style="min-width:160rpx">酒店名称</text>
+				<text>{{meetingInfo.hotelName}}</text>
+			</view>
+			<view>
+				<text style="min-width:160rpx">酒店地址</text>
+				<text>{{meetingInfo.hotelAddress}}</text>
+			</view>
+			<view wx:for="{{meetingInfo.hotelContactsList}}" wx:key='item'>
+				<text>酒店联系人</text>
+				<text>{{item.hotelContacts + ':' + item.hotelContactsPhone + ' '}}</text>
+			</view>
+		</view>
+		<!-- 酒店信息end -->
 	<!-- 报名信息begin -->
-	<view class="basic-info" style="margin-top: 10px;" wx:if="{{!(meetingInfo.meetingType == 3 && singInPersonInfo.identity === 1)}}">
+	<view class="basic-info" style="margin-top: 10px;"
+		wx:if="{{!(meetingInfo.meetingType == '3' && singInPersonInfo.identity === 1)}}">
 		<view class="title to-signup">
 			<text>报名信息</text>
 			<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示 -->
@@ -145,7 +177,8 @@
 		</view>
 	</view>
 	<!-- 报名信息国际研讨会嘉宾  -->
-	<view class="basic-info" style="margin-top: 10px;" wx:if="{{meetingInfo.meetingType == 3 && singInPersonInfo.identity === 1}}">
+	<view class="basic-info" style="margin-top: 10px;"
+		wx:if="{{meetingInfo.meetingType == '3' && singInPersonInfo.identity === 1}}">
 		<view class="title">
 			<text>报名信息</text>
 		</view>
@@ -277,7 +310,7 @@
 		<!-- vip显示 end -->
 
 		<!-- 演讲嘉宾显示begin -->
-		<view wx:if="{{singInPersonInfo.guestType == 2}}" class="sign-in" >
+		<view wx:if="{{singInPersonInfo.guestType == 2}}" class="sign-in">
 			<text>演讲题目</text>
 			<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
 		</view>
@@ -497,13 +530,14 @@
 	</view>
 	<!-- 签到信息end -->
 
-<!-- 开票邮寄信息 begin -->
+	<!-- 开票邮寄信息 begin -->
 	<view class="basic-info" style="margin-top: 10px;" wx:if="{{singInPersonInfo.checkResult !== 0 }}">
 		<view class="title">
 			<text>到账信息</text>
 		</view>
 		<view style="padding: 0 15px;" wx:for="{{form.paymentRecord}}" wx:key="item">
-			<text wx:if="{{form.paymentRecord && form.paymentRecord.length}}">{{item.paymentDate}}到账{{item.amountReceived}}元</text>
+			<text
+				wx:if="{{form.paymentRecord && form.paymentRecord.length}}">{{item.paymentDate}}到账{{item.amountReceived}}元</text>
 		</view>
 		<text class="no-data" style="height: 50px;" wx:if="{{!form.paymentRecord}}">暂无到账记录！</text>
 	</view>
@@ -520,7 +554,8 @@
 			</view>
 			<view class="way project-name">
 				<text>项目名称：</text>
-				<text>{{item.projectName}}</text></view>
+				<text>{{item.projectName}}</text>
+			</view>
 			<view class="way-info">
 				<view class="way-left">
 					<text class="way-left-text green">票</text>
@@ -569,4 +604,4 @@
 		wx:if="{{singInPersonInfo.checkResult !== 1 && meetingInfo.meetingStatus == 3 && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3  }}">
 		<text bindtap="editPayRecord">确定 </text>
 	</view>
-</view>
+</view>

pages/meetingDetailSigned/meetingDetailSigned.wxss

@@ -316,3 +316,7 @@ margin-top: 15px;
   text-align: center;
   line-height: 26px;
 }
+
+.hotel-info  {
+  margin-top: 10px;
+}