From 8584d1dccb22660a8e5d7784b54add90f2745451 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 8 Sep 2016 15:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=9B=9E=E5=A4=8D=E5=9B=9E=E5=A4=8D=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/blog_detail.html         |  8 ++++----
 public/assets/wechat/course_discussion.html   |  4 ++--
 public/assets/wechat/course_notice.html       |  4 ++--
 public/assets/wechat/homework_detail.html     |  4 ++--
 public/assets/wechat/issue_detail.html        |  4 ++--
 public/assets/wechat/jour_message_detail.html |  4 ++--
 public/assets/wechat/project_discussion.html  |  4 ++--
 public/javascripts/wechat/others/factory.js   | 10 ++++++++++
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 444f16957..3ed2d573b 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -73,14 +73,14 @@
                                 <div ng-if="journal.praise_count && !journal.has_praise" ng-click="addPraise(journal);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
                                 <div ng-if="journal.has_praise" ng-click="decreasePraise(journal);"><img src="/images/wechat/w_praised.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{journal.praise_count}}</span></div>
                             </div>
-                            <div class="fr mr25 f13 reply-icons multi-hide" multi-reply>
-                                <a><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>
+                            <div class="fr mr25 f13 reply-icons multi-hide" >
+                                <a><img src="/images/wechat/w_reply.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span ng-click="clickReply(journal.act_id,blog.all_children)" style="vertical-align:top;">回复</span></a>
                             </div>
                             <div class="cl"></div>
-                            <div class="post-input-container multi-input-container ml40 mb10 undis">
+                            <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                                 <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                                 <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                                <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                                <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                                 <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                                 <div class="cl"></div>
                             </div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index a21b5aec0..be927f9a9 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -75,10 +75,10 @@
                                 <a><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>
                             </div>
                             <div class="cl"></div>
-                            <div class="post-input-container multi-input-container ml40 mb10 undis">
+                            <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                                 <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                                 <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                                <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                                <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                                 <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                                 <div class="cl"></div>
                             </div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index 273f7e703..518829ceb 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -90,10 +90,10 @@
                             <a><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>
                         </div>
                         <div class="cl"></div>
-                        <div class="post-input-container multi-input-container ml40 mb10 undis">
+                        <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                            <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                             <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                             <div class="cl"></div>
                         </div>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index f978fc01d..43efd2d21 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -79,10 +79,10 @@
                             <a><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>
                         </div>
                         <div class="cl"></div>
-                        <div class="post-input-container multi-input-container ml40 mb10 undis">
+                        <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                            <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                             <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                             <div class="cl"></div>
                         </div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index a3e861649..5a72fdc82 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -96,10 +96,10 @@
                             <a><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>
                         </div>
                         <div class="cl"></div>
-                        <div class="post-input-container multi-input-container ml40 mb10 undis">
+                        <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                            <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                             <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                             <div class="cl"></div>
                         </div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index fe746a1fc..e96f34768 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -74,10 +74,10 @@
                             <a><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>
                         </div>
                         <div class="cl"></div>
-                        <div class="post-input-container multi-input-container ml40 mb10 undis">
+                        <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                            <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                             <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                             <div class="cl"></div>
                         </div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index d30ef298b..ca3dc1bb0 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -75,10 +75,10 @@
                             <a><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>
                         </div>
                         <div class="cl"></div>
-                        <div class="post-input-container multi-input-container ml40 mb10 undis">
+                        <div ng-show="journal.showinput" class="post-input-container multi-input-container ml40 mb10">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
                             <textarea input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
-                            <button ng-click="addReply(journal,1)" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
+                            <button ng-click="addReply(journal,1);journal.showinput = false;" ng-disabled="journal.disabled" ng-hide="journal.disabled" class="post-reply-submit fr border-radius">提交</button>
                             <button ng-disabled="journal.disabled" ng-hide="!journal.disabled" class="post-reply-submit bg-grey fr border-radius">提交</button>
                             <div class="cl"></div>
                         </div>
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 01356003c..2c32a81e2 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -324,6 +324,16 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
             });
         };
 
+        args.scope.clickReply = function(act_id,allchidren) {
+            for(var i in allchidren){
+                if(allchidren[i].act_id != act_id ){
+                    allchidren[i].showinput = false;
+                }
+                else{
+                    allchidren[i].showinput = !allchidren[i].showinput;
+                }
+            }
+        };
 
 //       动态详情界面点赞与动态界面的数据要同步  保证进入详情点赞后出来显示一致
         args.scope.addPraise = function(act){