From 60cb2cd75bde19936c4fdec1edb4671ff43948df Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Sun, 29 Jan 2023 03:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20N=20+=201=20=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/HostController.php |  4 +-
 app/Http/Controllers/Admin/UserController.php | 52 +++++++++----------
 app/Models/User.php                           |  2 +-
 resources/views/layouts/admin.blade.php       |  2 +-
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/Admin/HostController.php b/app/Http/Controllers/Admin/HostController.php
index 673e4b7..a0457e7 100644
--- a/app/Http/Controllers/Admin/HostController.php
+++ b/app/Http/Controllers/Admin/HostController.php
@@ -20,12 +20,12 @@ class HostController extends Controller
      */
     public function index(Request $request): View
     {
-        $hosts = new Host();
+        $hosts = new Host;
 
         // 遍历所有的搜索条件
         foreach (['name', 'module_id', 'status', 'user_id', 'price', 'managed_price', 'created_at', 'updated_at'] as $field) {
             if ($request->has($field)) {
-                $hosts->where($field, 'like', '%' . $request->input($field) . '%');
+                $hosts = $hosts->where($field, 'like', '%' . $request->input($field) . '%');
             }
         }
 
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 660bce9..0b12558 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -22,35 +22,35 @@ class UserController extends Controller
      */
     public function index(Request $request): View
     {
-        $users = new User();
+        $users = (new User())->with('user_group')->paginate(50)->withQueryString();
 
-        $users = $users->with('user_group');
+        // $users = $users->with('user_group');
 
-        if ($request->filled('id')) {
-            $users = $users->where('id', $request->input('id'));
-        }
+        // if ($request->filled('id')) {
+        //     $users = $users->where('id', $request->input('id'));
+        // }
+        //
+        // if ($request->filled('name')) {
+        //     $users = $users->where('name', 'like', '%' . $request->input('name') . '%');
+        // }
+        //
+        // if ($request->filled('email')) {
+        //     $users = $users->where('email', 'like', '%' . $request->input('email') . '%');
+        // }
+        //
+        // if ($request->filled('real_name')) {
+        //     $users = $users->where('real_name', 'like', '%' . $request->input('real_name') . '%');
+        // }
+        //
+        // if ($request->has('banned_at')) {
+        //     $users = $users->whereNotNull('banned_at');
+        // }
+        //
+        // if ($request->has('real_name_verified_at')) {
+        //     $users = $users->whereNotNull('real_name_verified_at');
+        // }
 
-        if ($request->filled('name')) {
-            $users = $users->where('name', 'like', '%' . $request->input('name') . '%');
-        }
-
-        if ($request->filled('email')) {
-            $users = $users->where('email', 'like', '%' . $request->input('email') . '%');
-        }
-
-        if ($request->filled('real_name')) {
-            $users = $users->where('real_name', 'like', '%' . $request->input('real_name') . '%');
-        }
-
-        if ($request->has('banned_at')) {
-            $users = $users->whereNotNull('banned_at');
-        }
-
-        if ($request->has('real_name_verified_at')) {
-            $users = $users->whereNotNull('real_name_verified_at');
-        }
-
-        $users = $users->paginate(50)->withQueryString();
+        // $users = $users->paginate(50)->withQueryString();
 
         return view('admin.users.index', compact('users'));
     }
diff --git a/app/Models/User.php b/app/Models/User.php
index f835e02..36b98ca 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -143,7 +143,7 @@ public function user_group(): BelongsTo
         return $this->belongsTo(UserGroup::class);
     }
 
-    public function scopeBirthday()
+    public function scopeBirthday(): User
     {
         /** @noinspection PhpUndefinedMethodInspection */
         return $this->select(['id', 'name', 'birthday_at', 'email_md5', 'created_at'])->whereMonth('birthday_at', now()->month)
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index 3343238..86bdb07 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -99,7 +99,7 @@
                         </a>
                         <ul class="dropdown-menu" aria-labelledby="navbarDropdownSupport">
                             <li>
-                                <a class="dropdown-item" href="{{ route('admin.transactions') }}">管理员</a>
+                                <a class="dropdown-item" href="{{ route('admin.admins.index') }}">管理员</a>
                             </li>
 
                             <li>