From 4b738e074b2468d1d27598f9e081509d07c2dd92 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 14 Nov 2019 11:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/weapps/homes_controller.rb | 4 +++-
 app/views/weapps/homes/show.json.jbuilder  | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/weapps/homes_controller.rb b/app/controllers/weapps/homes_controller.rb
index 883a3e892..0ddafb177 100644
--- a/app/controllers/weapps/homes_controller.rb
+++ b/app/controllers/weapps/homes_controller.rb
@@ -15,6 +15,8 @@ class Weapps::HomesController < Weapps::BaseController
               when 'manage' then
                 current_user.manage_courses
                end
-
+    @courses = @courses.not_deleted.not_excellent
+    @course_count = @courses.count
+    @courses = paginate(@courses.order("sticky=1 desc, sticky_time desc, created_at desc").includes(:teacher, :school))
   end
 end
\ No newline at end of file
diff --git a/app/views/weapps/homes/show.json.jbuilder b/app/views/weapps/homes/show.json.jbuilder
index 9ae9fea1f..c7f50212d 100644
--- a/app/views/weapps/homes/show.json.jbuilder
+++ b/app/views/weapps/homes/show.json.jbuilder
@@ -16,5 +16,10 @@ else
   json.advert nil
 end
 
-
+json.course_count @course_count
+json.courses @courses.each do |course|
+  json.(course, :id, :name, :visits, :course_members_count, :sticky, :sticky_time)
+  json.creator course.teacher.real_name
+  json.school course.school&.name
+end