调整

app/Http/Controllers/AdminRoleController.php

@@ -14,7 +14,7 @@ class AdminRoleController extends Controller
     public function index(Request $request)
     {
         $query = AdminRole::filter($request->input())->where('id', '>', '1');
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(AdminRoleResource::collection($list));
     }

app/Http/Controllers/AdminUserController.php

@@ -16,7 +16,7 @@ class AdminUserController extends Controller
     public function index(Request $request)
     {
         $query = AdminUser::filter($request->all())->where('id', '>', 1);
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(AdminUserResource::collection($list));
     }

app/Http/Controllers/AgriculturalBaseController.php

@@ -23,7 +23,7 @@ class AgriculturalBaseController extends Controller
     public function index(Request $request)
     {
         $query = AgriculturalBase::with('crops')->filter($request->all())->sort();
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(AgriculturalBaseResource::collection($list));
     }

app/Http/Controllers/CropFlowController.php

@@ -15,11 +15,11 @@ class CropFlowController extends Controller
     {
         $query = CropFlow::filter($request->input());
         $totalNum = $query->sum('sale'); //总产量
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
         $list->load(['createdBy']);
 
         return $this->json([
-            'total' => $totalNum,
+            // 'total' => $totalNum,
             'list' => CropFlowResource::collection($list),
         ]);
     }

app/Http/Controllers/CropYieldController.php

@@ -17,14 +17,11 @@ class CropYieldController extends Controller
     public function index(Request $request)
     {
         $query = CropYield::filter($request->all());
-        $totalNum = $query->sum('yield'); //总产量
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        // $totalNum = (clone $query)->sum('yield'); //总产量
+        $list = $query->sort()->paginate(Paginator::resolvePerPage('per_page', 20, 50));
         $list->load(['base', 'createdBy']);
 
-        return $this->json([
-            'total' => $totalNum,
-            'list' => CropYieldResource::collection($list),
-        ]);
+        return $this->json(CropYieldResource::collection($list));
     }
 
     public function store(CropYieldRequest $request)

app/Http/Controllers/DeviceController.php

@@ -19,7 +19,7 @@ class DeviceController extends Controller
     public function index(Request $request)
     {
         $query = Device::with('base')->filter($request->input());
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(DeviceResource::collection($list));
     }

app/Http/Controllers/FriendLinkController.php

@@ -13,7 +13,7 @@ class FriendLinkController extends Controller
     {
         $query = FriendLink::filter($request->all());
 
-        $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
+        $list = $query->paginate(Paginator::resolvePerPage('per_page', 20, 50));
 
         return $this->json(FriendLinkResource::collection($list));
     }

app/Models/CropYield.php

@@ -21,6 +21,10 @@ class CropYield extends Model
         'category_id',
     ];
 
+    public function scopeSort($q){
+        return $q->orderBy('created_at', 'desc');
+    }
+
     /**
      * 基地
      *