From 41cf5f15d514a08067ce524b6aa0165e7151465e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <xushubieli@qq.com>
Date: Mon, 13 Jan 2025 10:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8B=B1=E6=96=87=E6=AE=B5?=
 =?UTF-8?q?=E8=90=BD=E5=93=8D=E5=BA=94=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/changelog.md                        |  1 +
 src/admin/templets/catalog_add.htm       |  4 ++--
 src/admin/templets/catalog_add_quick.htm |  4 ++--
 src/admin/templets/catalog_edit.htm      |  6 +++---
 src/static/web/css/admin.css             | 21 ++++++++++++++-------
 src/static/web/css/style.css             | 15 +++++++++++----
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 092f1aa3..f85a6e01 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -7,6 +7,7 @@
 - 调整文档发布和修改时间；
 - 调整支付配置布局；
 - 优化后台提示文字；
+- 优化php8.4部分兼容问题；
 
 # V6.3.2
 - 重做后台管理，手机端更好访问后台；
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 0d270b36..aae8de02 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -228,7 +228,7 @@
 												<p>{page} 栏目页码数</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;</p>
-												<span>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</span>
+												<p>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</p>
 											</div>
 										</td>
 									</tr>
@@ -248,7 +248,7 @@
 												<p>{cc} 日期加混编id后用转换为适合字母</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;</p>
-												<span>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</span>
+												<p>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</p>
 											</div>
 										</td>
 										<td>SEO标题</td>
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index 14c67b80..ba0244e1 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -86,7 +86,7 @@
 												<p>{page} 栏目页码数</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;</p>
-												<span>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</span>
+												<p>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</p>
 											</div>
 										</td>
 									</tr>
@@ -106,7 +106,7 @@
 												<p>{cc} 日期加混编id后用转换为适合字母</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;</p>
-												<span>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</span>
+												<p>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</p>
 											</div>
 										</td>
 										<td>默认页的名称</td>
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index 8c0db727..9555c3d0 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -191,7 +191,7 @@
 											<a href="javascript:ShowHide('helpvar1');" class="btn btn-success btn-sm">说明</a>
 											<div id="helpvar1" class="alert alert-secondary my-2" style="display:none">
 												<p>{tid} 栏目id</p>
-												<span>{cid} 栏目模型名字id</span>
+												<p>{cid} 栏目模型名字id</p>
 											</div>
 										</td>
 									</tr>
@@ -211,7 +211,7 @@
 												<p>{page} 栏目页码数</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;</p>
-												<span>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</span>
+												<p>rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;</p>
 											</div>
 										</td>
 									</tr>
@@ -231,7 +231,7 @@
 												<p>{cc} 日期加混编id后用转换为适合字母</p>
 												<p>伪静态规则（Nginx）</p>
 												<p>rewrite ^/article-([0-9]+).html$ /apps/view.php?arcID=$1;</p>
-												<span>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</span>
+												<p>rewrite ^/article-([0-9]+)-([0-9]+).html$ /apps/view.php?aid=$1&pageno=$2;</p>
 											</div>
 										</td>
 										<td>SEO标题</td>
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index d53e3267..8b72a2e3 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -18,6 +18,20 @@ body {
 	color:var(--gray);
 	background:var(--bg)
 }
+p {
+	margin-bottom:0.5rem;
+	word-wrap:break-word
+}
+p:last-child {
+	margin-bottom:0
+}
+ul,ol,li {
+	margin:0;
+	padding:0
+}
+li {
+	list-style:none
+}
 a {
 	color:var(--gray);
 	text-decoration:none
@@ -30,13 +44,6 @@ img {
 	max-width:100%;
 	border-radius:var(--b-radius)
 }
-ul,ol,li {
-	margin:0;
-	padding:0
-}
-li {
-	list-style:none
-}
 form,label {
 	margin-bottom:0
 }
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index 290bcdb4..270875ab 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -15,6 +15,13 @@ body {
 	color:var(--gray);
 	background:var(--bg)
 }
+p {
+	margin-bottom:1rem;
+	word-wrap:break-word
+}
+p:last-child {
+	margin-bottom:0
+}
 a {
 	color:var(--gray);
 	text-decoration:none
@@ -23,10 +30,6 @@ a:hover {
 	color:var(--blue);
 	text-decoration:none
 }
-img {
-	max-width:100%;
-	border-radius:var(--b-radius)
-}
 ul,ol,li {
 	margin:0;
 	padding:0;
@@ -50,6 +53,10 @@ h3,h4 {
 h5,h6 {
 	font-size:16px
 }
+img {
+	max-width:100%;
+	border-radius:var(--b-radius)
+}
 form.search {
 	display:flex;
 	width:100%