From 256ff1165a42c07619ea46a90b6c0313065fab0c Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Fri, 28 Jul 2023 19:05:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix-bug74265=E3=80=91=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E7=9A=84=E4=BF=A1=E6=81=AF=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetailSigned.wxml                  | 160 ++++++++++--------
 .../meetingDetailSigned.wxss                  |   2 +-
 2 files changed, 95 insertions(+), 67 deletions(-)

diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 3211087..3c8ee79 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -59,39 +59,39 @@
 			<text>收费二维码</text>
 			<image src="{{paymentQrCodeSrc}}" class="paymnet-qrcode-img"></image>
 		</view>
-       <!-- 标协会议（标准宣贯、学习培训） -是否具有问题征集--开始 -->
-       <view class="question-container-view" wx-if="{{meetingInfo.meetingType === '2' && (meetingInfo.tbMeetingType === '1' || meetingInfo.tbMeetingType === '2')}}">
-      <view>
-        <text>问题征集</text>
-        <text>{{meetingInfo.isAddQuestion === '1' ? '需要' : '不需要'}}</text>
-      </view>
-      <view wx-if="{{meetingInfo.isAddQuestion === '1'}}">
-        <text>征集截止时间</text>
-        <text>{{meetingInfo.endTimeAddQuestion}}</text>
-      </view>
+		<!-- 标协会议（标准宣贯、学习培训） -是否具有问题征集--开始 -->
+		<view class="question-container-view" wx-if="{{meetingInfo.meetingType === '2' && (meetingInfo.tbMeetingType === '1' || meetingInfo.tbMeetingType === '2')}}">
+			<view>
+				<text>问题征集</text>
+				<text>{{meetingInfo.isAddQuestion === '1' ? '需要' : '不需要'}}</text>
+			</view>
+			<view wx-if="{{meetingInfo.isAddQuestion === '1'}}">
+				<text>征集截止时间</text>
+				<text>{{meetingInfo.endTimeAddQuestion}}</text>
+			</view>
 
-    </view>
-     <!-- 标协会议（标准宣贯、学习培训） -是否具有问题征集--结束 -->
+		</view>
+		<!-- 标协会议（标准宣贯、学习培训） -是否具有问题征集--结束 -->
 		<view class="sign-in">
 			<text>会议内容</text>
 			<text class="sign-in-text">{{meetingInfo.meetingContent}}</text>
 		</view>
-    <view class="sign-in">
+		<view class="sign-in">
 			<text>备注</text>
 			<text class="sign-in-text">{{meetingInfo.remark || ''}}</text>
 		</view>
-     <!-- 标协会议（标准宣贯、学习培训） -问题征集详细信息--开始 -->
-    <view class="question-list-view" wx-if="{{meetingInfo.meetingType === '2' && (meetingInfo.tbMeetingType === '1' || meetingInfo.tbMeetingType === '2') && questionList.length > 0}}">
-      <view class="title to-signup">
+		<!-- 标协会议（标准宣贯、学习培训） -问题征集详细信息--开始 -->
+		<view class="question-list-view" wx-if="{{meetingInfo.meetingType === '2' && (meetingInfo.tbMeetingType === '1' || meetingInfo.tbMeetingType === '2') && questionList.length > 0}}">
+			<view class="title to-signup">
 				<text>问题征集</text>
 			</view>
-      <view  wx:for="{{questionList}}" class="question-list-view-info" wx:key="item">
-        <text>标准号及标准名称</text>
-        <text>{{ item.standardNumber + ' ( ' + item.standardName + ' ) '}}</text>
-      </view>
-      <view class="question-notice">提问标准相关问题请到PC端操作
-      </view>
-    </view>
+			<view wx:for="{{questionList}}" class="question-list-view-info" wx:key="item">
+				<text>标准号及标准名称</text>
+				<text>{{ item.standardNumber + ' ( ' + item.standardName + ' ) '}}</text>
+			</view>
+			<view class="question-notice">提问标准相关问题请到PC端操作
+			</view>
+		</view>
 		<view class="meeting-files">
 			<text>会议通知</text>
 			<view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
