From e3057566c82e8e5de107c46a5c1738fc72ceda5e Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 26 Jul 2016 17:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=92=8C=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=9B=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=86=85=E5=AE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         |  39 ++--
 public/assets/wechat/course_discussion.html   |  47 +++--
 public/assets/wechat/course_notice.html       |  38 ++--
 public/assets/wechat/homework_detail.html     | 173 +++++++++---------
 public/assets/wechat/issue_detail.html        |  46 ++---
 public/assets/wechat/jour_message_detail.html |  49 +++--
 public/assets/wechat/project_discussion.html  |  51 +++---
 .../wechat/templates/comment_reply.html       |  38 ++--
 public/stylesheets/weui/weixin.css            |  12 +-
 9 files changed, 240 insertions(+), 253 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 721c3d38e..ee9e968d2 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -13,11 +13,13 @@
                     <img ng-if="blog.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
                 <div class="cl"></div>
-                <div class="post-dynamic-title c-grey3 mt12 fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
 
-                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
-                <div class="cl"></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div>
+                    <div class="cl"></div>
+                </div>
                 <div class="fr f13">
                     <div ng-if="!blog.praise_count" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
                     <div ng-if="blog.praise_count && !blog.has_praise" ng-click="addPraise(blog);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{blog.praise_count}}</span></div>
@@ -33,35 +35,30 @@
 
                 <div ng-if="blog.all_children == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in blog.all_children">
-                    <div class="post-reply-row">
+                    <div class="post-reply-row" ng-class="['post-reply-row',{'border-bottom-none' : $last}]">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
+                        <div class="post-reply-author hidden fl">
                             {{journal.user.realname}}
-                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
-                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
                         <!--<div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>-->
-                        <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
                             <comment-reply i="0" journal="journal" ></comment-reply>
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
-                            <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-                                <div class="post-dynamic-author hidden fl ng-binding">
+                            <div ng-repeat="reply_bottom in journal.parents_reply_bottom" class="ml5 mr5">
+                                <div class="post-reply-author hidden fl ng-binding">
                                     {{reply_bottom.user.realname}}
-                                    <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                    <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                 </div>
-                                <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
+                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
-                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
                                 <div class="cl"></div>
                             </div>
                         </div>
-                        <div class="post-reply-content">
-                            <div class="mult-reply-content">
-                                <div class="mt10" ng-bind-html="journal.content|safeHtml"></div>
+                        <div class="post-reply-content c-grey3 ml40">
+                            <div class="mult-reply-content mb15">
+                                <div ng-bind-html="journal.content|safeHtml"></div>
                             </div>
                             <div class="cl"></div>
                         </div>
@@ -73,7 +70,7 @@
             </div>
 
             <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
+                <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index f04d78926..9ef7bc429 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -13,53 +13,50 @@
                         <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                     </div>
                     <div class="cl"></div>
-                    <div class="post-dynamic-title c-grey3 mt12 fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                    <div class="c-grey4 f13 mt10"><span class="mr10">{{discussion.course_project_name}} - 课程问答区</span><span>{{discussion.created_on}}</span></div>
-                    <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                    <div class="cl"></div>
-                    <div class="fr f13">
-                        <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                        <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
-                        <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
-                    </div>
-                    <div class="fr mr25 f13">
-                        <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                        <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
+                    <div class="ml40">
+                        <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                        <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 课程问答区</span><span>{{discussion.created_on}}</span></div>
+                        <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                        <div class="cl"></div>
+                        <div class="fr f13">
+                            <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                            <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                            <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                        </div>
+                        <div class="fr mr25 f13">
+                            <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                            <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
+                        </div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
                 <div class="mb50" id="all_course_message_reply">
                     <div ng-if="discussion.all_children == ''" style="border-top:1px solid #ccc;"></div>
                     <div class="post-reply-wrap" ng-repeat="journal in discussion.all_children">
                         <div class="post-reply-row">
                             <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                            <div class="post-dynamic-author hidden fl">
+                            <div class="post-reply-author hidden fl">
                                 {{journal.user.realname}}
-                                <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                             </div>
-                            <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                             <div class="cl"></div>
 
-                            <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
+                            <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
                                 <!--<ul ng-if="journal.parents_reply_top[0]" ng-include="'comment_reply'"  ng-init="i=0;journal=journal"></ul>-->
                                 <comment-reply i="0" journal="journal" ></comment-reply>
                                 <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
                                 <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                    <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-                                    <div class="post-dynamic-author hidden fl ng-binding">
