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 @@
所属工作组
{{meetingDetailIngfo.workingGroupName}}
-
+
所属分标委
{{meetingDetailIngfo.caseCommitteeName}}
-
+
召开时间
- {{meetingDetailIngfo.startTime + '~' + meetingDetailIngfo.endTime }}
+ {{meetingDetailIngfo.startTime + '~' + meetingDetailIngfo.endTime }}
-
+
召开地点
- {{meetingDetailIngfo.venue + '/' + meetingDetailIngfo.address}}
+ {{meetingDetailIngfo.venue + '/' + meetingDetailIngfo.address}}
年份
@@ -50,21 +50,21 @@
{{meetingDetailIngfo.meetingCosts}}
-
+
会议费用(VIP)
{{meetingDetailIngfo.meetingCostsVip}}
-
+
注册签到时间
- {{meetingDetailIngfo.startSignInTime + '~'+ meetingDetailIngfo.endSignInTime}}
+ {{meetingDetailIngfo.startSignInTime + '~'+ meetingDetailIngfo.endSignInTime}}
-
+
会议内容
{{meetingDetailIngfo.meetingContent}}
-
+
会议通知
@@ -75,9 +75,9 @@
-
+
会议通知
-
+
{{item.name}}
@@ -93,16 +93,32 @@
+
+
备注
{{meetingDetailIngfo.remark === null ? '' : meetingDetailIngfo.remark}}
+
+ 酒店名称
+ {{meetingDetailIngfo.hotelName}}
+
+
+ 酒店联系人
+ {{item.hotelContacts}} - {{item.hotelContactsPhone}}
+
+
+
+ 酒店地址
+ {{meetingDetailIngfo.hotelAddress}}
+
+
-
-
+
+
\ 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