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

回复

This commit is contained in:
cxt 2016-04-08 16:58:27 +08:00
parent de8d630fc1
commit d6daa906b6
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
1234567 Normal file
View File

@ -0,0 +1 @@
{"access_token":"t3XVpwqZbAO6-uRz_ltKUiplgHcYVstA0p43ECTHEjt0-FvVLU7VXzD7n6Z76PYFWHf8hvNHZtLNAUT-FlTl98wWLIK_lh9mhzHxS_x1iXCc0mC38RjxFzZ_NSeERW7dJZCfADAOEH","expires_in":7200,"got_token_at":1460105603}

4
app/api/mobile/entities/blog_comment.rb
View File

@ -24,6 +24,8 @@ module Mobile
'BlogComment'
when :act_id
u.id
when :comment_count
u.children.count
end
end
end
@ -41,7 +43,7 @@ module Mobile
blog_comment_expose :blog_id
blog_comment_expose :title
blog_comment_expose :content
blog_comment_expose :comments_count
blog_comment_expose :comment_count
blog_comment_expose :created_at
blog_comment_expose :lasted_comment
blog_comment_expose :id

2
app/models/blog_comment.rb
View File

@ -99,7 +99,7 @@ class BlogComment < ActiveRecord::Base
color:"#173177"
},
keyword3:{
value:h(truncate(key3, :length=>50, :omission=> '...')),
value:self.content.html_safe,
color:"#173177"
},
remark:{

2
app/models/journal.rb
View File

@ -260,7 +260,7 @@ class Journal < ActiveRecord::Base
color:"#173177"
},
keyword3:{
value:h(truncate(key3, :length=>50, :omission=> '...')),
value:self.description.html_safe,
color:"#173177"
},
remark:{

2
app/models/journals_for_message.rb
View File

@ -330,7 +330,7 @@ class JournalsForMessage < ActiveRecord::Base
color:"#173177"
},
keyword3:{
value:h(truncate(key3, :length=>50, :omission=> '...')),
value:self.notes.html_safe,
color:"#173177"
},
remark:{

2
public/assets/wechat/blog_detail.html
View File

@ -15,7 +15,7 @@
<div class="cl"></div>
</div>
<div class="post-interactive border-bottom">
<div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{blog.comments_count}})</span></div>
<div class="post-interactive-reply c-grey2">回复 <span class="reply-num">({{blog.comment_count}})</span></div>
<div class="post-interactive-column c-grey2" ng-if="blog.has_praise" ng-click="decreasePraise(blog);">已赞 ({{blog.praise_count}})</div>
<div class="post-interactive-column c-grey2" ng-if="!blog.has_praise" ng-click="addPraise(blog);">赞 ({{blog.praise_count}})</div>
</div>

4
public/javascripts/wechat/app.js
View File

@ -1,6 +1,6 @@
var app = angular.module('wechat', ['ngRoute','ngCookies']);
var apiUrl = 'http://wechat.trustie.net/api/v1/';
var debug = false; //调试标志,如果在本地请置为true
var debug = true; //调试标志,如果在本地请置为true
if(debug===true){
apiUrl = 'http://localhost:3000/api/v1/';
@ -10,7 +10,7 @@ app.factory('auth', function($http,$routeParams, $cookies, $q){
var _openid = '';
if(debug===true){
_openid = "6";
_openid = "1";
}
var getOpenId = function() {