Merge branch 'topic_bank' into dev_aliyun

public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js

@@ -21,11 +21,11 @@ class PollDetailTabThirdInfo extends Component{
             <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.q_counts===0 ? "" :
+						{ !pollDetail || !pollDetail.question_types || pollDetail.question_types.q_counts===0 ? "" :
               <span className="color-grey-3">
                 {
-                  pollDetail && pollDetail.question_types.q_counts > 0 &&
-                  <span>合计{pollDetail.question_types.q_counts}题：</span>
+                  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 &&
@@ -44,7 +44,7 @@ class PollDetailTabThirdInfo extends Component{
           </p>
 
           {
-            pollDetail && pollDetail.questions.map((item,key)=>{
+            pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{
               return(
                 <div className="previewList">
                   <p className="pl30 pr30 pt30 pb15 font-16 clearfix">