修改

catch/user/controller/User.php

@@ -50,7 +50,7 @@ class User extends CatchController
      *
      * @param CreateRequest $request
      * @time 2019年12月06日
-     * @return Json
+     * @return \think\response\Json
      */
     public function save(CreateRequest $request)
     {
@@ -60,14 +60,14 @@ class User extends CatchController
             $this->user->attach($request->param('roleids'));
         }
 
-        return CatchResponse::success();
+        return CatchResponse::success('', '添加成功');
     }
 
     /**
      *
      * @time 2019年12月04日
      * @param $id
-     * @return Json
+     * @return \think\response\Json
      */
     public function read($id)
     {
@@ -85,7 +85,7 @@ class User extends CatchController
      * @time 2019年12月04日
      * @param $id
      * @param UpdateRequest $request
-     * @return Json
+     * @return \think\response\Json
      */
     public function update($id, UpdateRequest $request)
     {
@@ -106,7 +106,7 @@ class User extends CatchController
      *
      * @time 2019年12月04日
      * @param $id
-     * @return Json
+     * @return \think\response\Json
      */
     public function delete($id)
     {
@@ -122,9 +122,9 @@ class User extends CatchController
      *
      * @time 2019年12月07日
      * @param $id
-     * @return Json
+     * @return \think\response\Json
      */
-    public function switchStatus($id): Json
+    public function switchStatus($id): \think\response\Json
     {
         $user = $this->user->findBy($id);
         return CatchResponse::success($this->user->updateBy($id, [
@@ -136,12 +136,12 @@ class User extends CatchController
      *
      * @time 2019年12月07日
      * @param $id
-     * @return Json
+     * @return \think\response\Json
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\db\exception\DataNotFoundException
      */
-    public function recover($id): Json
+    public function recover($id): \think\response\Json
     {
        $trashedUser = $this->user->findBy($id, ['*'], true);
 

catch/user/model/Users.php

@@ -56,7 +56,9 @@ class Users extends CatchModel
                     })
                     ->when($search['status'] ?? false, function ($query) use ($search){
                         $query->where('status', $search['status']);
-                    })->paginate($search['limit'] ?? $this->limit);
+                    })
+                    ->order('id', 'desc')
+                    ->paginate($search['limit'] ?? $this->limit);
     }
 
     /**

extend/catcher/CatchResponse.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace catcher;
 
-use think\facade\View;
 use think\Paginator;
 use think\Response;
+use think\response\Json;
 
 class CatchResponse
 {
@@ -14,13 +15,13 @@ class CatchResponse
    * @param array $data
    * @param $msg
    * @param int $code
-     * @return \think\response\Json
+   * @return Json
    */
-    public static function success($data = [], $msg = 'success', $code = Code::SUCCESS): \think\response\Json
+  public static function success($data = [], $msg = 'success', $code = Code::SUCCESS): Json
   {
     return json([
       'code'    => $code,
-            'msg'  => $msg,
+      'message' => $msg,
       'data'    => $data,
     ]);
   }
@@ -30,9 +31,9 @@ class CatchResponse
    *
    * @time 2019年12月06日
    * @param Paginator $list
-     * @return \think\response\Json
+   * @return
    */
-    public static function paginate(Paginator $list): \think\response\Json
+  public static function paginate(Paginator $list)
   {
     return json([
       'code'    => 10000,
@@ -50,18 +51,13 @@ class CatchResponse
    * @time 2019年12月02日
    * @param string $msg
    * @param int $code
-     * @return mixed
-     * @throws \Exception
+   * @return Json
    */
-    public static function fail($msg = '', $code = 10001)
+  public static function fail($msg = '', $code = 10001): Json
   {
-        if (request()->isAjax()) {
     return json([
       'code' => $code,
       'msg'  => $msg,
     ]);
   }
-
-        return Response::create(config('catch.error'), 'view', $code)->assign(['msg' => $msg, 'code' => $code]);
-    }
 }