From b37273cf535119fbab2517b0db12d59879e085c9 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen>
Date: Thu, 10 Nov 2022 10:14:14 +0800
Subject: [PATCH] =?UTF-8?q?[update]-1=E3=80=81=E4=BC=9A=E5=91=98=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=89=B9=E5=A4=8D=E6=96=87=E4=BB=B6=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=98=BE=E7=A4=BA=202=E3=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=BE=81=E9=9B=86=20=E6=8A=A5=E5=90=8D=E5=90=8E?=
 =?UTF-8?q?=E5=B0=B1=E5=8F=AF=E4=BB=A5=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/memberRequest.js                   | 2 +-
 src/views/MessagePage/MeetingDetailModal.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/utils/memberRequest.js b/src/utils/memberRequest.js
index 3c09762..07e14ca 100644
--- a/src/utils/memberRequest.js
+++ b/src/utils/memberRequest.js
@@ -21,7 +21,7 @@ let apiBaseUrl = window._CONFIG['memberURL'] || '/memberApi'
 const service = axios.create({
   //baseURL: '/jero-boot',
   baseURL: apiBaseUrl, // api base_url
-  timeout: 9000 // 请求超时时间
+  // timeout: 9000 // 请求超时时间
 })
 
 const err = (error) => {
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 085788c..572cfa6 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -869,7 +869,8 @@ export default {
               this.situationInfo = res.result
               // 对当前的会议状态做判断，处理当前详情模态框是否显示问题征集 表格
               let registerProcess = Number(this.situationInfo.registerProcess)
-              if(registerProcess === 6 || registerProcess === 7 || registerProcess === 8 || registerProcess === 9 || registerProcess === 10 || registerProcess === 14 || registerProcess === 15) {
+              // 2022-11-10修改成报名完 就可以提问题
+              if(registerProcess === 6 || registerProcess === 7 || registerProcess === 8 || registerProcess === 9 || registerProcess === 10 || registerProcess === 14 || registerProcess === 15 || registerProcess === 3 || registerProcess === 4 || registerProcess === 5 || registerProcess === 11) {
                 this.hasQuestionList = true
               }
             } else {