From 824f4e10273bf8ced14b662f876bbcb3cad8ffb3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 18 Oct 2021 14:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BC=9A=E8=AE=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8A=A0=E5=85=A5=E9=85=92=E5=BA=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/signUpEntrance/signUpEntrance.js   |  6 +++-
 pages/signUpEntrance/signUpEntrance.wxml | 44 ++++++++++++++++--------
 pages/signUpEntrance/signUpEntrance.wxss |  6 ++++
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index 1f950e9..ac363bd 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -26,6 +26,8 @@ Page({
     meetingFilesList: [],
     // 缴费二维码的图片路径
     payOrCode: '',
+    // 标协会议酒店信息
+    hotelContactsList:[]
   },
   // 获取会议详情
   queryMeetingDetail(id) {
@@ -38,8 +40,10 @@ Page({
           meetingDetailIngfo: res.result,
           meetingType: that.generateMeetingType(res.result.meetingType),
           payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode,
-          tbMeetingType:that.generateTbMeetingType(res.result.tbMeetingType)
+          tbMeetingType:that.generateTbMeetingType(res.result.tbMeetingType),
+          hotelContactsList:res.result.hotelContactsList
         })
+        console.log(that.data.hotelContactsList);
         initFileList(res.result.meetingFiles).then(res => {
           that.setData({
             meetingFilesList: res,
diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml
index f56899d..2d82415 100644
--- a/pages/signUpEntrance/signUpEntrance.wxml
+++ b/pages/signUpEntrance/signUpEntrance.wxml
@@ -23,19 +23,19 @@
       <text>所属工作组</text>
       <text>{{meetingDetailIngfo.workingGroupName}}</text>
     </view>
-    
+
     <view wx:if="{{meetingDetailIngfo.meetingType === '5'}}">
       <text>所属分标委</text>
       <text>{{meetingDetailIngfo.caseCommitteeName}}</text>
     </view>
 
-    <view>
+    <view class="sign-in">
       <text>召开时间</text>
-      <text>{{meetingDetailIngfo.startTime + '~' + meetingDetailIngfo.endTime }}</text>
+      <text class="sign-in-text">{{meetingDetailIngfo.startTime + '~' + meetingDetailIngfo.endTime }}</text>
     </view>
-    <view>
+    <view class="sign-in">
       <text>召开地点</text>
-      <text>{{meetingDetailIngfo.venue + '/' + meetingDetailIngfo.address}}</text>
+      <text class="sign-in-text">{{meetingDetailIngfo.venue + '/' + meetingDetailIngfo.address}}</text>
     </view>
     <view>
       <text>年份</text>
@@ -50,21 +50,21 @@
       <text>{{meetingDetailIngfo.meetingCosts}}</text>
     </view>
 
-    <view wx:if="{{meetingDetailIngfo.meetingType === '2' }}"> 
+    <view wx:if="{{meetingDetailIngfo.meetingType === '2' }}">
       <text>会议费用（VIP）</text>
       <text>{{meetingDetailIngfo.meetingCostsVip}}</text>
     </view>
 
-    <view wx:if="{{meetingDetailIngfo.meetingType === '2' }}" class="sign-in"> 
+    <view wx:if="{{meetingDetailIngfo.meetingType === '2' }}" class="sign-in">
       <text>注册签到时间</text>
-      <text class="sign-in-text">{{meetingDetailIngfo.startSignInTime + '~'+  meetingDetailIngfo.endSignInTime}}</text>
+      <text class="sign-in-text">{{meetingDetailIngfo.startSignInTime + '~'+ meetingDetailIngfo.endSignInTime}}</text>
     </view>
-    
+
     <view class="sign-in">
       <text>会议内容</text>
       <text class="sign-in-text">{{meetingDetailIngfo.meetingContent}}</text>
     </view>
-    <view class="meeting-files" wx:if="{{meetingFilesList.length >  0}}" >
+    <view class="meeting-files" wx:if="{{meetingFilesList.length >  0}}">
       <text>会议通知</text>
       <view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">
         <view>
@@ -75,9 +75,9 @@
       </view>
     </view>
 
-    <view class="meeting-files" wx:if="{{meetingFilesList.length === 0}}" >
+    <view class="meeting-files" wx:if="{{meetingFilesList.length === 0}}">
       <text>会议通知</text>
-      <view class="file-name"  >
+      <view class="file-name">
         <view>
           <image src="../../assets/images/pdf.png"></image>
           <text>{{item.name}}</text>
@@ -93,16 +93,32 @@
       </view>
     </view>
 
+
+
     <view class="sign-in">
       <text>备注</text>
       <text class="sign-in-text">{{meetingDetailIngfo.remark === null ? '' : meetingDetailIngfo.remark}}</text>
     </view>
 
+    <view wx:if="{{hotelContactsList.length > 0}}">
+      <text>酒店名称</text>
+      <text>{{meetingDetailIngfo.hotelName}}</text>
+    </view>
+    <view wx:if="{{hotelContactsList.length > 0}}" wx:for="{{hotelContactsList}}">
+      <text>酒店联系人</text>
+      <text>{{item.hotelContacts}} - {{item.hotelContactsPhone}}</text>
+    </view>
+
+    <view wx:if="{{hotelContactsList.length > 0}}">
+      <text>酒店地址</text>
+      <text class="hotel-text">{{meetingDetailIngfo.hotelAddress}}</text>
+    </view>
+
 
   </view>
 
   <view class="sign-up-empty"></view>
-  <view class="sign-up" >
-   <button class="sign-up-btn" bindtap='signUp'>报名</button>
+  <view class="sign-up">
+    <button class="sign-up-btn" bindtap='signUp'>报名</button>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss
index a912798..f5990b9 100644
--- a/pages/signUpEntrance/signUpEntrance.wxss
+++ b/pages/signUpEntrance/signUpEntrance.wxss
@@ -177,4 +177,10 @@ page{
 }
 .sign-in-text {
 margin-top: 15px;
+}
+.hotel {
+  width: 100%;
+}
+.hotel .hotel-text {
+  text-align: right;
 }
\ No newline at end of file