From 7fc3a53ff91572d5767c2225c6c52681bd469a46 Mon Sep 17 00:00:00 2001 From: xiaodong Date: Fri, 4 Sep 2026 14:04:36 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/backend/WebsiteController.php | 2 +- app/service/ContentService.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controller/backend/WebsiteController.php b/app/controller/backend/WebsiteController.php index 2b0ef32..58cf397 100644 --- a/app/controller/backend/WebsiteController.php +++ b/app/controller/backend/WebsiteController.php @@ -408,7 +408,7 @@ class WebsiteController extends BaseController $param['sub_content']['author'] = ''; $param['sub_content']['status'] = '1'; $param['sub_content']['url'] = ''; - $param['sub_content']['is_top'] = ''; + $param['sub_content']['is_top'] = '2'; // 置顶 1 置顶 2 否 $param['sub_content']['is_recommend'] = ''; $param['sub_content']['sort'] = ''; $param['sub_content']['seo_title'] = ''; diff --git a/app/service/ContentService.php b/app/service/ContentService.php index 2277bc6..e12b482 100644 --- a/app/service/ContentService.php +++ b/app/service/ContentService.php @@ -626,7 +626,7 @@ class ContentService { * @throws \app\exception\ModelException * @throws \ReflectionException */ - public function saveContent($param): array + public function saveContent($param, $fromExport=0): array { $moduleModel = new Module(); $module = $moduleModel->getModule(['id'=>$param['module_id'],'seller_id'=> $param['admin']['seller_id']],['moduleField','category'])['data']->toArray(); @@ -781,8 +781,11 @@ class ContentService { Db::rollback(); return dataReturn(50012,$e->getMessage(), $e->getTrace()); } + if($fromExport == 1){ + return $subRes->toArray(); + } return dataReturn(0,lang('保存成功'),$subRes); - // return $subRes->toArray(); + } /** From ecadfbd47ae8bbba874a56ea9efecfa871565616 Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 14:06:52 +0800 Subject: [PATCH 02/15] =?UTF-8?q?feat(header):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=B4=E9=83=A8=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将固定电话号码替换为动态获取的公司电话 - 更新网站logo为动态获取的设置值 --- .../website/1/zh/demo/components/header.html | 8 +- public/themes/website/1/zh/demo/single_index.html | 802 +-------------------- 2 files changed, 5 insertions(+), 805 deletions(-) diff --git a/public/themes/website/1/zh/demo/components/header.html b/public/themes/website/1/zh/demo/components/header.html index 2e9973c..bc4c642 100644 --- a/public/themes/website/1/zh/demo/components/header.html +++ b/public/themes/website/1/zh/demo/components/header.html @@ -1,6 +1,6 @@
- + - 400-0898-188 + {hcTaglib:setting name="company_phone" type="1" /}
+ {include file="components/mask"} {include file="components/footer"} From 6961caa3fc5b11d28003eef9d2a40ce1311412c4 Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 14:12:08 +0800 Subject: [PATCH 03/15] =?UTF-8?q?refactor(pages):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E5=A4=B4=E9=83=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 从多个页面中删除了重复的头部组件代码，简化了页面结构 - 通过移除不必要的HTML元素，提升了页面加载性能 - 统一了页面的结构，便于后续维护和更新 --- public/themes/website/1/zh/demo/about.html | 464 +----------- public/themes/website/1/zh/demo/announce.html | 464 +----------- public/themes/website/1/zh/demo/category.html | 802 +------------------- .../themes/website/1/zh/demo/components/mask.html | 104 +++ public/themes/website/1/zh/demo/contact.html | 464 +----------- public/themes/website/1/zh/demo/download.html | 464 +----------- public/themes/website/1/zh/demo/faq.html | 464 +----------- public/themes/website/1/zh/demo/investment.html | 464 +----------- public/themes/website/1/zh/demo/news-detail.html | 802 +------------------- public/themes/website/1/zh/demo/news.html | 478 +----------- public/themes/website/1/zh/demo/product.html | 824 +-------------------- public/themes/website/1/zh/demo/search.html | 464 +----------- public/themes/website/1/zh/demo/single_search.html | 464 +----------- public/themes/website/1/zh/demo/solution.html | 464 +----------- public/themes/website/1/zh/demo/solution2.html | 464 +----------- public/themes/website/1/zh/demo/video.html | 464 +----------- 16 files changed, 119 insertions(+), 7995 deletions(-) create mode 100644 public/themes/website/1/zh/demo/components/mask.html diff --git a/public/themes/website/1/zh/demo/about.html b/public/themes/website/1/zh/demo/about.html index 0393fb2..f7b49b0 100644 --- a/public/themes/website/1/zh/demo/about.html +++ b/public/themes/website/1/zh/demo/about.html @@ -313,469 +313,7 @@ {/hcTaglib:category} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/announce.html b/public/themes/website/1/zh/demo/announce.html index 9694137..4ecfcc4 100644 --- a/public/themes/website/1/zh/demo/announce.html +++ b/public/themes/website/1/zh/demo/announce.html @@ -113,469 +113,7 @@ {/if}
- + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/category.html b/public/themes/website/1/zh/demo/category.html index de454da..229ead0 100644 --- a/public/themes/website/1/zh/demo/category.html +++ b/public/themes/website/1/zh/demo/category.html @@ -207,807 +207,7 @@ $current_cate_id = $current_cate['id'] ?? '';
- + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/components/mask.html b/public/themes/website/1/zh/demo/components/mask.html new file mode 100644 index 0000000..8a8635c --- /dev/null +++ b/public/themes/website/1/zh/demo/components/mask.html @@ -0,0 +1,104 @@ +
+
+ +
+ + + + + + + +
+
+
+ +
+
\ No newline at end of file diff --git a/public/themes/website/1/zh/demo/contact.html b/public/themes/website/1/zh/demo/contact.html index a8d9832..39c2f96 100644 --- a/public/themes/website/1/zh/demo/contact.html +++ b/public/themes/website/1/zh/demo/contact.html @@ -163,469 +163,7 @@ - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/download.html b/public/themes/website/1/zh/demo/download.html index 2592364..dd57ec3 100644 --- a/public/themes/website/1/zh/demo/download.html +++ b/public/themes/website/1/zh/demo/download.html @@ -131,469 +131,7 @@ {/if} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/faq.html b/public/themes/website/1/zh/demo/faq.html index 4fa7b49..9fa8691 100644 --- a/public/themes/website/1/zh/demo/faq.html +++ b/public/themes/website/1/zh/demo/faq.html @@ -108,469 +108,7 @@ {/if} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/investment.html b/public/themes/website/1/zh/demo/investment.html index 1d1b6a4..6f49b25 100644 --- a/public/themes/website/1/zh/demo/investment.html +++ b/public/themes/website/1/zh/demo/investment.html @@ -262,469 +262,7 @@ {/hcTaglib:category} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/news-detail.html b/public/themes/website/1/zh/demo/news-detail.html index 4fccda5..7a499a1 100644 --- a/public/themes/website/1/zh/demo/news-detail.html +++ b/public/themes/website/1/zh/demo/news-detail.html @@ -198,807 +198,7 @@ - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/news.html b/public/themes/website/1/zh/demo/news.html index a7d4a47..f30d18f 100644 --- a/public/themes/website/1/zh/demo/news.html +++ b/public/themes/website/1/zh/demo/news.html @@ -218,483 +218,7 @@ - +{include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/product.html b/public/themes/website/1/zh/demo/product.html index fbd9423..b25e546 100644 --- a/public/themes/website/1/zh/demo/product.html +++ b/public/themes/website/1/zh/demo/product.html @@ -433,829 +433,7 @@ $resource_download = $main_content['resource_download'] ?? []; - +{include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/search.html b/public/themes/website/1/zh/demo/search.html index 852113a..7388218 100644 --- a/public/themes/website/1/zh/demo/search.html +++ b/public/themes/website/1/zh/demo/search.html @@ -174,469 +174,7 @@ dd('此页面废弃'); - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/single_search.html b/public/themes/website/1/zh/demo/single_search.html index 6c3f568..e88022f 100644 --- a/public/themes/website/1/zh/demo/single_search.html +++ b/public/themes/website/1/zh/demo/single_search.html @@ -278,469 +278,7 @@ - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/solution.html b/public/themes/website/1/zh/demo/solution.html index da13212..51c56bb 100644 --- a/public/themes/website/1/zh/demo/solution.html +++ b/public/themes/website/1/zh/demo/solution.html @@ -240,469 +240,7 @@ {/if} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/solution2.html b/public/themes/website/1/zh/demo/solution2.html index 037defc..5458668 100644 --- a/public/themes/website/1/zh/demo/solution2.html +++ b/public/themes/website/1/zh/demo/solution2.html @@ -262,469 +262,7 @@ $current_cate_id = $current_cate['id'] ?? 0; {/if} - + {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/video.html b/public/themes/website/1/zh/demo/video.html index e5acf42..30e0fd3 100644 --- a/public/themes/website/1/zh/demo/video.html +++ b/public/themes/website/1/zh/demo/video.html @@ -129,469 +129,7 @@ - + {include file="components/mask"} {include file="components/footer"} From 6648e7ccb342abcd68a62524a350778726994ff6 Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 14:34:42 +0800 Subject: [PATCH 04/15] =?UTF-8?q?style(news):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/themes/dist_static/static/css/news.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/dist_static/static/css/news.css b/public/themes/dist_static/static/css/news.css index ffa745d..22870f5 100644 --- a/public/themes/dist_static/static/css/news.css +++ b/public/themes/dist_static/static/css/news.css @@ -361,7 +361,7 @@ } .n-tabs__item { flex-shrink: 0; - min-height: 40Px; + min-height: auto; padding: 8Px 20Px; font-size: 14Px; } From 89786e698f0bd13c52100edc4a0dee01e7a15500 Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 14:54:27 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix(about):=20=E6=9B=B4=E6=96=B0=E7=A4=BE?= =?UTF-8?q?=E4=BC=9A=E8=B4=A3=E4=BB=BB=E6=8A=A5=E5=91=8A=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E7=9A=84CID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将社会责任报告的链接CID从591更新为691，以确保指向正确的资源 --- public/themes/website/1/zh/demo/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/website/1/zh/demo/about.html b/public/themes/website/1/zh/demo/about.html index f7b49b0..9d9bce8 100644 --- a/public/themes/website/1/zh/demo/about.html +++ b/public/themes/website/1/zh/demo/about.html @@ -306,7 +306,7 @@

{$vo.description}

- 社会责任报告 + 社会责任报告 From 04c62c9725ab066448eec39c36176c4921b93317 Mon Sep 17 00:00:00 2001 From: xiaodong Date: Fri, 4 Sep 2026 15:06:17 +0800 Subject: [PATCH 06/15] =?UTF-8?q?istop=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/ContentService.php | 5 ++++- public/themes/website/1/zh/demo/news.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/service/ContentService.php b/app/service/ContentService.php index e12b482..a758c4d 100644 --- a/app/service/ContentService.php +++ b/app/service/ContentService.php @@ -471,7 +471,10 @@ class ContentService { if($param['isTop'] != 2){ $where['is_top'] = 1; } - if($param['isTop'] == 2){ + // if($param['isTop'] == 2){ + // $where['is_top'] = 2; + // } + if($param['isTop'] == 222){ $where['is_top'] = 2; } diff --git a/public/themes/website/1/zh/demo/news.html b/public/themes/website/1/zh/demo/news.html index a7d4a47..edb94a2 100644 --- a/public/themes/website/1/zh/demo/news.html +++ b/public/themes/website/1/zh/demo/news.html @@ -169,7 +169,7 @@
- {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time,is_top" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc" isTop="2"} + {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time,is_top" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc" isTop="222"} {/hcTaglib:contentPage2} {volist name="hc_content" id="vo_content"} From 42c1809ff8f24dcd8be716dc6c91b314bd243c2d Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 15:07:05 +0800 Subject: [PATCH 07/15] =?UTF-8?q?fix(footer):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=BA=95=E9=83=A8logo=E4=B8=BA=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将底部组件中的logo图片源从普通logo更新为深色logo，以适应新的设计要求 --- public/themes/website/1/zh/demo/components/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/website/1/zh/demo/components/footer.html b/public/themes/website/1/zh/demo/components/footer.html index db5a9e5..9542aed 100644 --- a/public/themes/website/1/zh/demo/components/footer.html +++ b/public/themes/website/1/zh/demo/components/footer.html @@ -4,7 +4,7 @@

股票代码: 603933

From 7868a1c53799c5684390db02c75a0632d1453c62 Mon Sep 17 00:00:00 2001 From: xiaodong Date: Fri, 4 Sep 2026 15:31:11 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=B1=95?= =?UTF-8?q?=E4=BC=9A=E4=B8=8E=E6=B4=BB=E5=8A=A8=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/themes/website/1/zh/demo/components/header.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/public/themes/website/1/zh/demo/components/header.html b/public/themes/website/1/zh/demo/components/header.html index bc4c642..dc7c863 100644 --- a/public/themes/website/1/zh/demo/components/header.html +++ b/public/themes/website/1/zh/demo/components/header.html @@ -335,10 +335,16 @@

- + {hcTaglib:category id="364" item="vo" field="*"} + {php} + $zhanhui_and_activity = $vo; + $thumbnail_url = $vo['thumbnail']['url'] ?? ''; + {/php} + {/hcTaglib:category} +
- 展会活动 + {$zhanhui_and_activity.title}
-
+

填写以下信息我们 第一时间回复 From ef72575c43b70a106c63dd029614a79569c2a80e Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 17:29:28 +0800 Subject: [PATCH 13/15] style(news-detail): comment out opacity on pager item hover for design adjustment --- public/themes/dist_static/static/css/news-detail.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/dist_static/static/css/news-detail.css b/public/themes/dist_static/static/css/news-detail.css index c6b99e3..0e4af4a 100644 --- a/public/themes/dist_static/static/css/news-detail.css +++ b/public/themes/dist_static/static/css/news-detail.css @@ -219,7 +219,7 @@ background-color: var(--color-primary); } .nd-pager__item:hover::before { - opacity: 1; + /* opacity: 1; */ } .nd-pager__label { position: relative; From b062a8c42f821e5cf76601fdd9ee63768a42ca7a Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 17:35:08 +0800 Subject: [PATCH 14/15] style(product): increase padding-top in hero section for improved layout --- public/themes/dist_static/static/css/product.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/themes/dist_static/static/css/product.css b/public/themes/dist_static/static/css/product.css index 912fdca..417f832 100644 --- a/public/themes/dist_static/static/css/product.css +++ b/public/themes/dist_static/static/css/product.css @@ -986,7 +986,7 @@ body.is-p-subnav .site-header { font-size: 13Px!important; } .p-hero { - padding-top: 88Px!important; + padding-top: 120Px!important; padding-bottom: 40Px!important; min-height: unset!important; } From ddd1f59db0b4119a29bafd37794e536dba3ef1a1 Mon Sep 17 00:00:00 2001 From: peijunlei Date: Fri, 4 Sep 2026 17:37:56 +0800 Subject: [PATCH 15/15] =?UTF-8?q?style(product):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=A7=E5=93=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/themes/dist_static/static/css/product.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/themes/dist_static/static/css/product.css b/public/themes/dist_static/static/css/product.css index 417f832..c16de91 100644 --- a/public/themes/dist_static/static/css/product.css +++ b/public/themes/dist_static/static/css/product.css @@ -959,6 +959,13 @@ body.is-p-subnav .site-header { min-height: 48Px!important; font-size: 16Px!important; } + .p-intro__gallery img { + width: auto; + max-width: 80%; + max-height: 80%; + height: 100%; + object-fit: contain; + } .p-subnav { height: 56Px!important; }