From 53eaac295e2f38758faf8f724a07b80ba659d38b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Sep 2015 17:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=96=B9=E5=9B=9E=E5=A4=8D=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=EF=BC=8Ctips=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=8E=9F=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index ee9c95ccf..8557b7131 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -607,7 +607,14 @@
                                     :onmouseout => "message_titile_hide($(this))" %></a>
                       </li>
                       <div  style="display: none" class="message_title_red system_message_style" >
-                        <%= ma.journals_for_message.notes.html_safe %>
+                        <% if ma.journals_for_message.reply_id == 0 %>
+                            <%= ma.journals_for_message.notes.html_safe %>
+                        <% else %>
+                            <div class="fl"><strong>您的留言：</strong></div>
+                            <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
+                            <div class="fl"><strong>回复内容：</strong></div>
+                            <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
+                        <% end %>
                       </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>