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

public/javascripts/wechat/controllers/class.js

@@ -23,10 +23,11 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
         }).then(function successCallback(response) {
             console.log(response.data);
             if(response.data.status == 0){
-                vm.class_activities_page = response.data.page;
+                vm.course_activities_page = response.data.page;
                 if(response.data.page > 0)
                 {
                     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{
                     vm.course_activities = response.data.data;

public/javascripts/wechat/controllers/project.js

@@ -63,6 +63,7 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
                 if(response.data.page > 0)
                 {
                     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{
                     vm.project_activities = response.data.data;