diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 3ba82bcb9..a90ff323d 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -41,11 +41,11 @@ module Mobile
                   end
                 when :description
                   if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News"
-                    ac.act.description unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.description) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "Message" || ac.act_type == "BlogComment"
-                    ac.act.content unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.content) unless ac.nil? || ac.act.nil?
                   elsif ac.act_type == "JournalsForMessage"
-                    ac.act.notes unless ac.nil? || ac.act.nil?
+                    strip_html(ac.act.notes) unless ac.nil? || ac.act.nil?
                   end
                 when :latest_update
                   time_from_now ac.updated_at unless ac.nil?
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index dbf5e8b27..1bab8dfb4 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -5,33 +5,35 @@
     <div ng-repeat="act in activities">
       <div ng-if="act.container_type=='Course'">
         <div ng-if="act.act_type=='HomeworkCommon'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5">
-                  <a herf="javascript:void(0);">
-                    <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
-                    <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
-                  </a></div>
-                <div class="post-title hidden">
-                  <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title mt5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                  <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
-                  <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/homework/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5">
+                    <a herf="javascript:void(0);">
+                      <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
+                      <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
+                    </a></div>
+                  <div class="post-title hidden">
+                    <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title mt5 mb5 hidden"><a ng-href="#/homework/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
+                    <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f12 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -39,26 +41,28 @@
         </div>
 
         <div ng-if="act.act_type=='News'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2 mt10">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_notice/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/course_notice/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -66,26 +70,28 @@
         </div>
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2 mt10">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/course_discussion/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/course_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -109,28 +115,30 @@
 
       <div ng-if="act.container_type=='Project'">
         <div ng-if="act.act_type=='Issue'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                  <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
-                  <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/issues/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/issues/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content mb5" ng-bind-html="act.description|safeHtml"></div>
+                    <span class="mr15 f13 c-grey2">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15 f13 c-grey2">优先级：{{act.issue_detail.issue_priority}}</span> <br />
+                    <span class="mr15 f13 c-grey2">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15 f13 c-grey2">完成度：{{act.issue_detail.done_ratio}}%</span>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -139,26 +147,28 @@
 
 
         <div ng-if="act.act_type=='Message'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
-                <div class="cl"></div>
-                <div class="post-title hidden mt5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-                <div class="post-content c-grey2">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/project_discussion/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
+                  <div class="cl"></div>
+                  <div class="post-title hidden mt5 mb5"><a ng-href="#/project_discussion/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                  <div class="post-content c-grey3">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f12 fl mr15 mt2">{{act.activity_type_name}}</span>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -181,25 +191,27 @@
 
       <div ng-if="act.container_type=='Principal'">
         <div ng-if="act.act_type=='JournalsForMessage'">
-          <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+          <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
-                <div class="cl"></div>
-                <div class="cl"></div>
-                <div class="post-content c-grey2 mt5">
-                  <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
+                <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/journal_for_message/'+ ($(this).attr('dataID'))">
+                  <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                  <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
+                  <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
+                  <div class="cl"></div>
+                  <div class="cl"></div>
+                  <div class="post-content c-grey3 mt5 mb5">
+                    <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                  </div>
+                  <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                  <div class="cl"></div>
                 </div>
-                <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-                <div class="cl"></div>
                 <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-                <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+                <a ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+                <a ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+                <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+                <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
                 <div class="cl"></div>
               </div>
             </div>
@@ -208,25 +220,27 @@
       </div>
 
       <div ng-if="act.act_type=='BlogComment'">
-        <div class="post-container" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+        <div class="post-container">
           <div class="post-wrapper">
             <div class="post-main">
-              <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-              <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-              <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
-              <div class="cl"></div>
-              <div class="post-title hidden mt5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
-              <div class="post-content c-grey2">
-                <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+              <div class="mb5" dataID = "{{act.act_id}}" onclick="javascript:window.location.href='#/blog_comment/'+ ($(this).attr('dataID'))">
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
+                <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
+                <div class="cl"></div>
+                <div class="post-title hidden mt5 mb5"><a ng-href="#/blog_comment/{{act.act_id}}" class="c-grey3 f15 fb">{{act.subject|safeHtml}}</a></div>
+                <div class="post-content c-grey3">
+                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+                </div>
+                <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
+                <div class="cl"></div>
               </div>
