From 89634f07465f8171fc97473b1be76da506a45e3f Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Sun, 18 Dec 2022 11:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20data=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Helpers/ApiResponse.php | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/Helpers/ApiResponse.php b/app/Helpers/ApiResponse.php index 3db119f..c2f27f3 100644 --- a/app/Helpers/ApiResponse.php +++ b/app/Helpers/ApiResponse.php @@ -42,30 +42,30 @@ public function error($message = '', $code = 400): JsonResponse public function apiResponse($data = [], $status = 200): JsonResponse { - // if data is paginated, return paginated data - if ($data instanceof Paginator) { - $data = $data->toArray(); - $data['data'] = $data['data'] ?? []; - $data['meta'] = [ - 'per_page' => $data['per_page'] ?? 0, - 'current_page' => $data['current_page'] ?? 0, - 'from' => $data['from'] ?? 0, - 'to' => $data['to'] ?? 0, - ]; - $data['paginate'] = 1; - } else { - $data = [ - 'data' => $data, - ]; - } - - $data['status'] = $status; - - if ($status >= 200 && $status <= 299) { - $data['success'] = 1; - } else { - $data['success'] = 0; - } + // // if data is paginated, return paginated data + // if ($data instanceof Paginator) { + // $data = $data->toArray(); + // $data['data'] = $data['data'] ?? []; + // $data['meta'] = [ + // 'per_page' => $data['per_page'] ?? 0, + // 'current_page' => $data['current_page'] ?? 0, + // 'from' => $data['from'] ?? 0, + // 'to' => $data['to'] ?? 0, + // ]; + // $data['paginate'] = 1; + // } else { + // $data = [ + // 'data' => $data, + // ]; + // } + // + // $data['status'] = $status; + // + // if ($status >= 200 && $status <= 299) { + // $data['success'] = 1; + // } else { + // $data['success'] = 0; + // } return response()->json($data, $status)->setEncodingOptions(JSON_UNESCAPED_UNICODE); }