[add] -报名页、会议详情页标协会议（标准宣贯、学习培训）增加 问题征集相关信息

pages/meetingDetailSigned/meetingDetailSigned.js

@@ -49,7 +49,8 @@ Page({
     form: {},
     showSignInBtn:false, // 是否显示签到按钮
     isMoreTime:false, // 是否超过 会议截止报名时间
-    meetingTypeText:""  // 会议类型
+    meetingTypeText:"",  // 会议类型
+    questionList: [], // 标协会议 存储官宣答疑的数组
   },
       /*
     * 会议类型
@@ -388,14 +389,18 @@ Page({
 
     // 获取上一个页面的会议数据
     const meetingInfo = JSON.parse(options.meetingInfo)
+    console.log("---------meetingInfo----------", meetingInfo)
 
     const that = this
     this.setData({
       paymentQrCodeSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + meetingInfo.paymentQrCode
     })
     if(meetingInfo){
+      meetingInfo.meetingType = meetingInfo.meetingType + ''
+      meetingInfo.tbMeetingType = meetingInfo.tbMeetingType + ''
       this.setData({
-        meetingInfo:meetingInfo
+        meetingInfo:meetingInfo,
+        questionList: meetingInfo.questionList || []
       })
       let flag = this.compareCurrentTime(meetingInfo.registerDeadline)
       this.setData({
@@ -406,7 +411,8 @@ Page({
       MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
         if(res.success){
           this.setData({
-            meetingInfo:res.result
+            meetingInfo:res.result,
+            questionList: res.result.questionList || []
           })
           let flag = this.compareCurrentTime(res.result.registerDeadline)
           this.setData({

pages/meetingDetailSigned/meetingDetailSigned.wxml

@@ -58,6 +58,18 @@
 		<view wx:if="{{meetingInfo.paymentQrCode}}" style="height:auto">
 			<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>
 		<view class="sign-in">
 			<text>会议内容</text>
@@ -67,6 +79,15 @@
 			<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">
+				<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>
 		<view class="meeting-files">
 			<text>会议通知</text>
 			<view class="file-name" wx:for="{{meetingFilesList}}" wx:key="item">

pages/meetingDetailSigned/meetingDetailSigned.wxss

@@ -358,3 +358,32 @@ margin-top: 15px;
   background-color: #069f99;
 }
  
+/* 问题征集新的样式 */
+.question-list-view{
+  margin-top: 10px;
+  flex-direction: column;
+  align-items: flex-start !important;
+  height: auto !important;
+  padding: 0!important;
+}
+.question-container-view{
+  flex-direction: column;
+  align-items: flex-start !important;
+  height: auto !important;
+  padding: 0!important;
+}
+.question-container-view view,
+.question-list-view-info{
+  width: 100%;
+  box-sizing: border-box;
+  min-height: 70px;
+  font-size: 14px;
+  align-items: flex-start!important;
+}
+.question-container-view view text:nth-last-child(1),
+.question-list-view-info text:nth-last-child(1) {
+  width: 0;
+  display: inline-block;
+  flex: 1;
+  text-align: right;
+}

pages/signUpEntrance/signUpEntrance.js

@@ -29,7 +29,9 @@ Page({
     // 标协会议酒店信息
     hotelContactsList: [],
     // 当前会议是否超出时间
-    isMoreBool: false
+    isMoreBool: false,
+    // 标协会议问题征集数据
+    questionList: []
   },
   compareCurrentTime(time) {
     let date = new Date()
@@ -52,7 +54,8 @@ Page({
           meetingType: that.generateMeetingType(res.result.meetingType),
           payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode,
           tbMeetingType: that.generateTbMeetingType(res.result.tbMeetingType),
-          hotelContactsList: res.result.hotelContactsList
+          hotelContactsList: res.result.hotelContactsList,
+          questionList: res.result.questionList || []
         })
         console.log(that.data.hotelContactsList);
         initFileList(res.result.meetingFiles).then(res => {
@@ -162,6 +165,7 @@ Page({
     })
     let url = decodeURIComponent(options.q)
     let meetingId = url.split('=')[1]
+    meetingId = '1548862942556176385'
     this.queryMeetingDetail(meetingId)
 
     // this.queryMeetingDetail("1479397531946348545")

pages/signUpEntrance/signUpEntrance.wxml

@@ -123,7 +123,22 @@
       <text class="hotel-text">{{meetingDetailIngfo.hotelAddress || ''}}</text>
 
     </view>
-
+    <!-- 标协会议（标准宣贯、学习培训） -是否具有问题征集 -->
+    <view class="question-container-view" wx-if="{{meetingDetailIngfo.meetingType === '2' && (meetingDetailIngfo.tbMeetingType === '1' || meetingDetailIngfo.tbMeetingType === '2')}}">
+      <view>
+        <text>问题征集</text>
+        <text>{{meetingDetailIngfo.isAddQuestion === '1' ? '需要' : '不需要'}}</text>
+      </view>
+      <view wx-if="{{meetingDetailIngfo.isAddQuestion === '1'}}">
+        <text>征集截止时间</text>
+        <text>{{meetingDetailIngfo.endTimeAddQuestion}}</text>
+      </view>
+      <view wx:if="{{questionList.length > 0}}" wx:for="{{questionList}}" class="hotel-info" wx:key="item">
+        <text>标准号及标准名称</text>
+        <text>{{ item.standardNumber + ' ( ' + item.standardName + ' ) '}}</text>
+      </view>
+    </view>
+  </view>
 
 </view>
 
@@ -131,4 +146,3 @@
 <view class="sign-up" wx:if="{{isMoreBool}}">
   <button class="sign-up-btn" bindtap='signUp'>报名</button>
 </view>
-</view>

pages/signUpEntrance/signUpEntrance.wxss

@@ -19,7 +19,7 @@ page{
   font-size: 15px;
   font-weight: 500;
 }
-.basic-info view{
+.basic-info view:not(.question-container-view){
   background-color: #FFF;
   padding: 15px;
   height: 40px;