diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 2f4b4da..7e3eada 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/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({
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index ca303d8..79a770a 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -59,6 +59,18 @@
 			<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>
 			<text class="sign-in-text">{{meetingInfo.meetingContent}}</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">
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 0cd9b44..0b178ec 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -357,4 +357,33 @@ margin-top: 15px;
   display: block;
   background-color: #069f99;
 }
- 
\ No newline at end of file
+ 
+/* 问题征集新的样式 */
+.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;
+}
\ No newline at end of file
diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index ed1a936..96f7c5c 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -28,8 +28,10 @@ Page({
     payOrCode: '',
     // 标协会议酒店信息
     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 => {
@@ -60,7 +63,7 @@ Page({
             meetingFilesList: res,
           })
         })
-        // 判断当前会议是否超出时间 
+        // 判断当前会议是否超出时间
         let flag = that.compareCurrentTime(res.result.registerDeadline)
         if (flag) {
           wx.showToast({
@@ -87,7 +90,7 @@ Page({
   },
   // 报名
   signUp() {
-    // 超出报名时间 提示 
+    // 超出报名时间 提示
     let flag = this.compareCurrentTime(this.data.meetingDetailIngfo.registerDeadline)
     if (flag) {
       wx.showToast({
@@ -162,6 +165,7 @@ Page({
     })
     let url = decodeURIComponent(options.q)
     let meetingId = url.split('=')[1]
+    meetingId = '1548862942556176385'
     this.queryMeetingDetail(meetingId)
 
     // this.queryMeetingDetail("1479397531946348545")
@@ -217,4 +221,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
\ No newline at end of file
+})
diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml
index ab4ce5f..5c15f6c 100644
--- a/pages/signUpEntrance/signUpEntrance.wxml
+++ b/pages/signUpEntrance/signUpEntrance.wxml
@@ -21,9 +21,9 @@
     </view>
 
     <view wx:for="{{meetingInfo.meetingContactsList}}" wx:key="item">
-			<text>会议联系人及手机号</text>
-			<text>{{item.meetingContactsName + (item.meetingContactsName ?'：':'') + item.meetingContactsPhone + ' '}}</text>
-		</view>
+      <text>会议联系人及手机号</text>
+      <text>{{item.meetingContactsName + (item.meetingContactsName ?'：':'') + item.meetingContactsPhone + ' '}}</text>
+    </view>
 
     <view wx:if="{{meetingDetailIngfo.meetingType === '1'}}">
       <text>所属工作组</text>
@@ -96,7 +96,7 @@
         <text style="color:#999;flex-shrink: 0;" bindtap='preview' data-file="{{item}}">暂无</text>
       </view>
     </view>
-<!-- 会议费为0 不显示  -->
+    <!-- 会议费为0 不显示  -->
     <view class="form-payQrCode" wx:if="{{meetingDetailIngfo.meetingCosts !== '0.00' && meetingDetailIngfo.paymentQrCode }}">
       <text style="padding-left:15px">缴费二维码</text>
       <view>
@@ -113,22 +113,36 @@
       <text>酒店名称</text>
       <text>{{meetingDetailIngfo.hotelName || ''}}</text>
     </view>
-    <view wx:if="{{hotelContactsList.length > 0}}" wx:for="{{hotelContactsList}}" class="hotel-info" wx:key="item" > 
+    <view wx:if="{{hotelContactsList.length > 0}}" wx:for="{{hotelContactsList}}" class="hotel-info" wx:key="item">
       <text>酒店联系人</text>
-      <text>{{item.hotelContacts}}  {{item.hotelContactsPhone ? '-' : ''}} {{item.hotelContactsPhone}}</text>
+      <text>{{item.hotelContacts}} {{item.hotelContactsPhone ? '-' : ''}} {{item.hotelContactsPhone}}</text>
     </view>
 
     <view wx:if="{{hotelContactsList.length > 0}}" class="hotel-info">
-      <text >酒店地址</text>
+      <text>酒店地址</text>
       <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 class="sign-up-empty"></view>
-  <view class="sign-up" wx:if="{{isMoreBool}}">
-    <button class="sign-up-btn" bindtap='signUp'>报名</button>
-  </view>
 </view>
+
+<view class="sign-up-empty"></view>
+<view class="sign-up" wx:if="{{isMoreBool}}">
+  <button class="sign-up-btn" bindtap='signUp'>报名</button>
+</view>
\ No newline at end of file
diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss
index 00cf3d1..8c3a042 100644
--- a/pages/signUpEntrance/signUpEntrance.wxss
+++ b/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;