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关 / 共<%= shixun.challenges.count %>关
+ 已挑战至 第1关 / 共<%= shixun.challenges.count %>关
+ <% elsif (had_passed_changllenge_count(shixun, @user).class == Array) %>
+ 已挑战至 第<%= had_passed_changllenge_count(shixun, @user)[0].to_i %>关 / 共<%= shixun.challenges.count %>关
<% else %>
- 已完成第<%= had_passed_changllenge_count(shixun, @user) %>关 / 共<%= shixun.challenges.count %>关
+ 已完成至 第<%= had_passed_changllenge_count(shixun, @user) %>关 / 共<%= shixun.challenges.count %>关
<% end %>