From 5188fb70591bba480e8b04ae80ea02763e30d045 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 26 Jul 2017 21:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                  | 4 +++-
 app/views/users/_my_homepage_shixuns_list.html.erb | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index da97508e9..38aa397e7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -225,8 +225,10 @@ module ApplicationHelper
     myshixun = Myshixun.where(:shixun_id => shixun.id, :user_id => user.id).first
     if myshixun.nil?
       0
-    elsif !myshixun.nil? &&  myshixun.games.select{|game| game.status == 2}.count == 0
+    elsif !myshixun.nil? && myshixun.games.select{|game| game.status == 2}.count == 0
       -1
+    elsif myshixun.games.select{|game| game.status == 0}.count > 0
+      [myshixun.games.select{|game| game.status == 0}.count + 1]
     else
       myshixun.games.select{|game| game.status == 2}.count
     end
diff --git a/app/views/users/_my_homepage_shixuns_list.html.erb b/app/views/users/_my_homepage_shixuns_list.html.erb
index 7478766a3..f8da3a90b 100644
--- a/app/views/users/_my_homepage_shixuns_list.html.erb
+++ b/app/views/users/_my_homepage_shixuns_list.html.erb
@@ -16,9 +16,11 @@
               <% if had_passed_changllenge_count(shixun, @user) == 0 %>
                     尚未挑战
               <% elsif had_passed_changllenge_count(shixun, @user) == -1 %>
-                    已开启第1关&nbsp;/&nbsp;共<i><%= shixun.challenges.count %></i>关
+                    已挑战至&nbsp;第1关&nbsp;/&nbsp;共<i><%= shixun.challenges.count %></i>关
+              <% elsif (had_passed_changllenge_count(shixun, @user).class == Array) %>
+                    已挑战至&nbsp;第<%= had_passed_changllenge_count(shixun, @user)[0].to_i %>关&nbsp;/&nbsp;共<i><%= shixun.challenges.count %></i>关
               <% else %>
-                    已完成第<i><%= had_passed_changllenge_count(shixun, @user) %></i>关&nbsp;/&nbsp;共<i><%= shixun.challenges.count %></i>关
+                    已完成至&nbsp;第<i><%= had_passed_changllenge_count(shixun, @user) %></i>关&nbsp;/&nbsp;共<i><%= shixun.challenges.count %></i>关
               <% end %>
               </a>
             </span>