From ee62a3add85a57f06b2042610b7efdc6d072e011 Mon Sep 17 00:00:00 2001 From: pllx Date: Mon, 27 Apr 2026 06:23:42 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20msg=5Ftext=5Fcolor?= =?UTF-8?q?=20=E7=B1=BB=E5=9E=8B=E5=9C=A8=E8=B4=AD=E4=B9=B0=E5=88=86?= =?UTF-8?q?=E5=8F=91=E3=80=81=E6=A0=A1=E9=AA=8C=E5=92=8C=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ShopService: 购买分发 match 新增 msg_text_color → DecorationService - ShopController: 购买公告 match 新增 msg_text_color - Admin/ShopItemController: 后台 validation type 校验新增 msg_text_color - admin/shop/index.blade: 类型标签映射和下拉选项新增文字颜色 --- app/Http/Controllers/Admin/ShopItemController.php | 2 +- app/Http/Controllers/ShopController.php | 2 +- app/Services/ShopService.php | 1 + resources/views/admin/shop/index.blade.php | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ShopItemController.php b/app/Http/Controllers/Admin/ShopItemController.php index 6893251..ffffd27 100644 --- a/app/Http/Controllers/Admin/ShopItemController.php +++ b/app/Http/Controllers/Admin/ShopItemController.php @@ -101,7 +101,7 @@ class ShopItemController extends Controller 'icon' => 'required|string|max:20', 'description' => 'nullable|string|max:500', 'price' => 'required|integer|min:0', - 'type' => 'required|in:instant,duration,one_time,ring,auto_fishing,sign_repair,msg_bubble,msg_name_color,avatar_frame', + 'type' => 'required|in:instant,duration,one_time,ring,auto_fishing,sign_repair,msg_bubble,msg_name_color,msg_text_color,avatar_frame', 'duration_days' => 'nullable|integer|min:0', 'duration_minutes' => 'nullable|integer|min:0', 'intimacy_bonus' => 'nullable|integer|min:0', diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php index 063cdce..562666d 100644 --- a/app/Http/Controllers/ShopController.php +++ b/app/Http/Controllers/ShopController.php @@ -225,7 +225,7 @@ class ShopController extends Controller 'ring' => "💍 【{$safeBuyer}】在商店购买了一枚「{$safeItemName}」，不知道打算送给谁呢？", 'auto_fishing' => "🎣 【{$safeBuyer}】购买了「{$safeItemName}」，开启了 {$fishDuration} 的自动钓鱼模式！", ShopItem::TYPE_SIGN_REPAIR => "🗓️ 【{$safeBuyer}】购买了 {$quantity} 张「{$safeItemName}」，准备把漏掉的签到补回来！", - 'msg_bubble', 'msg_name_color', 'avatar_frame' => "✨ 【{$safeBuyer}】购买了个人装扮「{$safeItemName}」，颜值 +1！", + 'msg_bubble', 'msg_name_color', 'msg_text_color', 'avatar_frame' => "✨ 【{$safeBuyer}】购买了个人装扮「{$safeItemName}」，颜值 +1！", default => "🛒 【{$safeBuyer}】购买了「{$safeItemName}」。", }; diff --git a/app/Services/ShopService.php b/app/Services/ShopService.php index 0b57525..2e1322e 100644 --- a/app/Services/ShopService.php +++ b/app/Services/ShopService.php @@ -51,6 +51,7 @@ class ShopService // ── 个人装扮购买（委托给 DecorationService）─────────────── 'msg_bubble' => $this->decorationService->purchase($user, $item), 'msg_name_color' => $this->decorationService->purchase($user, $item), + 'msg_text_color' => $this->decorationService->purchase($user, $item), 'avatar_frame' => $this->decorationService->purchase($user, $item), default => ['ok' => false, 'message' => '未知商品类型'], }; diff --git a/resources/views/admin/shop/index.blade.php b/resources/views/admin/shop/index.blade.php index 13057dc..8b74dd3 100644 --- a/resources/views/admin/shop/index.blade.php +++ b/resources/views/admin/shop/index.blade.php @@ -24,6 +24,7 @@ 'sign_repair' => ['label' => '签到补签卡', 'color' => 'bg-teal-100 text-teal-700'], 'msg_bubble' => ['label' => '消息气泡', 'color' => 'bg-violet-100 text-violet-700'], 'msg_name_color' => ['label' => '昵称颜色', 'color' => 'bg-pink-100 text-pink-700'], + 'msg_text_color' => ['label' => '文字颜色', 'color' => 'bg-cyan-100 text-cyan-700'], 'avatar_frame' => ['label' => '头像框', 'color' => 'bg-amber-100 text-amber-700'], ]; $isSuperAdmin = Auth::id() === 1; @@ -292,6 +293,7 @@ +