From 7f6d8f955fe264437babf63fd645e39a28625dcf Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Thu, 1 May 2025 18:49:04 +0800
Subject: [PATCH] no message

---
 src/Controllers/UserController.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
index 65f37bb2..8b1677d3 100755
--- a/src/Controllers/UserController.php
+++ b/src/Controllers/UserController.php
@@ -44,11 +44,18 @@ final class UserController extends BaseController
         
         $oHuodong = Huodong::DateHit();
         
-        $sHuodongStr = $oHuodong->title."：".$oHuodong->content;
-        
-        $oAnn->content = str_replace("{{huodong}}", $sHuodongStr, $oAnn->content);
-        
-        $oAnn->date = date("Y-m-d", strtotime($oAnn->date));
+        if ($oHuodong) {
+            $sDateStartZh = date("n月j日", strtotime($oHuodong->start_date));
+            $sDateEndZh = date("n月j日", strtotime($oHuodong->end_date));
+            
+            $sHuodongStr = '<span style="background-color: #eccafa;">'.$oHuodong->title."：".$sDateStartZh."至".$sDateEndZh."期间，".$oHuodong->content.'</span>';
+            
+            $oAnn->content = str_replace("{{huodong}}", $sHuodongStr, $oAnn->content);
+            
+            $oAnn->date = date("Y-m-d", strtotime($oAnn->date));
+        } else {
+            $oAnn->content = str_replace("<p>{{huodong}}</p>", '', $oAnn->content);
+        }
         
         return $response->write(
             $this->view()