From 7bb94d9df4aea4c575d43ceed506ae28d2d80003 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 26 May 2016 13:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=B0=86?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=92=8C=E6=A1=86=E6=9E=B6=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         | 74 +++++++--------
 public/assets/wechat/course_discussion.html   | 89 ++++++++++---------
 public/assets/wechat/course_notice.html       |  2 +
 public/assets/wechat/homework_detail.html     |  4 +-
 public/assets/wechat/issue_detail.html        |  2 +
 public/assets/wechat/jour_message_detail.html | 70 ++++++++-------
 public/assets/wechat/project_discussion.html  |  8 +-
 7 files changed, 132 insertions(+), 117 deletions(-)

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