From 53c57668aa0d7522c2a790b637d739a83053bd34 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 2 Sep 2015 14:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA=E4=B8=8E?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb | 5 ++++-
 app/views/users/show.js.erb               | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2eba84efa..8c9111dce 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -61,4 +61,7 @@
     <% end %>
 <% end %>
 <input type="hidden" value="<%= page%>"/>
-<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% if user_activities.count == 10%>
+    <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end%>
+
diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb
index bf7443f8c..eb5de9c6a 100644
--- a/app/views/users/show.js.erb
+++ b/app/views/users/show.js.erb
@@ -1,4 +1,2 @@
 $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>");
-<% if @user_activities.count < 10%>
-$("#show_more_activities").hide();
-<% end%>
+