-              <!--<a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
-              <div class="cl"></div>
               <span  class="c-grey f13 fl mt2">{{act.latest_update}}</span>
-              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span></a>
-              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><span class="reply-icon"></span>{{act.reply_count}}</a>
-              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
-              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
-              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
+              <a ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">回复</span></a>
+              <a ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12"><img src="/images/wechat/w_reply.png" height="15" /><span style="vertical-align:top;">{{act.reply_count}}</span></a>
+              <div class="c-grey fr f12 mr25" ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">赞</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
+              <div class="c-grey fr f12 mr25" ng-if="act.has_praise" ng-click="decreasePraise(act);"><img src="/images/wechat/w_praised.png" height="15" /><span style="vertical-align:top;">{{act.praise_count}}</span></div>
               <div class="cl"></div>
             </div>
           </div>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index ce7945872..fa3a9f341 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -1,46 +1,48 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<div class="post-container">
-    <div class="post-wrapper">
-        <div class="post-main">
-            <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span><span ng-if="blog.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
-            <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
-            <div class="cl"></div>
-            <div class="post-content" style="height:auto;">
-                <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
+<div ng-if="blog.act_type == 'BlogComment'">
+    <div class="post-container">
+        <div class="post-wrapper">
+            <div class="post-main">
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{blog.title}}</span></div>
+                <div class="post-title"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
+                <div class="cl"></div>
+                <div class="post-content" style="height:auto;">
+                    <div class="post-all-content c-grey3 mt10" ng-bind-html="blog.content|safeHtml"></div>
+                </div>
+                <div class="cl"></div>
+                <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
+                <div class="cl"></div>
             </div>
-            <div class="cl"></div>
-            <span  class="c-grey f13 mt10 fl">{{blog.created_at}}</span>
-            <div class="cl"></div>
-        </div>
-        <div class="post-interactive border-bottom">
-            <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
-            <div class="post-interactive-column c-grey" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
-            <div class="post-interactive-column c-grey" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
-        </div>
-        <div id="all_blog_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in blog.blog_comment_children">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+            <div class="post-interactive border-bottom">
+                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
+                <div class="post-interactive-column c-grey" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
+                <div class="post-interactive-column c-grey" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
+            </div>
+            <div id="all_blog_reply">
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in blog.blog_comment_children">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-        </div>
-        <div ng-if="!blog.locked" class="post-input-wrap">
-            <div class="post-reply-row">
-                <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
-                <div class="post-input-container">
-                    <textarea class="copy-input"></textarea>
-                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+            <div class="post-input-wrap">
+                <div class="post-reply-row">
+                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
+                    <div class="post-input-container">
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                    </div>
+                    <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <div class="cl"></div>
                 </div>
-                <button ng-click="addBlogReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                <div class="cl"></div>
             </div>
         </div>
     </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index f464369ae..d1b65e629 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -1,52 +1,55 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-    <div class="post-container">
