111

app/model/api/CourseModel.php

@@ -3,9 +3,10 @@
 namespace app\model\api;
 
 use think\facade\Db;
-use think\model;
+use think\Model;
 
-class CourseModel
+
+class CourseModel extends Model
 {
 
     protected $table = 'table_education_course';
@@ -22,25 +23,51 @@ class CourseModel
     }
 
 
+//    /**
+//     * 获取所有课程
+//     *
+//     * @param string $keyword 模糊查询关键字
+//     * @return mixed
+//     */
+//    public function getCourse($keyword = '')
+//    {
+//        $query = Db::table($this->table)
+//            ->order('course_create_time', 'desc')
+//            ->field('course_id, course_topic, course_speaker, course_speaker_intro, course_price, course_play_count, course_create_time, course_audit, course_cover');
+//
+//        if (!empty($keyword)) {
+//            $query->where('course_topic', 'like', "%{$keyword}%");
+//        }
+//
+//        $courseList = $query->select();
+//
+//        return $courseList;
+//    }
+
+
     /**
-     * 获取所有课程
+     * 获取课程列表
      *
-     * @param string $keyword 模糊查询关键字
+     * @param string $course_topic
+     * @param int $page
+     * @param int $pagesize
      * @return mixed
      */
-    public function getCourse($keyword = '')
+    public function getCourse($course_topic = '', $page = 1, $pagesize = 10)
     {
-        $query = Db::table($this->table)
-            ->order('course_create_time', 'desc')
-            ->field('course_id, course_topic, course_speaker, course_speaker_intro, course_price, course_play_count, course_create_time, course_audit, course_cover');
+        $query = $this->order('course_id ASC');
+
 
-        if (!empty($keyword)) {
-            $query->where('course_topic', 'like', "%{$keyword}%");
+        if (!empty($course_topic)) {
+            $query->whereLike('course_topic', '%' . $course_topic . '%');
         }
 
-        $courseList = $query->select();
+        $list = $query->paginate([
+            'page' => $page,
+            'list_rows' => $pagesize,
+        ]);
 
-        return $courseList;
+        return $list;
     }
 
 

app/system/controller/CourseController.php

@@ -9,36 +9,20 @@ class CourseController
 {
 
 
-    /**
-     * 获取所有课程列表
-     */
-    public function getCourseList()
-    {
-        $educationModel = new CourseModel();
-        $keyword = input('get.course_topic', ''); // 获取模糊查询关键字
-        $courseList = $educationModel->getCourse($keyword);
-        $page = Request::param('page', 1, 'intval');
-        $pagesize = Request::param('pagesize', 10, 'intval');
-
-
-
-        $list = $courseList->paginate([
-                'page' => $page,
-            'list_rows' => $pagesize,
-        ]);
-
-
-
-        $data = [
-            'data' => $courseList,
-            'page' => $list->currentPage(),
-            'pagesize' => $list->listRows(),
-
-                  ];
-        return app('json')->success($data);
-    }
-
-
+//    /**
+//     * 获取所有课程列表
+//     */
+//    public function getCourseList()
+//    {
+//        $educationModel = new CourseModel();
+//        $keyword = input('get.course_topic', ''); // 获取模糊查询关键字
+//        $courseList = $educationModel->getCourse($keyword);
+//
+//        $data = [
+//                  'data' => $courseList
+//                  ];
+//        return app('json')->success($data);
+//    }
 
 //    /**
 //     * 获取所有课程列表
@@ -67,6 +51,40 @@ class CourseController
 //    }
 
 
+    /**
+     * 分组列表
+     *
+     * @return mixed
+     */
+    public function getCourseList()
+    {
+        $course_topic = Request::param('course_topic');
+        $page = Request::param('page', 1, 'intval');
+        $pagesize = Request::param('pagesize', 10, 'intval');
+
+        $courseModel = new CourseModel();
+        $query = $courseModel->order('course_id ASC');
+
+        if (!empty($course_topic)) {
+            $query->whereLike('course_topic', '%' . $course_topic . '%');
+        }
+
+        $list = $query->paginate([
+            'page' => $page,
+            'list_rows' => $pagesize,
+        ]);
+
+        $data = [
+            'list' => $list->items(),
+            'total' => $list->total(),
+            'page' => $list->currentPage(),
+            'pagesize' => $list->listRows(),
+        ];
+
+        return app('json')->success($data);
+    }
+
+
 
 
     /**