+                                    <div class="post-reply-author hidden fl ng-binding">
                                         {{reply_bottom.user.realname}}
-                                        <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                        <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                     </div>
-                                    <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
+                                    <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                     <div class="cl"></div>
                                     <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
                                     <div class="cl"></div>
                                 </div>
                             </div>
 
-                            <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
+                            <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
                             <div class="cl"></div>
                         </div>
                     </div>
@@ -69,7 +66,7 @@
                 </div>
 
                 <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
-                    <div class="post-reply-row">
+                    <div class="post-reply-row border-bottom-none">
                         <div class="post-input-container">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 892ef2fde..b2771100b 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -12,41 +12,41 @@
                     <img ng-if="news.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
                 <div class="cl"></div>
-                <div class="post-dynamic-title c-grey3 mt12 fb">{{news.title}}</div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
-                <div class="f13 c-grey3 mt10 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
-                <div class="cl"></div>
-                <div class="fr f13">
-                    <div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="news.praise_count && !news.has_praise" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
-                    <div ng-if="news.has_praise" ng-click="decreasePraise(news);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{news.comment_count}}</span></a>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{news.title}}</div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
+                    <div class="f13 c-black mt5 text-control  post-all-content" ng-bind-html="news.description|safeHtml"></div>
+                    <div class="cl"></div>
+                    <div class="fr f13">
+                        <div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                        <div ng-if="news.praise_count && !news.has_praise" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
+                        <div ng-if="news.has_praise" ng-click="decreasePraise(news);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{news.praise_count}}</span></div>
+                    </div>
+                    <div class="fr mr25 f13">
+                        <a ng-if="!news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                        <a ng-if="news.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{news.comment_count}}</span></a>
+                    </div>
+                    <div class="cl"></div>
                 </div>
-                <div class="cl"></div>
             </div>
             <div class="mb50" id="all_news_reply">
                 <div ng-if="news.comments == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="comments in news.comments">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{comments.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
+                        <div class="post-reply-author hidden fl">
                             {{comments.author.realname}}
-                            <img ng-if="comments.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="comments.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
-                        <div class="post-dynamic-time fr f13">{{comments.created_on}}</div>
+                        <div class="post-reply-time fr f12">{{comments.created_on}}</div>
                         <div class="cl"></div>
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="comments.comments|safeHtml"></div>
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="comments.comments|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
             </div>
 
             <div id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