-        <div class="post-wrapper">
-            <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
-                <table class="post-detail-info"><tr>
-                    <td class="text-nowrap v-top">发布者：</td>
-                    <td>{{discussion.user.realname}}</td>
-                    </tr>
-                    <tr>
-                    <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
-                    <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
-                </tr></table>
-                <div class="post-content c-grey3 mt10" style="height:auto;">
-                    <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
-                </div>
-                <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
-                <div class="cl"></div>
-            </div>
-            <div class="post-interactive border-bottom">
-                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
-                <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
-            </div>
-            <div id="all_course_message_reply">
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+    <div ng-if="discussion.act_type == 'Message'">
+        <div class="post-container">
+            <div loading-spinner></div>
+            <div class="post-wrapper">
+                <div class="post-main">
+                    <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
+                    <table class="post-detail-info"><tr>
+                        <td class="text-nowrap v-top">发布者：</td>
+                        <td>{{discussion.user.realname}}</td>
+                        </tr>
+                        <tr>
+                        <td class="text-nowrap v-top">来&nbsp;&nbsp;&nbsp;源：</td>
+                        <td>{{discussion.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;课程问答区</td>
+                    </tr></table>
+                    <div class="post-content c-grey3 mt10" style="height:auto;">
+                        <div class="post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                     </div>
                     <div class="cl"></div>
+                    <span  class="c-grey f13 mt10 fl">{{discussion.created_on}}</span>
+                    <div class="cl"></div>
                 </div>
-            </div>
-            </div>
-            <div ng-if="!discussion.locked" class="post-input-wrap">
-                <div class="post-reply-row">
-                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
-                    <div class="post-input-container">
-                        <textarea class="copy-input"></textarea>
-                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                <div class="post-interactive border-bottom">
+                    <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
+                    <div class="post-interactive-column c-grey" ng-if="discussion.has_praise" ng-click="decreasePraise(discussion);">已赞 ({{discussion.praise_count}})</div>
+                    <div class="post-interactive-column c-grey" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.praise_count}})</div>
+                </div>
+                <div id="all_course_message_reply">
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.content|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
+                    </div>
+                </div>
+                </div>
+                <div class="post-input-wrap">
+                    <div class="post-reply-row">
+                        <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
+                        <div class="post-input-container">
+                            <textarea class="copy-input"></textarea>
+                            <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                        </div>
+                        <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                        <div class="cl"></div>
                     </div>
-                    <button ng-click="addDiscussionReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                    <div class="cl"></div>
                 </div>
             </div>
         </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index ac1f7dcea..c10763bf8 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="news.act_type == 'News'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -51,3 +52,4 @@
             </div>
         </div>
     </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 41ff56f57..2783bd317 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="homework.act_type == 'HomeworkCommon'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -56,4 +57,5 @@
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </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 08eb9a39d..035a7c98d 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -1,5 +1,6 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="issue.act_type == 'Issue'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
@@ -55,3 +56,4 @@
             </div>
         </div>
     </div>
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index f813d19c1..5ccbf6248 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -1,44 +1,46 @@
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<div class="post-container">
-    <div class="post-wrapper">
-        <div class="post-main">
-            <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
-            <div class="post-title">{{message.created_on}}</div>
-            <div class="cl"></div>
-            <div class="post-content c-grey2 mt10" style="height:auto;">
-                <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
+<div ng-if="message.act_type == 'JournalsForMessage'">
+    <div class="post-container">
+        <div class="post-wrapper">
+            <div class="post-main">
+                <div class="post-title mb5"><a herf="javascript:void(0);" class="mr10">{{message.user.realname}}</a><span style="vertical-align:top;">给您留言了</span><br /></div>
+                <div class="post-title">{{message.created_on}}</div>
+                <div class="cl"></div>
+                <div class="post-content c-grey2 mt10" style="height:auto;">
+                    <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
+                </div>
+                <div class="cl"></div>
             </div>
-            <div class="cl"></div>
-        </div>
-        <div class="post-interactive border-bottom">
-            <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{message.reply_count}})</span></div>
-            <div class="post-interactive-column c-grey" ng-if="message.has_praise" ng-click="decreasePraise(message);">已赞 ({{message.praise_count}})</div>
-            <div class="post-interactive-column c-grey" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.praise_count}})</div>
-        </div>
-        <div id="all_message_reply">
+            <div class="post-interactive border-bottom">
+                <div class="post-interactive-reply c-grey">回复 <span class="reply-num">({{message.reply_count}})</span></div>
+                <div class="post-interactive-column c-grey" ng-if="message.has_praise" ng-click="decreasePraise(message);">已赞 ({{message.praise_count}})</div>
+                <div class="post-interactive-column c-grey" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.praise_count}})</div>
+            </div>
+            <div id="all_message_reply">
 
