From bb71d1c3222855cf47bf4a274015d461ec00196e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 7 Apr 2016 16:59:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/wechat/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index baa5a2731..afb33eca2 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -1,6 +1,6 @@
 var app = angular.module('wechat', ['ngRoute','ngCookies']);
 var apiUrl = 'http://wechat.trustie.net/api/v1/';
-var debug = true; //调试标志,如果在本地请置为true
+var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){
     apiUrl = 'http://localhost:3000/api/v1/';

From 1503686ddb481d01fc49cbc582759a155ccca944 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Apr 2016 10:09:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0=E6=9B=B4=E5=A4=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/wechat/activities.html | 4 +++-
 public/javascripts/wechat/app.js     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 279cf5fbf..d0e3d2c66 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -219,7 +219,9 @@
 
     </div>
 
-  <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
+  <div ng-if="(count + page * 10) < all_count">
+    <div id="more_activities" class="more-events mt10" ng-click="loadActData(page+1);">更多</div>
+  </div>
 
 </div>
 
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index afb33eca2..e68563c3d 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -68,7 +68,7 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
 
     console.log("ActivityController load");
     $scope.activities = rms.get("activities") || [];
-    $scope.page = 1;
+    $scope.page = 0;
 
     var loadActData = function(page){
         $scope.page = page;
@@ -78,6 +78,8 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){
             data: {openid: auth.openid(), page: page}
         }).then(function successCallback(response) {
             $scope.activities = $scope.activities.concat(response.data.data);
+            $scope.all_count = response.data.all_count;
+            $scope.count = response.data.count;
             rms.save('activities', $scope.activities);
         }, function errorCallback(response) {
         });