From 08d6025393bb2791e5b508cad641b747dcbaff5d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 20 Jul 2019 10:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=8F=AF=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/poll/PollDetailTabThird.js | 14 +++++++-------
 public/react/src/modules/courses/poll/PollInfo.js  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js
index d322c9544..56455ffdb 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabThird.js
+++ b/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>
diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js
index 8256e3710..fc1d55385 100644
--- a/public/react/src/modules/courses/poll/PollInfo.js
+++ b/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+"项" :