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

app/controllers/polls_controller.rb

@@ -936,7 +936,7 @@ class PollsController < ApplicationController
   def commit_result
     ActiveRecord::Base.transaction do
       begin
-        @poll_users = @poll.all_poll_users(current_user.id)
+        @poll_users = @poll.all_poll_users(current_user.id).where(commit_status:1)  # 问卷已提交的用户
         @poll_commit_ids = @poll_users.commit_by_status(1).pluck(:user_id) #问卷提交用户的id
         @page  = params[:page] || 1
         @limit = params[:limit] || 10

app/views/polls/commit_result.json.jbuilder

@@ -14,7 +14,7 @@ if @poll_questions_count > 0
     json.array! @poll_questions do |question|
       json.partial! "polls/commit_answers_result", question: question,
                     answers:question.poll_answers,
-                    question_votes:question.poll_votes    #问题的全部答案
+                    question_votes:question.poll_votes.where(user_id:@poll_commit_ids)    #问题的全部答案
     end
   end
 else

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"