+                <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 788d0c1b2..6106dfe9e 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -1,89 +1,86 @@
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<div loading-spinner></div>
-<div ng-if="homework.act_type == 'HomeworkCommon'">
-    <div class="post-container">
-        <div class="post-wrapper" style="margin-top:0;">
-            <div class="post-main">
-                <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                <div class="post-dynamic-author hidden fl">
-                    {{homework.author.realname}}
-                    <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                    <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                </div>
-                <div class="cl"></div>
-                <div class="post-dynamic-title c-grey3 mt12 fb">{{homework.name}}</div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
-                <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
-                <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
-                <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
-                <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
-                <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
-                <div class="cl"></div>
-                <div class="fr f13">
-                    <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
-                    <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.comment_count}}</span></a>
-                </div>
-                <div class="cl"></div>
-            </div>
-            <div class="mb50" id="all_homework_reply">
-
-                <div ng-if="homework.all_children == ''" style="border-top:1px solid #ccc;"></div>
-                <div class="post-reply-wrap" ng-repeat="journal in homework.all_children">
-                    <div class="post-reply-row">
-                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
-                            {{journal.user.realname}}
-                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                        </div>
-                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
-                        <div class="cl"></div>
-
-                        <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
-                            <!--<ul ng-if="journal.parents_reply_top[0]" ng-include="'comment_reply'"  ng-init="i=0;journal=journal"></ul>-->
-                            <comment-reply i="0" journal="journal" ></comment-reply>
-                            <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
-                            <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-                                <div class="post-dynamic-author hidden fl ng-binding">
-                                    {{reply_bottom.user.realname}}
-                                    <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                    <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
-                                </div>
-                                <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
-                                <div class="cl"></div>
-                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
-                                <div class="cl"></div>
-                            </div>
-                        </div>
-
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
-                        <div class="cl"></div>
-                    </div>
-                </div>
-                <div ng-if="has_more">
-                    <div id="more_reply" class="more-events mt10" ng-click="showMoreReply(0,homework);">更多</div>
-                </div>
-            </div>
-
-            <div id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
-                    <div class="post-input-container">
-                        <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
-                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
-                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
-                        <div class="cl"></div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
+
+<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div loading-spinner></div>
+<div ng-if="homework.act_type == 'HomeworkCommon'">
+    <div class="post-container">
+        <div class="post-wrapper" style="margin-top:0;">
+            <div class="post-main">
+                <div class="post-avatar fl mr10"><img ng-src="{{homework.author.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                <div class="post-dynamic-author hidden fl">
+                    {{homework.author.realname}}
+                    <img ng-if="homework.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
+                    <img ng-if="homework.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+                </div>
+                <div class="cl"></div>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
+                    <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div>
+                    <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
+                    <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
+                <div class="cl"></div>
+                </div>
+                <div class="fr f13">
+                    <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                    <div ng-if="homework.praise_count && !homework.has_praise" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                    <div ng-if="homework.has_praise" ng-click="decreasePraise(homework);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{homework.praise_count}}</span></div>
+                </div>
+                <div class="fr mr25 f13">
+                    <a ng-if="!homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                    <a ng-if="homework.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{homework.comment_count}}</span></a>
+                </div>
+                <div class="cl"></div>
+            </div>
+            <div class="mb50" id="all_homework_reply">
+
+                <div ng-if="homework.all_children == ''" style="border-top:1px solid #ccc;"></div>
+                <div class="post-reply-wrap" ng-repeat="journal in homework.all_children">
+                    <div class="post-reply-row">
+                        <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
+                        <div class="post-reply-author hidden fl">
+                            {{journal.user.realname}}
+                        </div>
+                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
+                        <div class="cl"></div>
+
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
+                            <!--<ul ng-if="journal.parents_reply_top[0]" ng-include="'comment_reply'"  ng-init="i=0;journal=journal"></ul>-->
+                            <comment-reply i="0" journal="journal" ></comment-reply>
+                            <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
+                            <div class="ml5 mr5 mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
+                                <div class="post-reply-author hidden fl ng-binding">
+                                    {{reply_bottom.user.realname}}
+                                </div>
+                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
+                                <div class="cl"></div>
+                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="cl"></div>
+                            </div>
+                        </div>
+
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+                <div ng-if="has_more">
+                    <div id="more_reply" class="more-events mt10" ng-click="showMoreReply(0,homework);">更多</div>
+                </div>
+            </div>
+
+            <div id="post_input_1" class="post-input-wrap post-box-shadow">
+                <div class="post-reply-row border-bottom-none">
+                    <div class="post-input-container">
+                        <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
+                        <button ng-click="addReply(formData)" ng-disabled="formData.disabled" ng-hide="formData.disabled" class="post-reply-submit fr border-radius">提交</button>
+                        <button ng-disabled="formData.disabled" ng-hide="!formData.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index f33f6c0f6..852103b81 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -13,46 +13,46 @@
                     <img ng-if="issue.author.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
                 <div class="cl"></div>
-                <div class="post-dynamic-title c-grey3 mt12 fb">{{issue.subject}}</div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{issue.subject}}</div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div>
 
-                <div class="f13 c-grey3 mt10 mb10 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div>
-                <span class="c-grey f12 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span>
-                <span class="c-grey f12">优先级：{{issue.issue_priority}}</span><br/>
-                <span class="c-grey f12 mr15">指派给：{{issue.issue_assigned_to}}</span>
-                <span class="c-grey f12">完成度：{{issue.done_ratio}}%</span>
-                <div class="cl"></div>
-                <div class="fr f13">
-                    <div ng-if="!issue.praise_count" ng-click="addPraise(issue);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="issue.praise_count && !issue.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
-                    <div ng-if="issue.has_praise" ng-click="decreasePraise(issue);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{issue.comment_count}}</span></a>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div>
+                    <span class="c-grey f12 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span>
+                    <span class="c-grey f12">优先级：{{issue.issue_priority}}</span><br/>
+                    <span class="c-grey f12 mr15">指派给：{{issue.issue_assigned_to}}</span>
+                    <span class="c-grey f12">完成度：{{issue.done_ratio}}%</span>
+                    <div class="cl"></div>
+                    <div class="fr f13">
+                        <div ng-if="!issue.praise_count" ng-click="addPraise(issue);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                        <div ng-if="issue.praise_count && !issue.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
+                        <div ng-if="issue.has_praise" ng-click="decreasePraise(issue);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{issue.praise_count}}</span></div>
+                    </div>
+                    <div class="fr mr25 f13">
+                        <a ng-if="!issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                        <a ng-if="issue.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{issue.comment_count}}</span></a>
+                    </div>
+                    <div class="cl"></div>
                 </div>