@@ -131,28 +131,27 @@
 			<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' style="height:auto">
-				<text style="min-width:160rpx">酒店联系人</text>
-				<text>{{item.hotelContacts + (item.hotelContactsPhone ?'：':'') + item.hotelContactsPhone + ' '}}</text>
-			</view>
+	<!-- 酒店信息begin -->
+	<view class="hotel-info basic-info">
+		<view class="title to-signup">
+			<text>酒店信息</text>
 		</view>
-		<!-- 酒店信息end -->
+		<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' style="height:auto">
+			<text style="min-width:160rpx">酒店联系人</text>
+			<text>{{item.hotelContacts + (item.hotelContactsPhone ?'：':'') + 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>
 
@@ -202,6 +201,41 @@
 			<text>是否需要发票</text>
 			<text>{{singInPersonInfo.needInvoice_dictText === null ? '': singInPersonInfo.needInvoice_dictText}}</text>
 		</view>
+		<!-- 参会人角色 缴费方式 非打包并且需要发票显示发票的相关信息 -->
+		<view class="inner-box-view" wx:if="{{singInPersonInfo.identity === 2 && singInPersonInfo.payMode !== 3 && singInPersonInfo.needInvoice}}">
+			<view>
+				<text>企业名称</text>
+				<text>{{singInPersonInfo.companyName || ''}}</text>
+			</view>
+			<view>
+				<text>信用代码</text>
+				<text>{{singInPersonInfo.dutyCode || ''}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.needInvoice === 2}}">
+				<text>公司地址</text>
+				<text>{{singInPersonInfo.companyAddress || ''}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.needInvoice === 2}}">
+				<text>公司电话</text>
+				<text>{{singInPersonInfo.companyPhone || ''}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.needInvoice === 2}}">
+				<text>开户行</text>
+				<text>{{singInPersonInfo.openingBank || ''}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.needInvoice === 2}}">
+				<text>银行账号</text>
+				<text>{{singInPersonInfo.bankAccount || ''}}</text>
+			</view>
+			<view wx:if="{{singInPersonInfo.needInvoice === 2}}">
+				<text>联行号</text>
+				<text>{{singInPersonInfo.linkBankNumber || ''}}</text>
+			</view>
+			<view>
+				<text>发票项目</text>
+				<text>{{singInPersonInfo.invoiceProject_dictText || ''}}</text>
+			</view>
+		</view>
 		<view class="sign-in" wx:if="{{!!singInPersonInfo.postContactAddress && singInPersonInfo.identity === 2}}">
 			<text>邮寄地址</text>
 			<text class="sign-in-text">{{singInPersonInfo.postContactAddress === null ? '' :
@@ -213,8 +247,7 @@
 		</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>
 			<text wx:if="{{singInPersonInfo.signUpStatus === 6}}" bindtap="editSignupInfo">编辑报名信息</text>
@@ -244,7 +277,7 @@
 			<text class="sign-in-text">{{singInPersonInfo.speechTopic || ''}}</text>
 		</view>
 
-		<view class="meeting-files" wx:if="{{singInPersonInfo.guestType == 1}}" >
+		<view class="meeting-files" wx:if="{{singInPersonInfo.guestType == 1}}">
 			<text>演讲PPT</text>
 			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
 				<view>
@@ -353,7 +386,7 @@
 			<text class="sign-in-text">{{singInPersonInfo.speechTopic}}</text>
 		</view>
 
-		<view class="meeting-files"  wx:if="{{singInPersonInfo.guestType == 2}}">
+		<view class="meeting-files" wx:if="{{singInPersonInfo.guestType == 2}}">
 			<text>演讲PPT</text>
 			<view class="file-name" wx:for="{{speechPptList}}" wx:key="item">
 				<view>
@@ -509,7 +542,7 @@
 	</view>
 	<!-- 会议状态未可报名 并且未超过截止时间 -->
 	<view class="join-meeting" wx:if="{{meetingInfo.meetingSignUpType === 1 && !isMoreTime}}">
-	<text bindtap='joinMeeting'>报名</text>
+		<text bindtap='joinMeeting'>报名</text>
 	</view>
 
 
@@ -546,14 +579,11 @@
 	</view>
 	<!-- 参会人的付款凭证审核状态 0 未审核 1已通过 2拒绝 -->
 	<!-- 未审核不显示 -->
-	<view class="p-20 base"
-		wx:if="{{singInPersonInfo.paymentRecord && (singInPersonInfo.payMode === 1 || singInPersonInfo.payMode === 2)}}">
+	<view class="p-20 base" wx:if="{{singInPersonInfo.paymentRecord && (singInPersonInfo.payMode === 1 || singInPersonInfo.payMode === 2)}}">
 		<text>缴费凭证状态：</text>
-		<text
-			wx:if="{{singInPersonInfo.checkResult === 0 && singInPersonInfo.paymentRecord}}">{{singInPersonInfo.checkResult_dictText}}</text>
+		<text wx:if="{{singInPersonInfo.checkResult === 0 && singInPersonInfo.paymentRecord}}">{{singInPersonInfo.checkResult_dictText}}</text>
 		<text wx:if="{{singInPersonInfo.checkResult === 1}}">{{singInPersonInfo.checkResult_dictText}}</text>
-		<text
-			wx:if="{{singInPersonInfo.checkResult === 2}}">{{singInPersonInfo.checkResult_dictText}}({{singInPersonInfo.checkRemark}})</text>
+		<text wx:if="{{singInPersonInfo.checkResult === 2}}">{{singInPersonInfo.checkResult_dictText}}({{singInPersonInfo.checkRemark}})</text>
 	</view>
 	<!-- 缴费凭证 end -->
 	<!-- 报名信息end -->
@@ -576,19 +606,18 @@
 	<!-- 签到信息end -->
 
 	<!-- 开票邮寄信息 begin -->
-  <!-- wx:if="{{singInPersonInfo.checkResult !== 0 }}" -->
-	<view class="basic-info" style="margin-top: 10px;" >
+	<!-- wx:if="{{singInPersonInfo.checkResult !== 0 }}" -->
+	<view class="basic-info" style="margin-top: 10px;">
 		<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>
-<!-- wx:if="{{ singInPersonInfo.checkResult !== 0 }}" -->
-	<view class="basic-info" style="margin-top: 10px;" >
+	<!-- wx:if="{{ singInPersonInfo.checkResult !== 0 }}" -->
+	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
 			<text>开票邮寄信息</text>
 		</view>
@@ -647,13 +676,12 @@
 	<!-- 线上缴费的只有在会议期间可以上传 -->
 	<!-- 打包的不显示 确定按钮  -->
 	<!-- 会议状态不能是已结束 -->
-	<view class="sign-up"
-		wx:if="{{singInPersonInfo.checkResult !== 1  && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3 && meetingInfo.meetingStatus +'' !== '4'  }}">
+	<view class="sign-up" wx:if="{{singInPersonInfo.checkResult !== 1  && singInPersonInfo.payMode && singInPersonInfo.payMode !== 3 && meetingInfo.meetingStatus +'' !== '4'  }}">
 		<text bindtap="editPayRecord">确定 </text>
 	</view>
 </view>
 
-<view class="join-meeting"  style="margin-bottom:20px" wx:if="{{showSignInBtn}}">
- 				<!-- 不需要花钱的会议、打包的会议 报名完显示  花钱的会议 现场缴费需要审核凭证通过显示 汇款的报完名显示  并被会议不能是已结束 -->
-				 <text bindtap="toSignUp">去签到</text>
-	</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/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 8c21db7..d265a06 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -31,7 +31,7 @@ page{
   font-size: 15px;
   font-weight: 500;
 }
-.basic-info view{
+.basic-info view:not(.inner-box-view){
   background-color: #FFF;
   padding: 15px;
   height: 40px;