From 299671922c4c6778723f77846b70966104f413ed Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 23 Dec 2021 20:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E7=A0=94=E8=AE=A8=E4=BC=9A=E9=AA=8C=E8=AF=81=E7=A0=81=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=20=E6=9C=89=E8=AF=AF=20=E6=8A=A5=E5=90=8D=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meetingDetailSigned/meetingDetailSigned.js   |  6 +++---
 pages/meetingDetailSigned/meetingDetailSigned.wxml | 12 ++++++------
 pages/signUpPageGuoji/signUpPageGuoji.js           |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index c06b5a6..570a18a 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -309,7 +309,7 @@ Page({
             })
           } else {
             wx.navigateTo({
-              url: `../signUpPageGuoji/signUpPageGuoji`
+              url: `../signUpPageGuoji/signUpPageGuoji?meetingId=${meetingItem.id}`
             })
           }
         }
@@ -343,8 +343,8 @@ Page({
       })
     }
 
-    // 如果会议的报名状态是待签到则显示去签到按钮   待签到的报名状态时 6
-    if(this.data.meetingInfo.signUpStatus == 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 c9b28f1..d7f0acf 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -202,12 +202,12 @@
 		<!-- vip显示 begin -->
 		<view wx:if="{{singInPersonInfo.guestType == 1}}" class="sign-in">
 			<text>演讲题目</text>
-			<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
+			<text class="sign-in-text">{{singInPersonInfo.speechTopic || ''}}</text>
 		</view>
 
 		<view class="meeting-files">
 			<text>演讲PPT</text>
-			<view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
+			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
 				<view>
 					<image src="../../assets/images/pdf.png"></image>
 					<text>{{item.name}}</text>
@@ -223,7 +223,7 @@
 
 		<view wx:if="{{singInPersonInfo.guestType == 1}}" class="sign-in-text">
 			<text>个人简介</text>
-			<text class="sign-in-text">{{singInPersonInfo.profile}}</text>
+			<text class="sign-in-text">{{singInPersonInfo.profile || ''}}</text>
 		</view>
 
 		<view wx:if="{{singInPersonInfo.guestType == 1}}">
@@ -314,9 +314,9 @@
 			<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
 		</view>
 
-		<view class="meeting-files">
+		<view class="meeting-files"  wx:if="{{singInPersonInfo.guestType == 2}}">
 			<text>演讲PPT</text>
-			<view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
+			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
 				<view>
 					<image src="../../assets/images/pdf.png"></image>
 					<text>{{item.name}}</text>
@@ -613,6 +613,6 @@
 </view>
 
 <view class="join-meeting"  style="margin-bottom:20px" wx:if="{{showSignInBtn}}">
- 				<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示 -->
+ 				<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示  并被会议不能是已结束 -->
 				 <text bindtap="toSignUp">去签到</text>
 	</view>
\ No newline at end of file
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js
index 225d2f1..968fef4 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.js
+++ b/pages/signUpPageGuoji/signUpPageGuoji.js
@@ -312,6 +312,7 @@ Page({
       let validateArr = this.data.inviteCodeArr.filter(item => {
         return this.data.inviteCode === item.code
       })
+
       if (validateArr.length === 0) {
         wx.showToast({
           title: '邀请码输入有误',
@@ -517,6 +518,7 @@ Page({
       id: id
     }).then(res => {
       if (res.success) {
+
         this.setData({
           meetingDetailInfo: res.result,
           inviteCodeArr: that.validateCodeArr(res.result),