From ad3626d53a999fddf2b7437e7d66c4296f0175e2 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 27 Jun 2016 15:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=9A=E2=80=9C=E7=99=BB=E9=99=86=E2=80=9D=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E7=99=BB=E5=BD=95=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/_search_all_results.html.erb  | 2 +-
 app/views/welcome/_search_user_results.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index a714f53d2..af407c848 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -19,7 +19,7 @@
                   <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">
-                 最后登陆时间：<%= format_date( User.find(item.id).last_login_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>
diff --git a/app/views/welcome/_search_user_results.html.erb b/app/views/welcome/_search_user_results.html.erb
index d1c8c2393..06a40d021 100644
--- a/app/views/welcome/_search_user_results.html.erb
+++ b/app/views/welcome/_search_user_results.html.erb
@@ -13,7 +13,7 @@
           </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">
-            最后登陆时间：<%= format_date( User.find(user.id).last_login_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>