From 37a6adf4283984bff3c25b040d024b0f8353452e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 22 Jul 2016 16:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9B=9E=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=9F=E4=B8=80=E5=86=99=E5=88=B0comment=5Freply?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         | 20 ++-----------
 public/assets/wechat/course_discussion.html   | 30 ++++++++++++++++---
 public/assets/wechat/homework_detail.html     | 22 ++------------
 public/assets/wechat/jour_message_detail.html | 20 ++-----------
 public/assets/wechat/project_discussion.html  | 20 ++-----------
 .../wechat/templates/comment_reply.html       | 21 ++++++++++++-
 6 files changed, 55 insertions(+), 78 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 075c752ef..721c3d38e 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -44,7 +44,7 @@
                         <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">
-                            <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>
@@ -86,20 +86,4 @@
 
         </div>
     </div>
-</div>
-
-<script id="comment_reply" type="text/ng-template">
-    <div  class="mult-reply-container mt2">
-    <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>
-    <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>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 7d358fb25..f04d78926 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -23,14 +23,14 @@
                         <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.replies_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.replies_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.replies_count}}</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;">回复</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="mb50" id="all_course_message_reply">
-                    <div ng-if="discussion.message_children == ''" style="border-top:1px solid #ccc;"></div>
-                    <div class="post-reply-wrap" ng-repeat="journal in discussion.message_children">
+                    <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">
@@ -40,10 +40,32 @@
                             </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,discussion);">更多</div>
+                    </div>
                 </div>
 
                 <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 67d7dd959..788d0c1b2 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -46,8 +46,8 @@
                         <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>-->
+                            <!--<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>
@@ -86,20 +86,4 @@
 
         </div>
     </div>
-</div>
-
-<script id="comment_reply" type="text/ng-template">
-    <div  class="mult-reply-container mt2">
-        <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>
-        <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>
\ No newline at end of file
+</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 288a78688..aeea03dad 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -42,7 +42,7 @@
                         <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>
@@ -81,20 +81,4 @@
 
         </div>
     </div>
-</div>
-
-<script id="comment_reply" type="text/ng-template">
-    <div  class="mult-reply-container mt2">
-        <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>
-        <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>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 97a8c3f77..1603afa8c 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -43,7 +43,7 @@
                         <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>
@@ -80,20 +80,4 @@
             </div>
         </div>
     </div>
-</div>
-
-<script id="comment_reply" type="text/ng-template">
-    <div  class="mult-reply-container mt2">
-        <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>
-        <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>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/public/assets/wechat/templates/comment_reply.html b/public/assets/wechat/templates/comment_reply.html
index 6aeb3a4bd..ffa656aab 100644
--- a/public/assets/wechat/templates/comment_reply.html
+++ b/public/assets/wechat/templates/comment_reply.html
@@ -1,4 +1,6 @@
-<div  class="mult-reply-container mt2">
+<div ng-if="journal.parents_reply_top[i]"  class="mult-reply-container mt2">
+    <!--<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">
@@ -11,3 +13,20 @@
     <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">
+        <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>
+        <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>