From d827c8a1dfa13370fae5fb9aae1cab20e63649e6 Mon Sep 17 00:00:00 2001 From: lkddi Date: Thu, 12 Mar 2026 12:33:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=B1=82=E5=A9=9A=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E6=9C=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E6=88=90=E5=8A=9F=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E7=A6=BB=E5=A9=9A=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/MarriageManagerController.php | 1 - .../views/admin/marriages/proposals.blade.php | 4 +- test-render-auth.html | 345 ++++++++++++++++++ test-render.html | 12 + test_proposals.php | 7 + 5 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 test-render-auth.html create mode 100644 test-render.html create mode 100644 test_proposals.php diff --git a/app/Http/Controllers/Admin/MarriageManagerController.php b/app/Http/Controllers/Admin/MarriageManagerController.php index 88ee2b9..5cc194b 100644 --- a/app/Http/Controllers/Admin/MarriageManagerController.php +++ b/app/Http/Controllers/Admin/MarriageManagerController.php @@ -90,7 +90,6 @@ class MarriageManagerController extends Controller public function proposals(Request $request): View { $proposals = Marriage::with(['user:id,username', 'partner:id,username', 'ringItem:id,name,icon']) - ->whereIn('status', ['pending', 'expired', 'rejected']) ->orderByDesc('proposed_at') ->paginate(20) ->withQueryString(); diff --git a/resources/views/admin/marriages/proposals.blade.php b/resources/views/admin/marriages/proposals.blade.php index b73e649..b03c207 100644 --- a/resources/views/admin/marriages/proposals.blade.php +++ b/resources/views/admin/marriages/proposals.blade.php @@ -45,9 +45,11 @@ 'pending' => 'bg-amber-100 text-amber-700', 'rejected' => 'bg-red-100 text-red-600', 'expired' => 'bg-gray-100 text-gray-500', + 'married' => 'bg-emerald-100 text-emerald-700', + 'divorced' => 'bg-purple-100 text-purple-700', default => 'bg-gray-100 text-gray-600', } }}"> - {{ ['pending' => '⏳ 等待中', 'rejected' => '❌ 已拒绝', 'expired' => '⏰ 已过期'][$p->status] ?? $p->status }} + {{ ['pending' => '⏳ 等待中', 'rejected' => '❌ 已拒绝', 'expired' => '⏰ 已过期', 'married' => '✅ 已结婚', 'divorced' => '💔 已离婚'][$p->status] ?? $p->status }} {{ $p->proposed_at?->format('Y-m-d H:i') }} diff --git a/test-render-auth.html b/test-render-auth.html new file mode 100644 index 0000000..ba2ae8d --- /dev/null +++ b/test-render-auth.html @@ -0,0 +1,345 @@ + + + + + + + + 后台管理 - 流星 + + + + + + + + +
+ +
+

求婚记录

+
+ 当前操作人: lkddi +
+
+ + +
+ + +
+

💌 求婚记录

+ ← 返回总览 +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID发起方目标戒指状态求婚时间过期时间操作
3lkddi测试2 — + + ❌ 已拒绝 + + 2026-03-01 18:29 + 2026-03-03 18:29 + + — +
2lkddi测试2 — + + ❌ 已拒绝 + + 2026-03-01 18:28 + 2026-03-03 18:28 + + — +
+
+
+ +
+
+ + + + + + + + diff --git a/test-render.html b/test-render.html new file mode 100644 index 0000000..7ff6f83 --- /dev/null +++ b/test-render.html @@ -0,0 +1,12 @@ + + + + + + + Redirecting to http://localhost + + + Redirecting to http://localhost. + + \ No newline at end of file diff --git a/test_proposals.php b/test_proposals.php new file mode 100644 index 0000000..7a48509 --- /dev/null +++ b/test_proposals.php @@ -0,0 +1,7 @@ +whereIn('status', ['pending', 'expired', 'rejected']) + ->orderByDesc('proposed_at') + ->paginate(20); +echo view('admin.marriages.proposals', compact('proposals'))->render();