From 3911dcb179f4e966f97b8593309661891c57a726 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Sun, 4 Apr 2021 14:32:37 +0800
Subject: [PATCH] up

---
 app/Http/Controllers/Customer/OrdersController.php  | 2 +-
 app/Http/Controllers/Manager/OrdersController.php   | 2 +-
 app/Http/Controllers/Manager/TrainingController.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php
index 551c11b..b726663 100644
--- a/app/Http/Controllers/Customer/OrdersController.php
+++ b/app/Http/Controllers/Customer/OrdersController.php
@@ -122,7 +122,7 @@ class OrdersController extends CommonController
     public function getAvailableParamedics(Request $request)
     {
         $paramedics = (new Orders())->getAvailableParamedics();
-        return response()->json($paramedics->toArray());
+        return response()->json($paramedics);
     }
 
     /**
diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index 879d3bf..bf98058 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -293,7 +293,7 @@ class OrdersController extends CommonController
     public function getAvailableParamedics(Request $request)
     {
         $paramedics = (new Orders())->getAvailableParamedics();
-        return response()->json($paramedics->toArray());
+        return response()->json($paramedics);
     }
 
     /**
diff --git a/app/Http/Controllers/Manager/TrainingController.php b/app/Http/Controllers/Manager/TrainingController.php
index 3d62f52..64a95f7 100644
--- a/app/Http/Controllers/Manager/TrainingController.php
+++ b/app/Http/Controllers/Manager/TrainingController.php
@@ -15,7 +15,7 @@ class TrainingController extends CommonController
      *     description="获取视频列表",
      *     @OA\Parameter(name="keyword", in="query", @OA\Schema(type="string"), required=false, description="查询关键词"),
      *     @OA\Parameter(name="page", in="query", @OA\Schema(type="integer"), required=false, description="当前页码，默认为1"),
-     *     @OA\Parameter(name="pageLength", in="query", @OA\Schema(type="integer"), required=false, description="每页数量，默认为3"),
+     *     @OA\Parameter(name="page_size", in="query", @OA\Schema(type="integer"), required=false, description="每页数量，默认为3"),
      *     @OA\Response(
      *      response="200",
      *      description="获取视频列表"
@@ -36,10 +36,10 @@ class TrainingController extends CommonController
                     });
             });
         }
-        $pageLength = request()->pageLength ? (int)request()->pageLength : 3;
+        $page_size = request()->page_size ? (int)request()->page_size : 3;
         $data = $data->with(["type" => function ($query) {
             $query->select("id", "name");
-        }])->select("id", "type_id", "title", "poster", "video", "published_at")->orderBy("published_at")->paginate($pageLength);
+        }])->select("id", "type_id", "title", "poster", "video", "published_at")->orderBy("published_at","desc")->paginate($page_size);
         return response()->json($data->toArray());
     }