From 6716cd9938736c3e33e13065a07bdb43f8bcc1d3 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 14:42:34 +0800
Subject: [PATCH] tz

---
 app/views/subjects/show.json.jbuilder | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder
index bf179b86d..93fa105a6 100644
--- a/app/views/subjects/show.json.jbuilder
+++ b/app/views/subjects/show.json.jbuilder
@@ -22,4 +22,26 @@ if @subject.excellent
     json.course_identity @user.course_identity(course)
     json.course_status subject_course_status course
   end
+end
+
+
+json.members @members do |member|
+  json.partial! 'subject_member', locals: { user: member.user }
+  json.role member.role
+end
+
+# 技能标签
+json.tags @tags do |tag|
+  unless tag.blank?
+    json.tag_name tag
+    json.status @user_tags.include?(tag)
+  end
+end
+
+# 我的进展
+json.progress do
+  json.my_score @subject.my_subject_score
+  json.all_score @subject.all_score
+  json.learned @subject.my_subject_progress
+  json.time  @subject.my_consume_time
 end
\ No newline at end of file