From 129447ca9d7c09e50bfd355808eb3f43519be154 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 24 May 2017 17:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=AD=94=E6=A1=88=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E6=9B=B4=E6=96=B0=E5=A4=B4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/games_controller.rb | 8 ++++----
 app/views/games/minus_score.js.erb  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 7abdc50f2..8173dfd39 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -288,16 +288,16 @@ class GamesController < ApplicationController
   end
 
   def minus_score
-    challenge = @game.challenge
+    @game_challenge = @game.challenge
     user = User.current
-    challenge_score = challenge.score.to_i
+    challenge_score = @game_challenge.score.to_i
+    reward_grade(User.current, @game.id, 'Answer', -challenge_score)
     user_score = user.grade.to_i
     @score = user_score - challenge_score
-    @answer = challenge.answer
+    @answer = @game_challenge.answer
 
     user.update_column(:grade, @score)
     @game.update_column(:answer_open, true)
-
     respond_to do |format|
       format.js
     end
diff --git a/app/views/games/minus_score.js.erb b/app/views/games/minus_score.js.erb
index c9c8dd115..e538521ec 100644
--- a/app/views/games/minus_score.js.erb
+++ b/app/views/games/minus_score.js.erb
@@ -1,3 +1,4 @@
+$("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>');
 $("#tab_con_3").html('<%= j (render :partial => 'games/acquire_answer') %>');
 $("#tab_nav_1").removeClass('tab_hover');
 $("#tab_nav_2").removeClass('tab_hover');