diff --git a/app/api/mobile/entities/issue.rb b/app/api/mobile/entities/issue.rb index e3dbb5023..a46e10da5 100644 --- a/app/api/mobile/entities/issue.rb +++ b/app/api/mobile/entities/issue.rb @@ -52,6 +52,10 @@ module Mobile time_from_now issue.created_on when :act_id issue.id + when :act_type + 'Journal' + when :praise_count + get_activity_praise_num(issue) end end end diff --git a/app/api/mobile/entities/news.rb b/app/api/mobile/entities/news.rb index a64081d8a..d8c4dcab3 100644 --- a/app/api/mobile/entities/news.rb +++ b/app/api/mobile/entities/news.rb @@ -36,6 +36,10 @@ module Mobile time_from_now f.created_on when :act_id f.id + when :praise_count + get_activity_praise_num(f) + when :act_type + 'Comment' end elsif f.is_a?(Hash) && !f.key?(field) diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 2d11b5964..54dda1568 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -57,9 +57,14 @@
-
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 4e309e6d6..0daf0e1bb 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -57,7 +57,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 85b3a901a..a24321b5e 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -72,7 +72,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 7fa8459c4..9ffdcea4a 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -61,7 +61,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index efc7ed64d..8aefc8d17 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -78,7 +78,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index e2e65ca58..8062ccccc 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -56,7 +56,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 30d464802..e29b062dc 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -57,7 +57,12 @@ -
+
+
+
+
{{journal.praise_count}}
+
{{journal.praise_count}}
+