diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 85cfad7e4..c610a9839 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -249,8 +249,8 @@
-
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index 51c91d152..a129a795c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -73,11 +73,35 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
};
console.log("ActivityController load");
- $scope.activities = rms.get("activities") || [];
+
$scope.page = 0;
+ $scope.activities = rms.get("activities") || [];
+
+ var savePageConfig = function(){
+ rms.save('current_page', $scope.current_page);
+ rms.save('has_more', $scope.has_more);
+ rms.save('activities', $scope.activities);
+ }
+
+ var loadPageConfig = function(){
+ var current_page = rms.get('current_page');
+ var has_more = rms.get('has_more');
+ var activities = rms.get('activities');
+
+ if(typeof current_page !== 'undefined'){
+ $scope.page = current_page;
+ }
+ if(typeof has_more !== 'undefined'){
+ $scope.has_more = has_more;
+ }
+ if(typeof activities !== 'undefined'){
+ $scope.activities = activities;
+ }
+ }
var loadActData = function(page){
- if (page <= 0 && $scope.activities.length >0){
+ if (page <= 0 && $scope.activities.length >0){ //应该是返回过来的
+ loadPageConfig();
var yOffset = rms.get("yoffset");
$location.hash(yOffset);
return;
@@ -97,10 +121,12 @@ app.controller('ActivityController',function($anchorScroll, $location,$scope, $h
} else {
$scope.activities = response.data.data;
}
- $scope.current_page = response.data.page;
- $scope.all_count = response.data.all_count;
- $scope.count = response.data.count;
+ $scope.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+
console.log(response.data);
+
+ rms.save('current_page', $scope.page);
+ rms.save('has_more', $scope.has_more);
rms.save('activities', $scope.activities);
}, function errorCallback(response) {
});