-                <div class="cl"></div>
             </div>
             <div class="mb50" id="all_issue_reply">
                 <div ng-if="issue.issue_journals == ''" style="border-top:1px solid #ccc;"></div>
                 <div class="post-reply-wrap" ng-repeat="journal in issue.issue_journals">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
+                        <div class="post-reply-author hidden fl">
                             {{journal.user.realname}}
-                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
-                        <div class="post-dynamic-time fr f13">{{journal.created_on}}</div>
+                        <div class="post-reply-time fr f12">{{journal.created_on}}</div>
                         <div class="cl"></div>
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.notes|safeHtml"></div>
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.notes|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
             </div>
 
             <div id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
+                <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index aeea03dad..78760da71 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -12,20 +12,22 @@
                     <img ng-if="message.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
                 <div class="cl"></div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">留言</span><span>{{message.created_on}}</span></div>
+                <div class="ml40">
+                    <div class="c-grey4 f13 mt5"><span class="mr10">留言</span><span>{{message.created_on}}</span></div>
 
-                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="message.notes|safeHtml"></div>
-                <div class="cl"></div>
-                <div class="fr f13">
-                    <div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="message.praise_count && !message.has_praise" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
-                    <div ng-if="message.has_praise" ng-click="decreasePraise(message);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{message.comment_count}}</span></a>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="message.content|safeHtml"></div>
+                    <div class="cl"></div>
+                    <div class="fr f13">
+                        <div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                        <div ng-if="message.praise_count && !message.has_praise" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
+                        <div ng-if="message.has_praise" ng-click="decreasePraise(message);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{message.praise_count}}</span></div>
+                    </div>
+                    <div class="fr mr25 f13">
+                        <a ng-if="!message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                        <a ng-if="message.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{message.comment_count}}</span></a>
+                    </div>
+                    <div class="cl"></div>
                 </div>
-                <div class="cl"></div>
             </div>
             <div class="mb50" id="all_message_reply">
 
@@ -33,32 +35,27 @@
                 <div class="post-reply-wrap" ng-repeat="journal in message.all_children">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
+                        <div class="post-reply-author hidden fl">
                             {{journal.user.realname}}
-                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
-                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
 
-                        <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
                             <comment-reply i="0" journal="journal" ></comment-reply>
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
-                            <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-                                <div class="post-dynamic-author hidden fl ng-binding">
+                            <div class="mt10 ml5 mr5" ng-repeat="reply_bottom in journal.parents_reply_bottom">
+                                <div class="post-reply-author hidden fl ng-binding">
                                     {{reply_bottom.user.realname}}
-                                    <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                    <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                 </div>
-                                <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
+                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
-                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
                                 <div class="cl"></div>
                             </div>
                         </div>
 
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
@@ -68,7 +65,7 @@
             </div>
 
             <div id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
+                <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 1603afa8c..cc3d4b1c8 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -12,21 +12,23 @@
                     <img ng-if="discussion.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                 </div>
                 <div class="cl"></div>
-                <div class="post-dynamic-title c-grey3 mt12 fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                <div class="c-grey4 f13 mt10"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div>
+                <div class="ml40">
+                    <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
+                    <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div>
 
-                <div class="f13 c-grey3 mt10 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                <div class="cl"></div>
-                <div class="fr f13">
-                    <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
-                    <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
-                    <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
-                </div>
-                <div class="fr mr25 f13">
-                    <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
-                    <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
+                    <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
+                    <div class="cl"></div>
+                    <div class="fr f13">
+                        <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
+                        <div ng-if="discussion.praise_count && !discussion.has_praise" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                        <div ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{discussion.praise_count}}</span></div>
+                    </div>
+                    <div class="fr mr25 f13">
+                        <a ng-if="!discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">回复</span></a>
+                        <a ng-if="discussion.comment_count"><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span style="vertical-align:top;">{{discussion.comment_count}}</span></a>
+                    </div>
+                    <div class="cl"></div>
                 </div>
-                <div class="cl"></div>
             </div>
 
             <div class="mb50" id="all_course_message_reply">
