From 930d95f8b56bd02ecf6f084cd91744b7c2794d1c Mon Sep 17 00:00:00 2001 From: cxt Date: Sat, 9 Apr 2016 13:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=8A=A8=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1234567 | 2 +- app/api/mobile/apis/activities.rb | 4 ++-- public/assets/wechat/activities.html | 2 +- public/javascripts/wechat/app.js | 26 ++++++++++---------------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/1234567 b/1234567 index 4354b8b04..1aa01764f 100644 --- a/1234567 +++ b/1234567 @@ -1 +1 @@ -{"access_token":"t3XVpwqZbAO6-uRz_ltKUiplgHcYVstA0p43ECTHEjt0-FvVLU7VXzD7n6Z76PYFWHf8hvNHZtLNAUT-FlTl98wWLIK_lh9mhzHxS_x1iXCc0mC38RjxFzZ_NSeERW7dJZCfADAOEH","expires_in":7200,"got_token_at":1460105603} \ No newline at end of file +{"access_token":"G4QG7VJgF8Vmm71kLgC1XgHvyeXK-ZZrikaG7sPBrKuw6vgbYzV2FPYuNq3wNp7e-hsyfDI--rTlVspQXZk5bRK_CsZl8wWvuiPazV9mznGpOBGE5zVR8WOtvlqhylpHIMBdABABFU","expires_in":7200,"got_token_at":1460179500} \ No newline at end of file diff --git a/app/api/mobile/apis/activities.rb b/app/api/mobile/apis/activities.rb index 7d52da6a1..94ee14a56 100644 --- a/app/api/mobile/apis/activities.rb +++ b/app/api/mobile/apis/activities.rb @@ -33,8 +33,8 @@ module Mobile shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Project'").map(&:shield_id) shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{user.id} and shield_type='Course'").map(&:shield_id) page = params[:page] ? params[:page] : 0 - user_project_ids = (user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")" - user_course_ids = (user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")" + user_project_ids = (user.projects.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (user.projects.map{|project| project.id}-shield_project_ids).join(",") + ")" + user_course_ids = (user.courses.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (user.courses.map{|course| course.id}-shield_course_ids).join(",") + ")" course_types = "('Message','News','HomeworkCommon','Poll','Course')" project_types = "('Message','Issue','ProjectCreateInfo')" principal_types = "JournalsForMessage" diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index b6315eb39..376fdcf6a 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -216,7 +216,7 @@
-
更多
+
更多
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index a8ba51662..2520013d7 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/'; @@ -77,7 +77,15 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){ url: apiUrl+ "activities", data: {openid: auth.openid(), page: page} }).then(function successCallback(response) { - $scope.activities = $scope.activities.concat(response.data.data); + $scope.current_page = 0; + console.log($scope.current_page); + console.log(response.data.page); + if($scope.current_page < response.data.page) { + $scope.activities = $scope.activities.concat(response.data.data); + } else { + $scope.activities = response.data.data; + } + $scope.current_page = response.data.page $scope.all_count = response.data.all_count; $scope.count = response.data.count; console.log(response.data); @@ -97,12 +105,10 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){ $scope.loadActData = loadActData; $scope.addPraise = function(act){ - console.log(act); common.addCommonPraise(act); }; $scope.decreasePraise = function(act){ - console.log(act); common.decreaseCommonPraise(act); }; @@ -110,7 +116,6 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){ app.factory('common', function($http, auth, $routeParams){ var addCommonReply = function(id, type, data, cb){ - console.log(data.comment); if(!data.comment || data.comment.length<=0){ return; @@ -197,12 +202,10 @@ app.controller('IssueController', function($scope, $http, $routeParams, auth, co }; $scope.addPraise = function(act){ - console.log(act); common.addCommonPraise(act); }; $scope.decreasePraise = function(act){ - console.log(act); common.decreaseCommonPraise(act); }; }); @@ -229,12 +232,10 @@ app.controller('HomeworkController', function($scope, $http, $routeParams, auth, }; $scope.addPraise = function(act){ - console.log(act); common.addCommonPraise(act); }; $scope.decreasePraise = function(act){ - console.log(act); common.decreaseCommonPraise(act); }; }); @@ -261,12 +262,10 @@ app.controller('CourseNoticeController', function($scope, $http, $routeParams, a }; $scope.addPraise = function(act){ - console.log(act); common.addCommonPraise(act); }; $scope.decreasePraise = function(act){ - console.log(act); common.decreaseCommonPraise(act); }; }); @@ -293,12 +292,10 @@ app.controller('DiscussionController', function($scope, $http, $routeParams, aut }; $scope.addPraise = function(act){ - console.log(act); common.addCommonPraise(act); }; $scope.decreasePraise = function(act){ - console.log(act); common.decreaseCommonPraise(act); }; }); @@ -383,9 +380,6 @@ app.directive('textAutoHeight', function($timeout){ var e = element.parent().children().eq(4); var height = e[0].scrollHeight; var offsetHeight = e[0].offsetHeight; - console.log(height); - console.log(offsetHeight); - console.log(attr); if(height>90){ element.css('display', 'block'); element.on('click', function(){