-            <div class="post-reply-wrap border-bottom" ng-repeat="journal in message.child_reply">
-                <div class="post-reply-row">
-                    <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
-                    <div class="ml55">
-                        <div class="post-reply-user hidden">{{journal.user.realname}}</div>
-                        <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
-                        <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
-                        <div class="post-reply-trigger fr undis">回复</div>
+                <div class="post-reply-wrap border-bottom" ng-repeat="journal in message.child_reply">
+                    <div class="post-reply-row">
+                        <div class="post-reply-avatar fl"><img ng-src="{{journal.user.img_url}}" width="45" height="45" class="border-radius" /></div>
+                        <div class="ml55">
+                            <div class="post-reply-user hidden">{{journal.user.realname}}</div>
+                            <pre class="post-reply-content c-grey2 mb10" ng-bind-html="journal.notes|safeHtml"></pre>
+                            <div class="post-reply-date fl">{{journal.lasted_comment}}</div>
+                            <div class="post-reply-trigger fr undis">回复</div>
+                        </div>
+                        <div class="cl"></div>
                     </div>
-                    <div class="cl"></div>
                 </div>
             </div>
-        </div>
-        <div class="post-input-wrap">
-            <div class="post-reply-row">
-                <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
-                <div class="post-input-container">
-                    <textarea class="copy-input"></textarea>
-                    <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+            <div class="post-input-wrap">
+                <div class="post-reply-row">
+                    <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
+                    <div class="post-input-container">
+                        <textarea class="copy-input"></textarea>
+                        <textarea input-auto type="text" class="post-reply-input" id="postInput" ng-model="formData.comment" /></textarea>
+                    </div>
+                    <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
+                    <div class="cl"></div>
                 </div>
-                <button ng-click="addJournalReply(formData)" ng-disabled="formData.disabled" class="post-reply-submit fr mt10">回复</button>
-                <div class="cl"></div>
             </div>
         </div>
     </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 31aa0b16a..be639c1a0 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -1,9 +1,10 @@
 
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
+<div ng-if="discussion.act_type == 'Message'">
     <div class="post-container">
         <div class="post-wrapper">
             <div class="post-main">
-                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span><span ng-if="discussion.locked" class="locked_btn_cir ml10" title="已锁定">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div>
+                <div class="post-title mb5"><span class="c-grey3 f15 fb">{{discussion.subject}}</span></div>
                 <table class="post-detail-info"><tr>
                     <td class="text-nowrap v-top">发布者：</td>
                     <td>{{discussion.user.realname}}</td>
@@ -38,7 +39,7 @@
                     </div>
                 </div>
             </div>
-            <div ng-if="!discussion.locked" class="post-input-wrap">
+            <div class="post-input-wrap">
                 <div class="post-reply-row">
                     <!--<div class="post-reply-avatar fl"><img src="images/post-avatar.jpg" width="30" height="30"  /></div>-->
                     <div class="post-input-container">
@@ -50,4 +51,5 @@
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif
index 1d7dcb061..8b38366c6 100755
Binary files a/public/images/wechat/icon_list.gif and b/public/images/wechat/icon_list.gif differ
diff --git a/public/images/wechat/icon_list2.gif b/public/images/wechat/icon_list2.gif
new file mode 100755
index 000000000..1d7dcb061
Binary files /dev/null and b/public/images/wechat/icon_list2.gif differ
diff --git a/public/images/wechat/w_praise.png b/public/images/wechat/w_praise.png
new file mode 100755
index 000000000..6c0a5f7eb
Binary files /dev/null and b/public/images/wechat/w_praise.png differ
diff --git a/public/images/wechat/w_praised.png b/public/images/wechat/w_praised.png
new file mode 100755
index 000000000..3b80c9c0b
Binary files /dev/null and b/public/images/wechat/w_praised.png differ
diff --git a/public/images/wechat/w_reply.png b/public/images/wechat/w_reply.png
new file mode 100755
index 000000000..d18e19508
Binary files /dev/null and b/public/images/wechat/w_reply.png differ
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 5f0e5343f..ba3eac3df 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -52,7 +52,7 @@ a.underline {text-decoration:underline;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:13px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
 .post-content img {max-width:100%;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,