@@ -34,32 +36,27 @@
                 <div class="post-reply-wrap" ng-repeat="journal in discussion.all_children">
                     <div class="post-reply-row">
                         <div class="post-avatar fl mr10"><img ng-src="{{journal.user.img_url}}" width="30" height="30" class="border-radius img-circle" /></div>
-                        <div class="post-dynamic-author hidden fl">
+                        <div class="post-reply-author hidden fl">
                             {{journal.user.realname}}
-                            <img ng-if="journal.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                            <img ng-if="journal.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                         </div>
-                        <div class="post-dynamic-time fr f13">{{journal.lasted_comment}}</div>
+                        <div class="post-reply-time fr f12">{{journal.lasted_comment}}</div>
                         <div class="cl"></div>
 
-                        <div ng-show="journal.parents_count > 0" class="mult-reply-container mt10">
+                        <div ng-show="journal.parents_count > 0" class="mult-reply-container ml40 mb5">
                             <comment-reply i="0" journal="journal" ></comment-reply>
                             <div ng-click="showMoreReply(1,journal)" ng-show="journal.parents_reply_top.length + journal.parents_reply_bottom.length < journal.parents_count" class="mult-reply-hide"><span class="mult-reply-arrow" >&darr; </span><span class="mult-reply-arrow" style="display:none;" > &uarr;</span>点击展开更多楼层</div>
-                            <div class="mt10" ng-repeat="reply_bottom in journal.parents_reply_bottom">
-                                <div class="post-avatar fl mr10"><img ng-src="{{reply_bottom.user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-                                <div class="post-dynamic-author hidden fl ng-binding">
+                            <div class="mt10 ml5 mr5" ng-repeat="reply_bottom in journal.parents_reply_bottom">
+                                <div class="post-reply-author hidden fl ng-binding">
                                     {{reply_bottom.user.realname}}
-                                    <img ng-if="reply_bottom.user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-                                    <img ng-if="reply_bottom.user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
                                 </div>
-                                <div class="post-dynamic-time fr f13">{{reply_bottom.lasted_comment}}</div>
+                                <div class="post-reply-time fr f12">{{reply_bottom.lasted_comment}}</div>
                                 <div class="cl"></div>
-                                <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
+                                <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="reply_bottom.content|safeHtml"></div>
                                 <div class="cl"></div>
                             </div>
                         </div>
 
-                        <div class="post-reply-content c-grey2 mt12" ng-bind-html="journal.content|safeHtml"></div>
+                        <div class="post-reply-content c-grey3 ml40 mb15" ng-bind-html="journal.content|safeHtml"></div>
                         <div class="cl"></div>
                     </div>
                 </div>
@@ -68,7 +65,7 @@
                 </div>
             </div>
             <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
-                <div class="post-reply-row">
+                <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                         <textarea input-auto type="text" class="post-reply-input" id="postInput1" ng-model="formData.comment" placeholder="输入回复内容~" /></textarea>
diff --git a/public/assets/wechat/templates/comment_reply.html b/public/assets/wechat/templates/comment_reply.html
index ffa656aab..f5699abca 100644
--- a/public/assets/wechat/templates/comment_reply.html
+++ b/public/assets/wechat/templates/comment_reply.html
@@ -1,32 +1,30 @@
-<div ng-if="journal.parents_reply_top[i]"  class="mult-reply-container mt2">
+<div ng-if="journal.parents_reply_top[i]"  class="mult-reply-container">
     <!--<ul ng-if="journal.parents_reply_top[i+1]" ng-include="'comment_reply'"  ng-init="i=i+1;journal=journal"></ul>-->
 
     <ul ng-if="journal.parents_reply_top[i+1]" ng-include="'comment_reply'"  ng-init="i=i+1;journal=journal"></ul>
-    <div class="post-avatar fl mr10"><img ng-src="{{journal.parents_reply_top[i].user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-    <div class="post-dynamic-author hidden fl ng-binding">
-        {{journal.parents_reply_top[i].user.realname}}
-        <img ng-if="journal.parents_reply_top[i].user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-        <img ng-if="journal.parents_reply_top[i].user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+    <div class="ml5 mr5">
+        <div class="post-reply-author hidden fl ng-binding">
+            {{journal.parents_reply_top[i].user.realname}}
+        </div>
+        <div class="post-reply-time fr f12">{{journal.parents_reply_top[i].lasted_comment}}</div>
+        <div class="cl"></div>
+        <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="journal.parents_reply_top[i].content|safeHtml"></div>
+        <div class="cl"></div>
     </div>
