From edcd3d005814bdb38a1166a3b4957a9cfe28bae7 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 1 Mar 2022 11:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E4=BC=9A=E8=AE=AE=20=E5=B9=B6=E4=B8=94=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E8=B4=B9=E7=94=A8=E4=B8=BA0=20=20=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=8E=BB=E4=B8=8B=E8=BD=BD=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned.js                    | 22 ++++++++++---------
 .../meetingDetailSigned.wxml                  |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index fabb38c..0ff6fa0 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -33,7 +33,7 @@ Page({
     meetingJiyaoList:[],
     // 演讲ppt
     speechPptList: [],
-    // 照片 
+    // 照片
     photoSrc: '',
     // 缴费凭证id
     imageIds: [],
@@ -48,7 +48,7 @@ Page({
     userId: '',
     form: {},
     showSignInBtn:false, // 是否显示签到按钮
-    isMoreTime:false, // 是否超过 会议截止报名时间 
+    isMoreTime:false, // 是否超过 会议截止报名时间
     meetingTypeText:""  // 会议类型
   },
       /*
@@ -133,7 +133,7 @@ Page({
       orderCode: this.data.ordeCode,
       paymentRecord: this.data.imageIds
     }
- 
+
     if (Array.isArray(this.data.imageIds)) {
       param.paymentRecord = this.data.imageIds.join(',')
     }
@@ -245,11 +245,13 @@ Page({
       return fileList
     }
   },
-  // 会议文件的预览 
+  // 会议文件的预览
   previewFileMeetingData(e) {
     const that = this
     // 只有审核通过的才可以去下载
-    if (this.data.singInPersonInfo.checkResult !== 1) {
+    // 工作组会议 会议金额为0 可以去下载文件
+    let flag = this.data.meetingInfo.meetingType === 1 && this.data.meetingInfo.meetingCosts === '0.00'
+    if (!flag && this.data.singInPersonInfo.checkResult !== 1) {
       wx.showToast({
         title: '会议报名并审核通过后才可查看文件',
         icon: 'none',
@@ -322,7 +324,7 @@ Page({
       previewFile(fileObj.id, fileObj.name)
     }
   },
-  // 去签到 
+  // 去签到
   toSignUp(){
     let meetingId = this.data.meetingInfo.id
     wx.navigateTo({
@@ -335,7 +337,7 @@ Page({
     // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息 meetingSignUpType 1 可报名 2报名
     let meetingItem = this.data.meetingInfo
     if (meetingItem.meetingSignUpType === 1) {
-      // 从消息报名的参会单位不可更改 
+      // 从消息报名的参会单位不可更改
       wx.setStorage({
         key:'companyDisabled',
         data:true
@@ -356,7 +358,7 @@ Page({
           }
         }
       })
-    }  
+    }
   },
 
   /**
@@ -366,7 +368,7 @@ Page({
 
     // 获取上一个页面的会议数据
     const meetingInfo = JSON.parse(options.meetingInfo)
- 
+
     const that = this
     this.setData({
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
@@ -395,7 +397,7 @@ Page({
       })
     }
 
-    // 如果会议的报名状态是待签到则显示去签到按钮   待签到的报名状态时 6  并且会议的不是已结束 
+    // 如果会议的报名状态是待签到则显示去签到按钮   待签到的报名状态时 6  并且会议的不是已结束
     if(this.data.meetingInfo.signUpStatus == 6 && this.data.meetingInfo.signUpStatus +'' !== '4' ){
       this.setData({
         showSignInBtn:true
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 0eaaf9c..9418e7f 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -18,11 +18,11 @@
 		</view>
 		<view class="sign-in">
 			<text>召开时间</text>
-			<text class="sign-in-text">{{meetingInfo.startTime + '至' + meetingInfo.endTime}}</text>
+			<text wx:if="{{meetingInfo.startTime}}" class="sign-in-text">{{meetingInfo.startTime + '至' + meetingInfo.endTime}}</text>
 		</view>
 		<view class="sign-in">
 			<text>召开地点</text>
-			<text class="sign-in-text">{{meetingInfo.venue + '/' + meetingInfo.address}}</text>
+			<text wx:if="{{meetingInfo.venue}}" class="sign-in-text">{{meetingInfo.venue + '/' + meetingInfo.address}}</text>
 		</view>
 		<view>
 			<text>报名截止时间</text>