Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

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

@@ -71,13 +71,13 @@ class PollDetailTabThird extends Component{
                   <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 ? 
-                    <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+"项"
-                      }
-                    </span>:""
+                    { item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ? 
+                      <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+"项"
+                        }
+                      </span>:""
                     }
                   </p>
                   <li className="pl30 pr30 pb15">{item.question.question_title}</li>

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

@@ -382,7 +382,7 @@ class PollInfo extends Component{
                       <div className="pl30 pr30 mt30 mb10 clearfix">
                         <span className="color-blue fl font-16">{item.question.question_number}、{map[item.question.question_type]}</span>
                         { item.question.is_necessary==1 ? <span className="mustAnswer fl ml10 mr10 mt5">必答</span>:<span className="mustAnswer fl ml10 mr10 mt5">选答</span> }
-                        { item.question.question_type == 2 ? 
+                        { item.question.question_type == 2 && item.question.min_choices && item.question.max_choice ? 
                           <span className="color-grey-9 font-14 fl mt2">
                             {
                               item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" :