From 1cb1835a1a0db944208d36869f4f006f43869714 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Apr 2016 14:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 53 +++++++++++++---------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index d3f3d9459..da1e10a81 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -30,7 +30,6 @@
           </div>
         </div>
 
-
         <div ng-if="act.act_type=='News'">
           <div class="post-container">
             <div class="post-wrapper">
@@ -93,8 +92,6 @@
             </div>
           </div>
         </div>
-
-
       </div>
 
       <div ng-if="act.container_type=='Project'">
@@ -151,8 +148,6 @@
           </div>
         </div>
 
-
-
         <div ng-if="act.act_type=='ProjectCreateInfo'">
           <div class="post-container">
             <div class="post-wrapper">
@@ -165,8 +160,10 @@
             </div>
           </div>
         </div>
+      </div>
 
-        <div ng-if="act.act_type=='Principal'">
+      <div ng-if="act.container_type=='Principal'">
+        <div ng-if="act.act_type=='JournalsForMessage'">
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
@@ -188,33 +185,31 @@
             </div>
           </div>
         </div>
+      </div>
 
-        <div ng-if="act.act_type=='BlogComment'">
-          <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="45" height="45" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>发表博客</div>
-                <div class="cl"></div>
-                <div class="post-content c-grey2 mt10">
-                  <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
-                </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
-                <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
-                <div class="cl"></div>
-              </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey"> 回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
+      <div ng-if="act.act_type=='BlogComment'">
+        <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="45" height="45" class="border-radius" /></div>
+              <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+              <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>发表博客</div>
+              <div class="cl"></div>
+              <div class="post-content c-grey2 mt10">
+                <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
+              </div>
+              <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+              <div class="cl"></div>
+              <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+              <div class="cl"></div>
+            </div>
+            <div class="post-interactive">
+              <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey"> 回复 ({{act.reply_count}})</a></div>
+              <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
+              <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
             </div>
           </div>
         </div>
-
-
       </div>
 
     </div>