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

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

@@ -64,7 +64,7 @@ class PollDetailTabSecond extends Component{
 		let {page, limit, questions, questionsInfo , isSpin} = this.state;
     return(
       <Spin size="large" spinning={ isSpin }>
-      <div>
+      <React.Fragment>
         {
           questions && questions.length>0 && questions.map((item,key)=>{
             return(
@@ -179,7 +179,7 @@ class PollDetailTabSecond extends Component{
           })
         }
         {
-          questions && questions.length == 0 && <NoneData></NoneData>
+          questions && questions.length == 0 && <div className="edu-back-white"><NoneData></NoneData></div>
         }
         {
 					questionsInfo && questionsInfo.q_counts > limit &&
@@ -189,7 +189,7 @@ class PollDetailTabSecond extends Component{
           </div>
         }
         
-      </div>
+      </React.Fragment>
       </Spin>
     )
   }

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

@@ -1,6 +1,7 @@
 import React,{ Component } from "react";
 import {Checkbox,Radio} from "antd";
 
+import NoneData from "../coursesPublic/NoneData"
 
 import '../css/members.css'
 import '../css/busyWork.css'
@@ -26,31 +27,34 @@ class PollDetailTabThirdInfo extends Component{
                 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>
-                    }
-              </span>
-                }
-              </p>
-
               {
-                pollDetail && pollDetail.questions && pollDetail.questions.map((item,key)=>{
+                pollDetail && pollDetail.questions && pollDetail.questions.length > 0 && 
+                <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>
+                      }
+                    </span>
+                  }
+                </p>
+              }
+              
+              {
+                pollDetail && pollDetail.questions && pollDetail.questions.length > 0 && pollDetail.questions.map((item,key)=>{
                   return(
                     <div className="previewList">
                       <p className="pl30 pr30 pt30 pb15 font-16 clearfix">
@@ -120,6 +124,10 @@ class PollDetailTabThirdInfo extends Component{
                   )
                 })
               }
+
+              {
+                pollDetail && pollDetail.questions && pollDetail.questions.length == 0 && <NoneData></NoneData>
+              }
             </div>
             : ""
         }