From a5acc2641e3503031e352e0fe083258d9d485913 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 13 Jul 2016 14:06:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=82=B9=E8=B5=9E=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E5=90=84=E4=B8=AA=E5=88=87=E6=8D=A2=E4=B9=8B=E9=97=B4?=
 =?UTF-8?q?=E7=82=B9=E8=B5=9E=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/controllers/activity.js            | 44 +++++++++++++++++++
 public/javascripts/wechat/others/factory.js   | 13 +++---
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 16a8e71d0..1ad4b9c1e 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -144,10 +144,54 @@ app.controller('ActivityController',
     }
 
     $scope.addPraise = function(act){
+        for(var i in $scope.activities){
+            if($scope.activities[i].act_id == act.act_id){
+                $scope.activities[i].praise_count += 1;
+                $scope.activities[i].has_praise = true;
+                break;
+            }
+        }
+        for(var i in $scope.course_activities){
+            if($scope.course_activities[i].act_id == act.act_id){
+                $scope.course_activities[i].praise_count += 1;
+                $scope.course_activities[i].has_praise = true;
+                break;
+            }
+        }
+        for(var i in $scope.project_activities){
+            if($scope.project_activities[i].act_id == act.act_id){
+                $scope.project_activities[i].praise_count += 1;
+                $scope.project_activities[i].has_praise = true;
+                break;
+            }
+        }
+
         common.addCommonPraise(act);
     };
 
     $scope.decreasePraise = function(act){
+        for(var i in $scope.activities){
+            if($scope.activities[i].act_id == act.act_id){
+                $scope.activities[i].praise_count -= 1;
+                $scope.activities[i].has_praise = false;
+                break;
+            }
+        }
+        for(var i in $scope.course_activities){
+            if($scope.course_activities[i].act_id == act.act_id){
+                $scope.course_activities[i].praise_count -= 1;
+                $scope.course_activities[i].has_praise = false;
+                break;
+            }
+        }
+        for(var i in $scope.project_activities){
+            if($scope.project_activities[i].act_id == act.act_id){
+                $scope.project_activities[i].praise_count -= 1;
+                $scope.project_activities[i].has_praise = false;
+                break;
+            }
+        }
+
         common.decreaseCommonPraise(act);
     };
 }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index 64204dfca..6c7709df3 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -126,8 +126,8 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
     };
 
     var addCommonPraise = function(act){
-        act.praise_count += 1;
-        act.has_praise = true;
+//        act.praise_count += 1;
+//        act.has_praise = true;
 
         $http({
             method: 'POST',
@@ -141,9 +141,8 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
     };
 
     var decreaseCommonPraise = function(act){
-        act.praise_count -= 1;
-        act.has_praise = false;
-
+//        act.praise_count -= 1;
+//        act.has_praise = false;
         $http({
             method: 'POST',
             url: apiUrl + "praise/" + act.act_id,
@@ -205,6 +204,8 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
             rms.save("course_activities",course_activities);
             rms.save("project_activities",project_activities);
 
+            act.praise_count += 1;
+            act.has_praise = true;
             addCommonPraise(act);
         };
 
@@ -237,6 +238,8 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
             rms.save("course_activities",course_activities);
             rms.save("project_activities",project_activities);
 
+            act.praise_count -= 1;
+            act.has_praise = false;
             decreaseCommonPraise(act);
         };
     }