From 4304072d07ff4b6ae665e53a351decbec8bf2dff Mon Sep 17 00:00:00 2001
From: liutk <961510893@qq.com>
Date: Tue, 28 May 2024 12:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86nl2br?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Resources/Api/ActivityResource.php | 2 +-
 app/Http/Resources/Api/UserGiftResource.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/Api/ActivityResource.php b/app/Http/Resources/Api/ActivityResource.php
index f982f8e..0c2b2ef 100644
--- a/app/Http/Resources/Api/ActivityResource.php
+++ b/app/Http/Resources/Api/ActivityResource.php
@@ -19,7 +19,7 @@ class ActivityResource extends JsonResource
             'id'        => $this->id,
             'name'      => $this->name,
             'cover'     => $this->cover ??'',
-            'rules'     => $this->rules ??'',
+            'rules'     => nl2br($this->rules ??''),
             'start_at'  => $this->start_at->format('Y-m-d H:i'),
             'end_at'    => $this->end_at->format('Y-m-d H:i'),
             'state'     => $this->state,
diff --git a/app/Http/Resources/Api/UserGiftResource.php b/app/Http/Resources/Api/UserGiftResource.php
index b0b7f04..7fcd9d7 100644
--- a/app/Http/Resources/Api/UserGiftResource.php
+++ b/app/Http/Resources/Api/UserGiftResource.php
@@ -27,7 +27,7 @@ class UserGiftResource extends JsonResource
                 return $this->gift->rank;
             }, ''),
             'gift_explain'=> $this->whenLoaded('gift', function () {
-                return $this->gift->explain;
+                return nl2br($this->gift->explain);
             }, ''),
             'activity_name' => $this->whenLoaded('activity', function () {
                 return $this->activity->name;