jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-09-02 10:06:13 +08:00
parent 231c660744 5cda2292d0
commit b234212a8a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/javascripts/wechat/controllers/class.js
View File

@ -23,10 +23,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
}).then(function successCallback(response) { }).then(function successCallback(response) {
console.log(response.data); console.log(response.data);
if(response.data.status == 0){ if(response.data.status == 0){
vm.class_activities_page = response.data.page; vm.course_activities_page = response.data.page;
if(response.data.page > 0) if(response.data.page > 0)
{ {
vm.course_activities = vm.course_activities.concat(response.data.data); vm.course_activities = vm.course_activities.concat(response.data.data);
vm.course_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
} }
else{ else{
vm.course_activities = response.data.data; vm.course_activities = response.data.data;

1
public/javascripts/wechat/controllers/project.js
View File

@ -63,6 +63,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
if(response.data.page > 0) if(response.data.page > 0)
{ {
vm.project_activities = vm.project_activities.concat(response.data.data); vm.project_activities = vm.project_activities.concat(response.data.data);
vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
} }
else{ else{
vm.project_activities = response.data.data; vm.project_activities = response.data.data;