From 5eaef1abe3df5af9e66275023015bedabfdee659 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 25 Sep 2017 14:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=80=89=E6=8B=A9=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb            | 2 +-
 app/views/challenges/_edit_evaluating.html.erb | 4 ++--
 app/views/games/_code_actions.html.erb         | 2 +-
 app/views/games/_game_choose_results.html.erb  | 2 +-
 app/views/games/show.js.erb                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 72d476c49..78d7dd120 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -339,7 +339,7 @@ class GamesController < ApplicationController
       @game.update_attribute(:final_score, score)
     end
     respond_to do |format|
-      format.js{redirect_to myshixun_game_path(@game, :myshixun_id => @myshixun, :choose => 1)}
+      format.js{redirect_to myshixun_game_path(@game, :myshixun_id => @myshixun, :choose => @right)}
     end
   end
 
diff --git a/app/views/challenges/_edit_evaluating.html.erb b/app/views/challenges/_edit_evaluating.html.erb
index 891458a70..16b58d8ea 100644
--- a/app/views/challenges/_edit_evaluating.html.erb
+++ b/app/views/challenges/_edit_evaluating.html.erb
@@ -49,8 +49,8 @@
                           <i class="fa fa-lock font-grey ml5" ></i>
                       <% end %>
                     </p>
-                    <div class="clearfix"><span class="fl fb">输入：</span><p class="fl"><%= match_specific_symbol test.input unless test.input.blank? %></p></div>
-                    <div class="clearfix"><span class="fl fb">输出：</span><p class="fl"><%= match_specific_symbol test.output unless test.output.blank? %></div>
+                    <div class="clearfix"><span class="fl fb">输入：</span><p class="fl break_word with95"><%= match_specific_symbol test.input unless test.input.blank? %></p></div>
+                    <div class="clearfix"><span class="fl fb">输出：</span><p class="fl break_word with95"><%= match_specific_symbol test.output unless test.output.blank? %></div>
                   </li>
               <% end %>
           <% else %>
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb
index 239fa8d8d..5dbeb1731 100644
--- a/app/views/games/_code_actions.html.erb
+++ b/app/views/games/_code_actions.html.erb
@@ -14,7 +14,7 @@
 <div id="code_test">
   <% if @st == 0 %>
       <a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="training_task_submmit();">评测</a>
-  <% elsif @game.status != 2 %>
+  <% else %>
       <a href="javascript:void(0)" class="shixun-task-btn task-btn-blue mr15 mt8" onclick="choice_submmit();">评测</a>
   <% end %>
 </div>
diff --git a/app/views/games/_game_choose_results.html.erb b/app/views/games/_game_choose_results.html.erb
index 37132c683..c1ea40b5d 100644
--- a/app/views/games/_game_choose_results.html.erb
+++ b/app/views/games/_game_choose_results.html.erb
@@ -44,7 +44,7 @@
                   <% if choose.choose_outputs.blank? %>
                       <li><span class="ml30">尚未提交，暂不支持查看</span></li>
                   <% else %>
-                      <% if choose.current_choose_outputs.try(:answer) == choose.standard_answer %>
+                      <% if choose.current_choose_outputs.try(:answer) == choose.standard_answer || @game.status == 2  %>
                         <li><span class="-task-ces-info-left color-blue">正确选项：</span><span><%= choose.standard_answer %></span></li>
                         <li><span class="-task-ces-info-left color-blue">你的选项：</span><span class="color-orange"><%= choose.current_choose_outputs.try(:answer).nil? ? "无" : choose.current_choose_outputs.try(:answer) %></span></li>
                       <% else %>
diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb
index 2419d5fec..2edcea941 100644
--- a/app/views/games/show.js.erb
+++ b/app/views/games/show.js.erb
@@ -11,7 +11,7 @@
     $("#all_task_show").hide();
     fadein = 0;
     // 选择题
-    <% if params[:choose] == "1" %>
+    <% if params[:choose] == "true" %>
         <% if @had_done == 0 %>
             $("#code_estimate").html("<a href='<%= next_step_myshixun_game_path(@game, :myshixun_id => @myshixun) %>' class='task-btn task-btn-blue mr15 mt8' id='next_step' data-remote='true'>下一关</a>");
             var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>";