-    <div class="post-dynamic-time fr f13">{{journal.parents_reply_top[i].lasted_comment}}</div>
-    <div class="cl"></div>
-    <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="journal.parents_reply_top[i].content|safeHtml"></div>
-    <div class="cl"></div>
 </div>
 
 
 <script id="comment_reply" type="text/ng-template">
-    <div  class="mult-reply-container mt2">
+    <div  class="mult-reply-container mb10">
         <ul ng-if="journal.parents_reply_top[i+1]" ng-include="'comment_reply'"  ng-init="i=i+1;journal=journal"></ul>
-        <div class="post-avatar fl mr10"><img ng-src="{{journal.parents_reply_top[i].user.img_url}}" class="border-radius img-circle" height="30" width="30"></div>
-        <div class="post-dynamic-author hidden fl ng-binding">
-            {{journal.parents_reply_top[i].user.realname}}
-            <img ng-if="journal.parents_reply_top[i].user.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
-            <img ng-if="journal.parents_reply_top[i].user.gender != '0'" src="images/wechat/female.png" width="14" class="ml5" />
+        <div class="ml5 mr5">
+            <div class="post-reply-author hidden fl ng-binding">
+                {{journal.parents_reply_top[i].user.realname}}
+            </div>
+            <div class="post-reply-time fr f12">{{journal.parents_reply_top[i].lasted_comment}}</div>
+            <div class="cl"></div>
+            <div class="post-reply-content c-grey2 mt5 border-bottom-none" ng-bind-html="journal.parents_reply_top[i].content|safeHtml"></div>
+            <div class="cl"></div>
         </div>
-        <div class="post-dynamic-time fr f13">{{journal.parents_reply_top[i].lasted_comment}}</div>
-        <div class="cl"></div>
-        <div class="post-reply-content c-grey2 mt12 border-bottom-none" ng-bind-html="journal.parents_reply_top[i].content|safeHtml"></div>
-        <div class="cl"></div>
     </div>
 </script>
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 9eb8a670b..cc3e3151a 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -27,10 +27,12 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
 .mt70 {margin-top:70px;}
 .mb5 {margin-bottom:5px;}
 .mb10 {margin-bottom:10px;}
+.mb15 {margin-bottom:15px;}
 .mb20 {margin-bottom:20px;}
 .mb50 {margin-bottom:50px;}
 .ml5 {margin-left:5px;}
 .ml10 {margin-left:10px;}
+.ml40 {margin-left:40px;}
 .mr5 {margin-right:5px;}
 .mr10 {margin-right:10px;}
 .ml15 {margin-left:15px;}
@@ -118,12 +120,12 @@ a.underline {text-decoration:underline;}
 .border-bottom {border-bottom:1px solid #e6e6e6;}
 .post-reply-wrap {width:100%;}
 .post-reply-wrap:first-child {border-top:1px solid #ccc;}
-.post-input-wrap {width:100%; position:fixed; bottom:0;}
+.post-input-wrap {width:100%; position:fixed; bottom:0; background-color:#fff;}
 .post-input-wrap2 {width:100%;}
-.post-reply-row {padding:10px 15px; color:#9a9a9a; background-color:#fff;}
+.post-reply-row {margin:10px 15px; color:#9a9a9a; background-color:#fff; border-bottom:1px solid #f0f0f0;}
 .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
 .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
-.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden; padding-bottom:15px; border-bottom:1px solid #ccc;}
+.post-reply-content {font-size:13px; word-break:break-all; word-wrap:break-word; overflow:hidden; text-align:justify;}
 .post-reply-content img {max-width:100%;}
 .post-reply-content a {color:#136ec2;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
@@ -144,6 +146,8 @@ a.underline {text-decoration:underline;}
 .post-dynamic-title {font-size:15px;}
 .post-dynamic-from {width:50%; font-size:13px;}
 .post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
+.post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;}
+.post-reply-time {height:20px; line-height:20px; vertical-align:middle;}
 
 /* loading 弹框*/
 .loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
@@ -228,6 +232,6 @@ a.underline {text-decoration:underline;}
 
 /*二级回复*/
 .mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
-.mult-reply-content{ color:#707070; font-size:13px;}
+.mult-reply-content{ color:#555; font-size:13px;}
 .mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
 .mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
\ No newline at end of file