From 8d8a48e75d3cc96aa449066cc06eab845c1e616a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 26 Oct 2019 14:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E9=81=97=E7=95=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=982=20=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E7=9A=84=E9=97=AE=E5=8D=B7=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/poll/PollDetailTabThird.js        |   7 +
 .../courses/poll/PollDetailTabThirdInfo.js    | 179 +++++++++---------
 .../src/modules/courses/poll/PollInfo.js      |   6 +-
 .../user/usersInfo/banks/PollBanksContent.js  |  11 +-
 4 files changed, 116 insertions(+), 87 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index ee3befe1b..32d35818d 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js
@@ -20,6 +20,13 @@ class PollDetailTabThird extends Component{
     let url=`/polls/${pollId}.json`;
     axios.get(url).then((result)=>{
       if(result.status==200){
+				if (result.data.status === 401) {
+					//未登入
+					this.setState({
+						pollDetail: undefined
+					})
+					return
+				}
         this.setState({
           pollDetail:result.data
         })
diff --git a/public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js b/public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js
index 23023409c..526f32aa9 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js
@@ -14,107 +14,116 @@ class PollDetailTabThirdInfo extends Component{
   }
   render(){
     let { pollDetail }=this.props;
+    console.log("pollDetailpollDetail");
+    console.log(pollDetail);
     return(
-        <div className="edu-back-white">
-          {
-            pollDetail && pollDetail.poll.polls_description && 
-            <p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
-          }
-          <p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}>
-						{ !pollDetail || !pollDetail.question_types || pollDetail.question_types.q_counts===0 ? "" :
-              <span className="color-grey-3">
+      <div>
+        {
+          pollDetail !== undefined ?
+
+            <div className="edu-back-white">
+              {
+                pollDetail !== pollDetail.poll.polls_description &&
+                <p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
+              }
+              <p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}>
+                { !pollDetail || !pollDetail.question_types || pollDetail.question_types.q_counts===0 ? "" :
+                  <span className="color-grey-3">
                 {
                   pollDetail && pollDetail.question_types && pollDetail.question_types.q_counts > 0 &&
                   <span>合计{pollDetail.question_types && pollDetail.question_types.q_counts}题：</span>
                 }
-                {
-                  pollDetail && pollDetail.question_types.q_singles > 0 &&
-                  <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
-                }
-                {
-                  pollDetail && pollDetail.question_types.q_doubles > 0 &&
-                  <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
-                }
-                {
-                  pollDetail && pollDetail.question_types.q_mains > 0 &&
-                  <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
-                }
+                    {
+                      pollDetail && pollDetail.question_types.q_singles > 0 &&
+                      <span className="mr15 color-grey-9">单选题{pollDetail.question_types.q_singles}题</span>
+                    }
+                    {
+                      pollDetail && pollDetail.question_types.q_doubles > 0 &&
+                      <span className="mr15 color-grey-9">多选题{pollDetail.question_types.q_doubles}题</span>
+                    }
+                    {
+                      pollDetail && pollDetail.question_types.q_mains > 0 &&
+                      <span className="color-grey-9">主观题{pollDetail.question_types.q_mains}题</span>
+                    }
               </span>
-            }
-          </p>
+                }
+              </p>
 
-          {
-            pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{
-              return(
-                <div className="previewList">
-                  <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
-                    <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
-                    { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
-                    { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ? 
-                      <span className="color-grey-9 font-14 fl mt2">
+              {
+                pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{
+                  return(
+                    <div className="previewList">
+                      <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
+                        <span className="color-blue mr8 fl">{item.question.question_number}、{map[item.question.question_type]}</span>
+                        { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10">必答</span>:<span className="mustAnswer fl ml10 mr10">选答</span> }
+                        { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ?
+                          <span className="color-grey-9 font-14 fl mt2">
                         {
                           item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :
-                          "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
+                            "可选"+item.question.min_choices+"-"+item.question.max_choices+"项"
                         }
                       </span>:""
-                    }
-                  </p>
-									<p className="pl30 pr30 pb15"><span className="font-14  flex1" style={{
-										"white-space": "pre-wrap",
-										"word-break": "break-all",
-										"word-wrap": "break-word"
-									}}>{item.question.question_title}</span></p>
-                  {
-                    // 单选题
-                    item.question.question_type==1 &&
-                    <Radio.Group className="answerList" disabled>
+                        }
+                      </p>
+                      <p className="pl30 pr30 pb15"><span className="font-14  flex1" style={{
+                        "white-space": "pre-wrap",
+                        "word-break": "break-all",
+                        "word-wrap": "break-word"
+                      }}>{item.question.question_title}</span></p>
+                      {
+                        // 单选题
+                        item.question.question_type==1 &&
+                        <Radio.Group className="answerList" disabled>
+                          {
+                            item.question.answers.map((index,k)=>{
+                              return(
+                                <li className="df">
+                                  <Radio className="fl" value={index.answer_id}></Radio>
+                                  <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                                  {
+                                    index.answer_text=="其他" ? <p className="textLine"></p>:""
+                                  }
+
+                                </li>
+                              )
+                            })
+                          }
+                        </Radio.Group>
+                      }
                       {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df">
-                              <Radio className="fl" value={index.answer_id}></Radio>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                              
-                            </li>
-                          )
-                        })
+                        // 多选题
+                        item.question.question_type==2 &&
+                        <Checkbox.Group className="answerList" disabled>
+                          {
+                            item.question.answers.map((index,k)=>{
+                              return(
+                                <li className="df" key={k}>
+                                  <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
+                                  <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
+                                  {
+                                    index.answer_text=="其他" ? <p className="textLine"></p>:""
+                                  }
+                                </li>
+                              )
+                            })
+                          }
+                        </Checkbox.Group>
                       }
-                    </Radio.Group>
-                  }
-                  {
-                    // 多选题
-                    item.question.question_type==2 &&
-                    <Checkbox.Group className="answerList" disabled>
                       {
-                        item.question.answers.map((index,k)=>{
-                          return(
-                            <li className="df" key={k}>
-                              <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
-                              <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
-                              {
-                                index.answer_text=="其他" ? <p className="textLine"></p>:""
-                              }
-                            </li>
-                          )
-                        })
+                        // 主观题
+                        item.question.question_type == 3 &&
+                        <div className="pl30 pr30 pb20">
+                          <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
+                        </div>
                       }
-                    </Checkbox.Group>
-                  }
-                  {
-                    // 主观题
-                    item.question.question_type == 3 &&
-                    <div className="pl30 pr30 pb20">
-                      <textarea placeholder="在此填入答案" readOnly className="winput-100-130"></textarea>
                     </div>
-                  }
-                </div>
-              )
-            })
-          }
-        </div>
+                  )
+                })
+              }
+            </div>
+            : ""
+        }
+      </div>
     )
   }
 }
diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js
index b7d0a59dd..1d039f0dc 100644
--- a/public/react/src/modules/courses/poll/PollInfo.js
+++ b/public/react/src/modules/courses/poll/PollInfo.js
@@ -392,7 +392,11 @@ class PollInfo extends Component{
                           </span>:""
                         }
                       </div>
-                      <li className="pl30 pr30 mb10 lineh-20">{item.question.question_title}</li>
+											<p className="pl30 pr30 mb10 lineh-20"><span className="font-14  flex1" style={{
+												"white-space": "pre-wrap",
+												"word-break": "break-all",
+												"word-wrap": "break-word"
+											}}>{item.question.question_title}</span></p>
                       {
                         //单选
                         item.question.question_type==1 && 
diff --git a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
index be6bd5e2c..5c08b1249 100644
--- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
+++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js
@@ -18,7 +18,8 @@ class PollBanksContent extends Component{
     let url = `/exercise_banks/${bankId}.json`
     axios.get(url).then((result)=>{
       if(result){
-        let pollDetail = {
+				if (result.status == 200) {
+					let pollDetail = {
           poll:{
             id: result.data.poll && result.data.poll.id ,
             polls_description: result.data.poll && result.data.poll.description,
@@ -48,9 +49,17 @@ class PollBanksContent extends Component{
           authorize:result && result.data && result.data.authorize,
         }
         this.props.initPublic(crumbData,menuData,result.data);
+					if (result.data.status === 401) {
+						//未登入
+						this.setState({
+							pollDetail: undefined
+						})
+						return
+					}
         this.setState({
           pollDetail
         })
+				}
       }
     }).catch((error)=>{
       console.log(error);