From eee7b89388ddca62c40ff252e8b79dae8fecca4d Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 8 Apr 2016 14:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/activity.rb | 16 +++++++--------- public/javascripts/wechat/app.js | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb index fdc03c47b..e725ed2bb 100644 --- a/app/api/mobile/entities/activity.rb +++ b/app/api/mobile/entities/activity.rb @@ -38,18 +38,16 @@ module Mobile elsif ac.act_type == "Message" || ac.act_type == "Issue" ac.act.subject unless ac.nil? || ac.act.nil? elsif ac.act_type == "JournalsForMessage" - ac.act.private == 0 ? "留言" : "私信" + ac.act.private == 0 ? "留言" : "私信" unless ac.nil? || ac.act.nil? end end when :description - unless ac.act.nil? - if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News" - ac.act.description unless ac.nil? || ac.act.nil? - elsif ac.act_type == "Message" || ac.act_type == "BlogComment" - ac.act.content unless ac.nil? || ac.act.nil? - elsif ac.act_type == "JournalsForMessage" - ac.act.notes - end + if ac.act_type == "HomeworkCommon" || ac.act_type == "Issue" || ac.act_type == "News" + ac.act.description unless ac.nil? || ac.act.nil? + elsif ac.act_type == "Message" || ac.act_type == "BlogComment" + ac.act.content unless ac.nil? || ac.act.nil? + elsif ac.act_type == "JournalsForMessage" + ac.act.notes unless ac.nil? || ac.act.nil? end when :latest_update time_from_now ac.updated_at unless ac.nil? diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index ce90cd686..121edb560 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 = "1"; + _openid = "3"; } var getOpenId = function() {