From 0b1b08bd3d6279f749ca8e4f82afd9507d9bc5b7 Mon Sep 17 00:00:00 2001
From: txz <txz124@sina.com>
Date: Thu, 7 Apr 2016 14:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html          | 24 +++++++++++--------
 public/assets/wechat/blog_detail.html         |  2 +-
 public/assets/wechat/course_discussion.html   |  2 +-
 public/assets/wechat/course_notice.html       |  2 +-
 public/assets/wechat/homework_detail.html     |  2 +-
 public/assets/wechat/issue_detail.html        |  2 +-
 public/assets/wechat/jour_message_detail.html |  2 +-
 public/assets/wechat/project_discussion.html  |  2 +-
 public/javascripts/wechat/app.js              |  4 ++++
 9 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index e63bcf642..130898051 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -16,7 +16,6 @@
                   <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> 匿评开启时间：{{act.homework_common_detail.evaluation_start}}<br />
                   <span class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
                 </div>
-                <a>点击展开</a>
                 <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis" style="text-decoration:underline">点击展开</a>
                 <div class="cl"></div>
                 <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
@@ -24,7 +23,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/homework/{{act.act_id}}" class="c-grey">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey2">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -49,8 +49,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/course_notice/{{act.act_id}}" class="c-grey">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey2" ng-if="{{act.has_praise}}">一赞 ({{act.activity_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="{{!act.has_praise}}">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -73,7 +73,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey2">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -117,8 +118,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/issues/{{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.activity_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="act.has_praise">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -143,7 +144,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey"> 回复 ({{act.reply_count}}) </a></div>
-                <div class="post-interactive-column c-grey2">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -180,7 +182,8 @@
               </div>
               <div class="post-interactive">
                 <div class="post-interactive-column c-grey2"><a href="javascript:void(0);" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey"> 回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey2">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
@@ -204,7 +207,8 @@
               </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">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.activity_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.activity_praise_count}})</div>
               </div>
             </div>
           </div>
diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html
index 1fc92eabb..a2cb70650 100644
--- a/public/assets/wechat/blog_detail.html
+++ b/public/assets/wechat/blog_detail.html
@@ -17,7 +17,7 @@
         <div class="post-interactive border-bottom">
             <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{blog.comments_count}})</span></div>
             <div class="post-interactive-column c-grey2" ng-if="blog.has_praise" ng-click="addPraise(blog);">已赞 ({{blog.blog_praise_count}})</div>
-            <div class="post-interactive-column c-grey2" ng-if="!blog.has_praise">赞 ({{blog.blog_praise_count}})</div>
+            <div class="post-interactive-column c-grey2" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{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">
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 2c2c210a9..416cfaa22 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -17,7 +17,7 @@
             <div class="post-interactive border-bottom">
                 <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
                 <div class="post-interactive-column c-grey2" ng-if="discussion.has_praise" ng-click="addPraise(discussion);">已赞 ({{discussion.message_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="!discussion.has_praise">赞 ({{discussion.message_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.message_praise_count}})</div>
             </div>
             <div id="all_course_message_reply">
             <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html
index eccd91848..737728d95 100644
--- a/public/assets/wechat/course_notice.html
+++ b/public/assets/wechat/course_notice.html
@@ -17,7 +17,7 @@
             <div class="post-interactive border-bottom">
                 <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{news.comments_count}})</span></div>
                 <div class="post-interactive-column c-grey2" ng-if="news.has_praise" ng-click="addPraise(news);">已赞 ({{news.news_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="!news.has_praise">赞 ({{news.news_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!news.has_praise" ng-click="addPraise(news);">赞 ({{news.news_praise_count}})</div>
             </div>
             <div id="all_news_reply">
             <div class="post-reply-wrap border-bottom" ng-repeat="comments in news.comments">
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html
index 98992da59..5926727e1 100644
--- a/public/assets/wechat/homework_detail.html
+++ b/public/assets/wechat/homework_detail.html
@@ -19,7 +19,7 @@
             <div class="post-interactive border-bottom">
                 <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{homework.whomework_journal_count}})</span></div>
                 <div class="post-interactive-column c-grey2" ng-if="homework.has_praise" ng-click="addPraise(homework);">已赞 ({{homework.whomework_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="!homework.has_praise">赞 ({{homework.whomework_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!homework.has_praise" ng-click="addPraise(homework);">赞 ({{homework.whomework_praise_count}})</div>
             </div>
             <div id="all_homework_reply">
             <div class="post-reply-wrap border-bottom" ng-repeat="journal in homework.journals_for_messages">
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html
index 0fb443e67..3be9d0d21 100644
--- a/public/assets/wechat/issue_detail.html
+++ b/public/assets/wechat/issue_detail.html
@@ -19,7 +19,7 @@
             <div class="post-interactive border-bottom">
                 <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{issue.journals_count}})</span></div>
                 <div class="post-interactive-column c-grey2" ng-if="!issue.has_praise" ng-click="addPraise(issue);">已赞 ({{issue.issue_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="issue.has_praise">赞 ({{issue.issue_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="issue.has_praise" ng-click="addPraise(issue);">赞 ({{issue.issue_praise_count}})</div>
             </div>
             <div id="all_issue_reply">
             <div class="post-reply-wrap border-bottom" ng-repeat="journal in issue.issue_journals">
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html
index 893d693c8..990055b56 100644
--- a/public/assets/wechat/jour_message_detail.html
+++ b/public/assets/wechat/jour_message_detail.html
@@ -14,7 +14,7 @@
         <div class="post-interactive border-bottom">
             <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{message.reply_count}})</span></div>
             <div class="post-interactive-column c-grey2" ng-if="message.has_praise" ng-click="addPraise(message);">已赞 ({{message.message_praise_count}})</div>
-            <div class="post-interactive-column c-grey2" ng-if="!message.has_praise">赞 ({{message.message_praise_count}})</div>
+            <div class="post-interactive-column c-grey2" ng-if="!message.has_praise" ng-click="addPraise(message);">赞 ({{message.message_praise_count}})</div>
         </div>
         <div id="all_message_reply">
 
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 62d6dc728..6c06b95e9 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -17,7 +17,7 @@
             <div class="post-interactive border-bottom">
                 <div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{discussion.replies_count}})</span></div>
                 <div class="post-interactive-column c-grey2" ng-if="discussion.has_praise" ng-click="addPraise(discussion);">已赞 ({{discussion.message_praise_count}})</div>
-                <div class="post-interactive-column c-grey2" ng-if="!discussion.has_praise">赞 ({{discussion.message_praise_count}})</div>
+                <div class="post-interactive-column c-grey2" ng-if="!discussion.has_praise" ng-click="addPraise(discussion);">赞 ({{discussion.message_praise_count}})</div>
             </div>
             <div id="all_course_message_reply">
                 <div class="post-reply-wrap border-bottom" ng-repeat="journal in discussion.message_children">
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 9204d169b..6c8d79c48 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -97,6 +97,10 @@ app.controller('ActivityController',function($scope, $http, auth, rms){
         //$http
 
     }
+    $scope.decreasePraise = function(act){
+        act.activity_praise_count -= 1;
+        act.has_praise = false;
+    }
 
     $scope.loadActData = loadActData;