From b6fdbc11a64fd68cc8463ec605aef2f9124e0cfb Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 8 Sep 2016 16:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=9B=9E=E5=A4=8D=E6=A1=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 3ed2d573b..0d9e07f9a 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -74,12 +74,12 @@
                                 <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" >
-                                <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>
+                                <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)" style="vertical-align:top;">回复</span></a>
                             </div>
                             <div class="cl"></div>
                             <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>
+                                <textarea ng-focus="inputfocus(blog)" ng-blur="inputblur(blog)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                                 <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>
@@ -92,7 +92,7 @@
                 </div>
             </div>
 
-            <div ng-if="!blog.locked" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
+            <div ng-show="!blog.notshow" ng-if="!blog.locked" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index cba34e7b9..ee9cfc054 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -72,12 +72,12 @@
                                 <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 ng-click="clickReply(journal.act_id,discussion.all_children)" style="vertical-align:top;">回复</span></a>
+                                <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,discussion)" style="vertical-align:top;">回复</span></a>
                             </div>
                             <div class="cl"></div>
                             <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>
+                                <textarea ng-focus="inputfocus(discussion)" ng-blur="inputblur(discussion)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                                 <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>
@@ -89,7 +89,7 @@
                     </div>
                 </div>
 
-                <div ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
+                <div ng-show="!discussion.notshow" ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                     <div class="post-reply-row border-bottom-none">
                         <div class="post-input-container">
                             <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index a2c39afef..bc133601b 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -87,12 +87,12 @@
                             <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 ng-click="clickReply(journal.act_id,news.all_children)" style="vertical-align:top;">回复</span></a>
+                            <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,news)" style="vertical-align:top;">回复</span></a>
                         </div>
                         <div class="cl"></div>
                         <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>
+                            <textarea ng-focus="inputfocus(news)" ng-blur="inputblur(news)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                             <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>
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 2e3e6b076..c1d99f8a3 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -76,12 +76,12 @@
                             <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 ng-click="clickReply(journal.act_id,homework.all_children)" style="vertical-align:top;">回复</span></a>
+                            <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,homework)" style="vertical-align:top;">回复</span></a>
                         </div>
                         <div class="cl"></div>
                         <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>
+                            <textarea ng-focus="inputfocus(homework)" ng-blur="inputblur(homework)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                             <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>
@@ -93,7 +93,7 @@
                 </div>
             </div>
 
-            <div id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
+            <div ng-show="!homework.notshow" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 47a45a150..7fa7db27e 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -93,12 +93,12 @@
                             <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 ng-click="clickReply(journal.act_id,issue.all_children)" style="vertical-align:top;">回复</span></a>
+                            <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,issue)" style="vertical-align:top;">回复</span></a>
                         </div>
                         <div class="cl"></div>
                         <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>
+                            <textarea ng-focus="inputfocus(issue)" ng-blur="inputblur(issue)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                             <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>
@@ -110,7 +110,7 @@
                 </div>
             </div>
 
-            <div id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
+            <div ng-show="!issue.notshow" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 2ab72f259..390866f83 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -71,12 +71,12 @@
                             <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 ng-click="clickReply(journal.act_id,message.all_children)" style="vertical-align:top;">回复</span></a>
+                            <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,message)" style="vertical-align:top;">回复</span></a>
                         </div>
                         <div class="cl"></div>
                         <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>
+                            <textarea ng-focus="inputfocus(message)" ng-blur="inputblur(message)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                             <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>
@@ -88,7 +88,7 @@
                 </div>
             </div>
 
-            <div id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
+            <div ng-show="!message.notshow" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 3b1b12159..b2f315a6c 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -72,12 +72,12 @@
                             <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 ng-click="clickReply(journal.act_id,discussion.all_children)" style="vertical-align:top;">回复</span></a>
+                            <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,discussion)" style="vertical-align:top;">回复</span></a>
                         </div>
                         <div class="cl"></div>
                         <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>
+                            <textarea ng-focus="inputfocus(discussion)" ng-blur="inputblur(discussion)" input-auto type="text" class="post-reply-input" ng-model="journal.comment" placeholder="{{replytip}}" /></textarea>
                             <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>
@@ -88,7 +88,7 @@
                     <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" iphone-recognize>
+            <div ng-show="!discussion.notshow" ng-if="!discussion.locked" id="post_input_1" class="post-input-wrap post-box-shadow" iphone-recognize>
                 <div class="post-reply-row border-bottom-none">
                     <div class="post-input-container">
                         <div class="copy-input-container"><textarea class="copy-input"></textarea></div>
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 2c32a81e2..190dd36b4 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -324,13 +324,23 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
             });
         };
 
-        args.scope.clickReply = function(act_id,allchidren) {
+        args.scope.inputfocus = function(data){
+            data.notshow = true;
+        };
+
+        args.scope.inputblur = function(data){
+            data.notshow = false;
+        };
+
+        args.scope.clickReply = function(act_id,data) {
+            allchidren = data.all_children;
             for(var i in allchidren){
                 if(allchidren[i].act_id != act_id ){
                     allchidren[i].showinput = false;
                 }
                 else{
                     allchidren[i].showinput = !allchidren[i].showinput;
+                    data.notshow = allchidren[i].showinput;
                 }
             }
         };