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

public/react/src/App.css

@@ -55,6 +55,9 @@ html, body {
 .markdown-body p {
   white-space: pre-wrap;
 }
+.markdown-body > p {
+  line-height: 25px;
+}
 /* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
 .renderAsHtml.markdown-body p {
   white-space: inherit;

public/react/src/modules/courses/exercise/question/fillEmpty.js

@@ -129,7 +129,7 @@ class fillEmpty extends Component{
         }
         {
           // 答案公开，且试卷已经截止
-          isAdmin && 
+          questionType.standard_answer && 
           <div>
             <p className="bor-top-greyE pt20 mt20 font-16 mb10">参考答案：</p>
             { questionType.standard_answer && questionType.standard_answer.map((item,k)=>{

public/react/src/modules/courses/exercise/question/simpleAnswer.js

@@ -85,9 +85,9 @@ class simpleAnswer extends Component{
           </div>
         }
         {
-          isStudent && exercise.answer_open==true && exercise.exercise_status == 3 ?
+          isStudent && questionType.standard_answer ?
           <div className="bor-top-greyE pt20 mt20 standardAnswer">
-            <p>参考答案：</p>
+            <p className="mb10 font-16">参考答案：</p>
             {/* <li className="markdown-body answerStyle" dangerouslySetInnerHTML={{__html: markdownToHTML1(questionType.standard_answer && questionType.standard_answer[0])}}></li> */}
             <MarkdownToHtml content={questionType.standard_answer && questionType.standard_answer[0]} selector={'simgle_standard2_' + (this.props.index + 1)}
               className="answerStyle"                       

public/react/src/modules/courses/members/studentsList.js

@@ -125,23 +125,17 @@ class studentsList extends Component{
       isSpin:false,
       DownloadType:false,
       DownloadMessageval:undefined,
-      donwloading:false,
     }
   }
 /// 确认是否下载
   confirmysl(url){
-    this.setState({ donwloading: true })
     axios.get(url).then((response) => {
       if(response === undefined){
-        this.setState({ donwloading: false })
         return
       }
       if(response.data.status&&response.data.status===-1){
-        this.setState({ donwloading: false })
 
       }else if(response.data.status&&response.data.status===-2){
-        this.setState({ donwloading: false })
-
         if(response.data.message === "100"){
           // 已超出文件导出的上限数量（100 ），建议：
 
@@ -158,25 +152,19 @@ class studentsList extends Component{
         }
       }else {
         this.props.showNotification(`正在下载中`);
-        // window.open("/api"+url, '_blank');
+        window.open("/api"+url, '_blank');
-        this.setState({ donwloading: true })
+        // downloadFile({
-        downloadFile({
+        //   url: url,
-          url: url,
+        //   successCallback: (url) => {
-          successCallback: (url) => {
+        //     console.log('successCallback')
-            console.log('successCallback')
+        //   },
-            this.setState({ donwloading: false })
+        //   failCallback: (responseHtml, url) => {
-
+        //     console.log('failCallback')
-          },
+        //   }
-          failCallback: (responseHtml, url) => {
+        // })
-            console.log('failCallback')
-            this.setState({ donwloading: false })
-
-          }
-        })
       }
     }).catch((error) => {
       console.log(error)
-      this.setState({ donwloading: false })
     });
   }
 
@@ -615,23 +603,20 @@ class studentsList extends Component{
                        
                         `}</style>
               { isAdmin &&
-
               <li className="li_line drop_down fr color-blue font-16">
-                <Spin spinning={this.state.donwloading} >导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                 <ul className="drop_down_menu" style={{"right": "-20px", "left": "unset", "height": "auto"}}>
-                  <li onClick={(i) => this.confirmysl(exportUrltwo)}><a
+                  <li><a
                   	onClick={(i) => this.confirmysl(exportUrltwo)}>课堂信息</a>
                   </li>
-                  <li  onClick={(i) => this.confirmysl(exportUrlthree)}><a
+                  <li><a
                     onClick={(i) => this.confirmysl(exportUrlthree)}>活跃度</a>
                   </li>
-                  <li onClick={(i) => this.confirmysl(exportUrl)}><a
+                  <li><a
                     onClick={(i) => this.confirmysl(exportUrl)}>总成绩</a>
                   </li>
                 </ul>
-                </Spin>
               </li>
-
               }
               {/*<WordsBtn style="blue" className=""  onClick={(url)=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn>*/}
               {/*  */}

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

@@ -66,12 +66,14 @@ class PollDetailTabThird extends Component{
 
           {
             pollDetail && pollDetail.questions.map((item,key)=>{
+              console.log("ddd");
+              console.log(item.question.min_choices);
               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 && item.question.max_choices ? 
+                    { 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+"项" :

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

@@ -54,7 +54,7 @@ class PollListItem extends Component{
             }
           </p>
           <p className="color-grey-9 clearfix">
-            { item.author && <span className="mr20 fl">{item.author}</span> }
+            { item.author && <span className="mr20 fl mt3">{item.author}</span> }
             {
               item.polls_status !=1 &&
               <span className="fl mt3">

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

@@ -2123,7 +2123,7 @@ class PollNew extends Component {
 
 	//最小值
 	HandleGradationGroupChangee = (value, index, max, length) => {
-
+		// debugger
 		var minbool = false;
 		var maxbool = false;
 		let arr = this.state.adddom;