From f6867068f532de4259e863c7783e313852ff07a9 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 14 Dec 2015 10:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E5=B8=96=E5=AD=90=20=20?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=20=E8=B5=84=E6=BA=90=20?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=20=E7=94=A8=E6=88=B7=20?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=99=BB=E9=99=86=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/_search_all_results.html.erb        | 9 +++++++--
 app/views/welcome/_search_attachment_results.html.erb | 4 +++-
 app/views/welcome/_search_user_results.html.erb       | 4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index 7256534e5..537da336a 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -17,7 +17,10 @@
                 <div class="cl"></div>
               </li>
               <li class="fontGrey3 mb5"><%= User.find(item.id).user_extensions && User.find(item.id).user_extensions.brief_introduction.present? ? User.find(item.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
-              <li class="f12 fontGrey2"><span class="mr30">加入时间：<%= format_date( User.find(item.id).created_on)%></span><span class="mr30"><%= User.find(item.id).user_extensions.occupation.present? ? '单位：'+User.find(item.id).user_extensions.occupation : ''%></span></li>
+              <li class="f12 fontGrey2">
+                <span class="mr30">加入时间：<%= format_date( User.find(item.id).created_on)%></span><span class="mr30">
+                 最后登陆时间：<%= format_date( User.find(item.id).last_login_on)%></span><span class="mr30">
+                <%= User.find(item.id).user_extensions.occupation.present? ? '单位：'+User.find(item.id).user_extensions.occupation : ''%></span></li>
             </ul>
           </li>
           <div class="cl"></div>
@@ -51,7 +54,9 @@
                   </li>
                   <li class="f12 fontGrey2"><span class="mr30">发布者：<%= User.find(item.author_id).login%>（<%= User.find(item.author_id).realname%>）</span>
                     <!--<span class="mr30">职称：<%#= get_technical_title User.find(item.author_id) %></span>-->
-                    <span class="mr30">发布时间：<%= format_date(item.created_on)%></span></li>
+                    <span class="mr30">发布时间：<%= format_date(item.created_on)%></span>
+                    <span class="mr30">下载次数：<%= item.downloads%>次</span>
+                  </li>
                 </ul>
               </li>
               <div class="cl"></div>
diff --git a/app/views/welcome/_search_attachment_results.html.erb b/app/views/welcome/_search_attachment_results.html.erb
index 36c4fcbab..21ba68336 100644
--- a/app/views/welcome/_search_attachment_results.html.erb
+++ b/app/views/welcome/_search_attachment_results.html.erb
@@ -12,7 +12,9 @@
               </li>
               <li class="f12 fontGrey2"><span class="mr30">发布者：<%= User.find(attachment.author_id).login%>（<%= User.find(attachment.author_id).realname%>）</span>
                 <!--<span class="mr30">职称：<%#= get_technical_title User.find(attachment.author_id) %></span>-->
-                <span class="mr30">发布时间：<%= format_date(attachment.created_on)%></span></li>
+                <span class="mr30">发布时间：<%= format_date(attachment.created_on)%></span>
+                <span class="mr30">下载次数：<%= attachment.downloads%>次</span>
+              </li>
             </ul>
           </li>
           <div class="cl"></div>
diff --git a/app/views/welcome/_search_user_results.html.erb b/app/views/welcome/_search_user_results.html.erb
index 459d3a27b..d1c8c2393 100644
--- a/app/views/welcome/_search_user_results.html.erb
+++ b/app/views/welcome/_search_user_results.html.erb
@@ -12,7 +12,9 @@
             <div class="cl"></div>
           </li>
           <li class="fontGrey3 mb5"><%= User.find(user.id).user_extensions && User.find(user.id).user_extensions.brief_introduction.present? ? User.find(user.id).user_extensions.brief_introduction : '这位童鞋很懒，什么也没有留下～'%></li>
-          <li class="f12 fontGrey2"><span class="mr30">加入时间：<%= format_date( User.find(user.id).created_on)%></span><span class="mr30"><%= User.find(user.id).user_extensions.occupation.present? ? '单位：'+User.find(user.id).user_extensions.occupation : ''%></span></li>
+          <li class="f12 fontGrey2"><span class="mr30">加入时间：<%= format_date( User.find(user.id).created_on)%></span><span class="mr30">
+            最后登陆时间：<%= format_date( User.find(user.id).last_login_on)%></span><span class="mr30">
+            <%= User.find(user.id).user_extensions.occupation.present? ? '单位：'+User.find(user.id).user_extensions.occupation : ''%></span></li>
         </ul>
       </li>
       <div class="cl"></div>