From 3a29ed37e136524ca623ded71f548d0bd1b9184c Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 7 Jun 2025 14:43:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/ContactUs.php | 2 +- app/index/view/mobile/contact_us/bulkbuy.html | 2 +- app/index/view/pc/contact_us/bulkbuy.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/index/controller/ContactUs.php b/app/index/controller/ContactUs.php index d61da2b1..c214a79d 100644 --- a/app/index/controller/ContactUs.php +++ b/app/index/controller/ContactUs.php @@ -212,7 +212,7 @@ class ContactUs extends Common 'last_name' => $form_data['last_name'], 'email' => $form_data['email'], 'phone' => $form_data['phone'], - 'interested' => $form_data['interested'], + 'interested' => is_array($form_data['interested']) ? implode(',', $form_data['interested']) : $form_data['interested'], 'referer_url' => request()->header('referer'), 'website_url' => request()->header('host'), 'message' => $form_data['message'], diff --git a/app/index/view/mobile/contact_us/bulkbuy.html b/app/index/view/mobile/contact_us/bulkbuy.html index c1b4bea5..d9634e7d 100644 --- a/app/index/view/mobile/contact_us/bulkbuy.html +++ b/app/index/view/mobile/contact_us/bulkbuy.html @@ -49,7 +49,7 @@ {notempty name="interested"} {volist name="interested" id="it"} {/volist} {/notempty} diff --git a/app/index/view/pc/contact_us/bulkbuy.html b/app/index/view/pc/contact_us/bulkbuy.html index 5d7578da..c6e4d3a6 100644 --- a/app/index/view/pc/contact_us/bulkbuy.html +++ b/app/index/view/pc/contact_us/bulkbuy.html @@ -56,7 +56,7 @@ {notempty name="interested"} {volist name="interested" id="it"} {/volist} {/notempty} From 42ee0305f5977d02eb62d573a9858b7010bf0fb6 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 7 Jun 2025 15:00:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E8=AF=84=E8=AE=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/Article.php | 15 + app/index/model/ArticleLeaveMessageModel.php | 12 + app/index/view/pc/article/detail.html | 297 +++++++++---------- 3 files changed, 171 insertions(+), 153 deletions(-) diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index 13e0e2e5..46393073 100644 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -99,6 +99,21 @@ class Article extends Common $share_config = $this->getSysConfig($this->lang_id, ['article_share']); View::assign('share_config', $share_config['article_share']); + // 获取文章评论数据 + $comments = ArticleLeaveMessageModel::field([ + 'id', + 'name', + 'email', + 'content', + 'created_at' + ]) + ->article($id) + ->audited(true) + ->order(['id' => 'desc']) + ->limit(5) + ->select(); + View::assign('comments', $comments); + // 获取倒序或发布时间倒序3篇文章做为推荐文章 $recommends = ArticleModel::field([ 'id', diff --git a/app/index/model/ArticleLeaveMessageModel.php b/app/index/model/ArticleLeaveMessageModel.php index 77e40652..793f1c95 100644 --- a/app/index/model/ArticleLeaveMessageModel.php +++ b/app/index/model/ArticleLeaveMessageModel.php @@ -16,4 +16,16 @@ class ArticleLeaveMessageModel extends ArticleLeaveMessageBaseModel use SoftDelete; // 软删除字段 protected $deleteTime = 'deleted_at'; + + // 文章文章范围查询 + public function scopeArticle($query, $article_id) + { + $query->where('article_id', '=', $article_id); + } + + // 审核状态范围查询 + public function scopeAudited($query, bool $is_audited = true) + { + $query->where('is_audited', '=', (int)$is_audited); + } } diff --git a/app/index/view/pc/article/detail.html b/app/index/view/pc/article/detail.html index 7001c60c..abc0b324 100644 --- a/app/index/view/pc/article/detail.html +++ b/app/index/view/pc/article/detail.html @@ -3,170 +3,161 @@ {notempty name="detail.seo_title"}{$detail.seo_title}{else /}{__BLOCK__}{/notempty} {/block} {block name="seo"} -{notempty name="detail.seo_keywords"} - - -{else /} -{__BLOCK__} -{/notempty} + {notempty name="detail.seo_keywords"} + + + {else /} + {__BLOCK__} + {/notempty} {/block} {block name="style"} {/block} {block name="main"}
- -
-
-
-

{$detail.title}

-

{$detail.release_time}

-
- -
{$detail.content|raw}
-
- -
{$detail.content|raw}
-
- -
-
- 评论 -
- 张三: -

12sdfksdljfksdljdksf是看大家分厘卡聖誕節分厘卡聖誕節付款了

-
-
- 张三: -

12sdfksdljfksdljdksf是看大家分厘卡聖誕節分厘卡聖誕節付款了

-
-
- 张三: -

12sdfksdljfksdljdksf是看大家分厘卡聖誕節分厘卡聖誕節付款了

-
-
-
- -
-
- {notempty name="share_config"} -
-

{:lang_i18n('分享')}

- -
- {/notempty} -
-

{:lang_i18n('留言')}

-
- {:lang_i18n('名称')} - - {:lang_i18n('电子邮箱')} - -

{:lang_i18n('您的电子邮件地址不会被公开')}

- {:lang_i18n('留言内容')} - -
{:lang_i18n('提交留言')}
-
-
-
- - {notempty name="$recommends"} -
- -
-
-

{:lang_i18n('你可能还喜欢')}

-

-
- -
-
- {/notempty} + +
+
+
+

{$detail.title}

+

{$detail.release_time}

+
+ +
{$detail.content|raw}
+
+ +
{$detail.content|raw}
+
+ {notempty name="comments"} +
+
+ {:lang_i18n('评论')} + {volist name="comments" id="cm"} +
+ {$cm.name}: +

{$cm.content}

+
+ {/volist} +
+
+ {/notempty} + +
+ {notempty name="share_config"} +
+

{:lang_i18n('分享')}

+ +
+ {/notempty} +
+

{:lang_i18n('留言')}

+
+ {:lang_i18n('名称')} + + {:lang_i18n('电子邮箱')} + +

{:lang_i18n('您的电子邮件地址不会被公开')}

+ {:lang_i18n('留言内容')} + +
{:lang_i18n('提交留言')}
+
+
+
+ +{notempty name="$recommends"} +
+ +
+
+

{:lang_i18n('你可能还喜欢')}

+

+
+ +
+
+{/notempty} {/block} {block name="script"} {/block} \ No newline at end of file