diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb
index 258a265a2..a92cc9a26 100644
--- a/app/views/memos/_praise_tread.html.erb
+++ b/app/views/memos/_praise_tread.html.erb
@@ -1,36 +1,36 @@
-<!-- get_praise_num(obj,1)函数中 1代表返回顶得次数 0返回踩的次数  -->
-   <% if User.current.logged? %>
-    <% if horizontal %>
-        <!-- 横排 -->
-        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
-          <% @is_valuate = is_praise_or_tread(obj,user_id)%>
-          <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
-              <% @flag = @is_valuate.first.praise_or_tread %>
-              <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
-                  <a href="javascript:void(0);" class="<%= obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
-              <% end %>
-          <% else %>
-              <% if user_id == obj.author_id %>
-
-                        <!--<%#= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %>-->
-                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon mr30" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
-
-              <% else %>
-                  <!-- 积分少于2分不能踩帖 -->
-                  <%# if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %>
-
-                            <%#= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
-                                           :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
-                      <a href="<%= praise_tread_praise_plus_path({:obj_id=>obj.id,:obj_type=>obj.class,:horizontal => horizontal })%>" data-remote="true" class="linkGrey2 postLikeIcon" title="<%=  l(:label_issue_praise)%>" >   <%= get_praise_num(obj)%></a>
-                  <!--<%# else %>-->
-
-                            <!--<%#= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),-->
-                                            <!--:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>-->
-                      <!--<a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%#=  l(:label_issue_praise)%>" target="_blank">   <%#= get_praise_num(obj)%></a>-->
-
-                  <!--<%# end %>-->
-              <% end %>
-          <% end %>
-        </div>
-    <% end %>
-   <% end %>
+<!-- get_praise_num(obj,1)函数中 1代表返回顶得次数 0返回踩的次数  -->
+   <% if User.current.logged? %>
+    <% if horizontal %>
+        <!-- 横排 -->
+        <div id="praise_tread_<%= obj.id %>" style="float:right; " >
+          <% @is_valuate = is_praise_or_tread(obj,user_id)%>
+          <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
+              <% @flag = @is_valuate.first.praise_or_tread %>
+              <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
+                  <a href="javascript:void(0);" class="<%= obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+              <% end %>
+          <% else %>
+              <% if user_id == obj.author_id %>
+
+                        <!--<%#= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %>-->
+                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon mr30" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+
+              <% else %>
+                  <!-- 积分少于2分不能踩帖 -->
+                  <%# if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %>
+
+                            <%#= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),
+                                           :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>
+                      <a href="<%= praise_tread_praise_plus_path({:obj_id=>obj.id,:obj_type=>obj.class,:horizontal => horizontal })%>" data-remote="true" class="linkGrey2 postLikeIcon mr30" title="<%=  l(:label_issue_praise)%>" >   <%= get_praise_num(obj)%></a>
+                  <!--<%# else %>-->
+
+                            <!--<%#= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)),-->
+                                            <!--:controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %>-->
+                      <!--<a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%#=  l(:label_issue_praise)%>" target="_blank">   <%#= get_praise_num(obj)%></a>-->
+
+                  <!--<%# end %>-->
+              <% end %>
+          <% end %>
+        </div>
+    <% end %>
+   <% end %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 74d8d34f8..f191e2d44 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -90,8 +90,8 @@
             </div>
             <div class="homepagePostReplyDes">
               <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.show_name%></a><%=  format_date(reply.created_at) %></div>
-              <%= link_to "删除", forum_memo_path(@memo.forum, reply), :class => "", :method => "delete", :confirm => l(:text_are_you_sure) %>
               <div class="homepagePostReplyContent break_word"  id="activity_description_<%= reply.id %>"><%=  reply.content.gsub(/script/, "script&nbsp").html_safe %></div>
+              <%= link_to "删除", forum_memo_path(@memo.forum, reply), :class => "fr mt-10 mb10", :method => "delete", :confirm => l(:text_are_you_sure) %>
             </div>
             <script type="text/javascript">
                 $(function(){