diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 7e8aa8b1a..5bfbfec01 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -741,7 +741,7 @@ class Mailer < ActionMailer::Base mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "项目讨论区有新帖子发布了", message.subject, @author.try(:realname), format_time(message.created_on) end else - mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe + mail_wechat_message message.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe end elsif message.course redmine_headers 'Course' => message.course.id, @@ -763,7 +763,7 @@ class Mailer < ActionMailer::Base mail_wechat_message member.user_id, "oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", "课程问答区有新帖子发布了", message.subject, @author.try(:realname), format_time(message.created_on) end else - mail_wechat_message member.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe + mail_wechat_message message.parent.author_id, "A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", "您的帖子有新回复了", @author.try(:realname), format_time(message.created_on), message.content.html_safe end end end diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index f77ca01ce..db460655f 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){ var _openid = ''; if(debug===true){ - _openid = "2"; + _openid = "1"; } var getOpenId = function() { @@ -85,7 +85,7 @@ app.controller('ActivityController',function($scope, $http, auth, rms, common){ } else { $scope.activities = response.data.data; } - $scope.current_page = response.data.page + $scope.current_page = response.data.page; $scope.all_count = response.data.all_count; $scope.count = response.data.count; console.log(response.data);