Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

app/controllers/games_controller.rb

@@ -407,7 +407,7 @@ class GamesController < ApplicationController
     if(params[:choose] == "true")
       challenge.challenge_chooses.each_with_index do |choose, index|
         @answer += "第"+ ((index + 1).to_s) +"题：<br />"
-        @answer += choose.answer
+        @answer += (choose.answer.blank? ? choose.standard_answer : choose.answer)
         @answer += "<br /><br /><br />"
       end
     else

app/views/games/_game_choose_results.html.erb

@@ -41,7 +41,7 @@
                 </div>
                 <div class="-task-ces-info undis" id="test_case_<%= index %>">
                 <ul class=" font-14">
-                  <% if choose.choose_outputs.blank? %>
+                  <% if choose.current_choose_outputs.blank? %>
                       <li><span class="ml30">尚未提交，暂不支持查看</span></li>
                   <% else %>
                       <% if choose.current_choose_outputs.try(:answer) == choose.standard_answer || @game.status == 2  %>

app/views/games/_game_show.html.erb

@@ -43,7 +43,6 @@
         <% else %>
             <span class="btn-cir-big fr mt8 mr15" >经验值：<%= @game_challenge.choose_score.to_i %></span>
         <%  end %>
-
       </ul>
       <div class="cl"></div>
       <div  class="-flex -relative greytab-inner">