From 859bcd3c8e81be5286178d08b7eb8cf3dcbe0891 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 26 Sep 2017 09:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E8=80=83=E7=AD=94=E6=A1=88=E9=9C=80=E8=A6=81=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=94=9F=E6=88=901=E4=B8=AA+=E9=80=89=E6=8B=A9=E9=A2=98?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AF=84=E6=B5=8B=E6=97=B6=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=AF=84=E6=B5=8B=E7=BB=93=E6=9E=9C=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb           | 2 +-
 app/views/games/_game_choose_results.html.erb | 2 +-
 app/views/games/_game_show.html.erb           | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 78d7dd120..885ff73d2 100644
--- a/app/controllers/games_controller.rb
+++ b/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
diff --git a/app/views/games/_game_choose_results.html.erb b/app/views/games/_game_choose_results.html.erb
index c1ea40b5d..fba69efed 100644
--- a/app/views/games/_game_choose_results.html.erb
+++ b/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  %>
diff --git a/app/views/games/_game_show.html.erb b/app/views/games/_game_show.html.erb
index c30f163b9..b4e5f660a 100644
--- a/app/views/games/_game_show.html.erb
+++ b/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">