+ From fec6dca03d13c87c43c221815c9129093f6b5276 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 20 Nov 2025 11:00:35 +0800
Subject: [PATCH 01/18] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 ++-
.zed/settings.json | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 .zed/settings.json
diff --git a/.gitignore b/.gitignore
index 9c1c0de2..8e911dc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,8 @@ public/dist
public/opendoc
/.idea
/.vscode
+/.zed
/vendor
/.settings
/.buildpath
-/.project
\ No newline at end of file
+/.project
diff --git a/.zed/settings.json b/.zed/settings.json
new file mode 100644
index 00000000..01ed5113
--- /dev/null
+++ b/.zed/settings.json
@@ -0,0 +1,24 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+ "languages": {
+ "PHP": {
+ "language_servers": ["intelephense","!phpactor"]
+ }
+ },
+ "lsp": {
+ "intelephense": {
+ "initialization_options": {
+ "stubs": [
+ "wordpress",
+ "laravel",
+ "symfony",
+ "codeigniter",
+ "thinkphp"
+ ]
+ }
+ }
+ }
+}
From c72cfa2e4359895215da0bfa70804cf4151bf7d9 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 20 Nov 2025 11:57:03 +0800
Subject: [PATCH 02/18] =?UTF-8?q?feat:=20=E4=B8=93=E9=A2=98=20-=20?=
=?UTF-8?q?=E7=94=B5=E5=8A=9B=E5=93=81=E7=BA=BF=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/index/controller/TopicPowerProdline.php | 127 ++++++++++++++++++
app/index/route/route.php | 6 +
.../mobile/topic_power_prodline/index.html | 16 +++
.../view/pc/topic_power_prodline/index.html | 16 +++
4 files changed, 165 insertions(+)
create mode 100644 app/index/controller/TopicPowerProdline.php
create mode 100644 app/index/view/mobile/topic_power_prodline/index.html
create mode 100644 app/index/view/pc/topic_power_prodline/index.html
diff --git a/app/index/controller/TopicPowerProdline.php b/app/index/controller/TopicPowerProdline.php
new file mode 100644
index 00000000..df2fa564
--- /dev/null
+++ b/app/index/controller/TopicPowerProdline.php
@@ -0,0 +1,127 @@
+getLanguages();
+ // 输出国家/语言列表
+ if (get_platform() == 'mobile') {
+ View::assign('header_languages', $languages);
+ }
+
+ // 获取当前语言
+ $current_language = $this->getCurrentLanguage($languages);
+ if (!empty($current_language)) {
+ $this->lang_id = $current_language['id'];
+ }
+
+ // 获取产品分类
+ $categorys = $this->getProductCategory($this->lang_id);
+ // 输出产品分类
+ View::assign('header_categorys', $categorys);
+
+ // 获取系统配置
+ $configs = $this->getSysConfig($this->lang_id, ['basic', 'contact', 'media']);
+ $this->basic_config = $configs['basic'];
+ // 输出系统配置
+ View::assign('basic_config', $configs['basic']);
+ View::assign('contact_config', $configs['contact']);
+ View::assign('media_config', $configs['media']);
+
+ // 获取底部导航
+ $footer_navigation = $this->getNavigation('NAV_67f60be43df8d', $this->lang_id);
+ // 输出底部导航
+ View::assign('footer_navigation', $footer_navigation);
+ }
+
+ /**
+ * 专题 - 电力品线首页
+ */
+ public function index()
+ {
+ $banners = SysBannerModel::with([
+ 'items' => function ($query) {
+ $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+ ->order(['sort' => 'asc', 'id' => 'desc'])
+ ->enabled(true);
+ }
+ ])
+ ->atPlatform(request()->from)
+ ->uniqueLabel([
+ 'BANNER_691e729f2428d',
+ 'BANNER_691e732e4ad69',
+ 'BANNER_691e752d2bbe2',
+ 'BANNER_691e75561c4d3',
+ 'BANNER_691e75ec9391c',
+ 'BANNER_691e7616545bf',
+ 'BANNER_691e763fc08f4',
+ 'BANNER_691e765a27eba',
+ 'BANNER_691e76b6af393',
+ ])
+ ->language($this->lang_id)
+ ->enabled(true)
+ ->order(['sort' => 'asc', 'id' => 'desc'])
+ ->select();
+
+ $data = [];
+ if (!$banners->isEmpty()) {
+ $banners_map = [];
+ foreach ($banners as $banner) {
+ $banners_map[$banner->unique_label] = $banner;
+ }
+ // 焦点轮播图
+ $focus_image = data_get($banners_map, 'BANNER_691e729f2428d')?->items->toArray();
+ if (!empty($focus_image)) $data['focus_image'] = $focus_image;
+
+ // 分类
+ $category = data_get($banners_map, 'BANNER_691e732e4ad69')?->items->toArray();
+ if (!empty($category)) $data['category'] = $category;
+
+ // 为什么选择奥睿科相关数据
+ $why_choose = data_get($banners_map, 'BANNER_691e752d2bbe2')?->items->toArray();
+ if (!empty($why_choose)) $data['why_choose'] = $why_choose;
+
+ // 差旅充
+ $travel_charger = data_get($banners_map, 'BANNER_691e75561c4d3')?->items->toArray();
+ if (!empty($travel_charger)) $data['travel_charger'] = $travel_charger;
+
+ // 家居充
+ $home_charger = data_get($banners_map, 'BANNER_691e75ec9391c')?->items->toArray();
+ if (!empty($home_charger)) $data['home_charger'] = $home_charger;
+
+ // 桌面充
+ $desktop_charger = data_get($banners_map, 'BANNER_691e7616545bf')?->items->toArray();
+ if (!empty($desktop_charger)) $data['desktop_charger'] = $desktop_charger;
+
+ // 墙充
+ $wall_charger = data_get($banners_map, 'BANNER_691e763fc08f4')?->items->toArray();
+ if (!empty($wall_charger)) $data['wall_charger'] = $wall_charger;
+
+ // 转换器
+ $converter = data_get($banners_map, 'BANNER_691e765a27eba')?->items->toArray();
+ if (!empty($converter)) $data['converter'] = $converter;
+
+ // 底部介绍
+ $footer_info = data_get($banners_map, 'BANNER_691e76b6af393')?->items->toArray();
+ if (!empty($footer_info)) $data['footer_info'] = $footer_info;
+ }
+ View::assign('data', $data);
+
+ return View::fetch('index');
+ }
+}
diff --git a/app/index/route/route.php b/app/index/route/route.php
index bfb9c03b..52389cb9 100644
--- a/app/index/route/route.php
+++ b/app/index/route/route.php
@@ -105,6 +105,12 @@ Route::group('topic', function () {
// 专题-Nas软件下载页
Route::get('download', 'TopicNas/download');
});
+
+ // 专题 - 电力品线
+ Route::group("power_prodline", function() {
+ // 专题 - 电力品线首页
+ Route::get('index', 'TopicPowerProdline/index');
+ });
});
// 数据迁移
diff --git a/app/index/view/mobile/topic_power_prodline/index.html b/app/index/view/mobile/topic_power_prodline/index.html
new file mode 100644
index 00000000..78dd8a38
--- /dev/null
+++ b/app/index/view/mobile/topic_power_prodline/index.html
@@ -0,0 +1,16 @@
+{extend name="public/nas_base" /}
+{block name="style"}
+
+{/block}
+{block name="header"}
+
+{/block}
+{block name="main"}
+
+{/block}
+{block name="footer"}
+
+{/block}
+{block name="script"}
+
+{/block}
diff --git a/app/index/view/pc/topic_power_prodline/index.html b/app/index/view/pc/topic_power_prodline/index.html
new file mode 100644
index 00000000..78dd8a38
--- /dev/null
+++ b/app/index/view/pc/topic_power_prodline/index.html
@@ -0,0 +1,16 @@
+{extend name="public/nas_base" /}
+{block name="style"}
+
+{/block}
+{block name="header"}
+
+{/block}
+{block name="main"}
+
+{/block}
+{block name="footer"}
+
+{/block}
+{block name="script"}
+
+{/block}
From 1c098304f9725276b477b627a8ef9d2e812105fb Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Mon, 24 Nov 2025 15:43:38 +0800
Subject: [PATCH 03/18] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0dev-ci.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitea/workflows/dev-ci.yaml | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 .gitea/workflows/dev-ci.yaml
diff --git a/.gitea/workflows/dev-ci.yaml b/.gitea/workflows/dev-ci.yaml
new file mode 100644
index 00000000..0960cada
--- /dev/null
+++ b/.gitea/workflows/dev-ci.yaml
@@ -0,0 +1,26 @@
+name: Gitea Actions Official-website
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ gitea.actor }}
+on:
+ push:
+ branches:
+ - dev
+
+jobs:
+ deploy-dev:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Setup SSH
+ run: |
+ mkdir -p ~/.ssh
+ echo "${{ secrets.SERVER_SSH_KEY }}" > ~/.ssh/id_rsa
+ chmod 600 ~/.ssh/id_rsa
+ ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts
+ - name: Deploy application
+ run: |
+ ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
+ set -e
+ cd /www/wwwroot/dev.ow.f2b211.com
+
+ # 拉取最新代码
+ git pull --rebase
+ EOF
From fa4dcf313a7dcc77d7abc3f8a82cd227568e7091 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Mon, 24 Nov 2025 15:58:22 +0800
Subject: [PATCH 04/18] =?UTF-8?q?refactor:=20=E4=B8=BB=E9=A2=98=20-=20?=
=?UTF-8?q?=E7=94=B5=E5=8A=9B=E5=93=81=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mobile/topic_power_prodline/index.html | 499 +++++++++++++++++-
.../view/pc/topic_power_prodline/index.html | 499 +++++++++++++++++-
.../pc/css/topic_power_prodline/advantage.css | 229 ++++++++
.../pc/css/topic_power_prodline/footer.css | 11 +
.../pc/css/topic_power_prodline/index.css | 73 +++
.../pc/css/topic_power_prodline/mask.css | 80 +++
.../index/pc/css/topic_power_prodline/nav.css | 96 ++++
.../pc/css/topic_power_prodline/product.css | 147 ++++++
.../css/topic_power_prodline/product_card.css | 206 ++++++++
.../css/topic_power_prodline/product_list.css | 246 +++++++++
.../pc/css/topic_power_prodline/swiper.css | 29 +
11 files changed, 2113 insertions(+), 2 deletions(-)
create mode 100644 public/static/index/pc/css/topic_power_prodline/advantage.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/footer.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/index.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/mask.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/nav.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/product.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/product_card.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/product_list.css
create mode 100644 public/static/index/pc/css/topic_power_prodline/swiper.css
diff --git a/app/index/view/mobile/topic_power_prodline/index.html b/app/index/view/mobile/topic_power_prodline/index.html
index 78dd8a38..fd0878fa 100644
--- a/app/index/view/mobile/topic_power_prodline/index.html
+++ b/app/index/view/mobile/topic_power_prodline/index.html
@@ -1,16 +1,513 @@
{extend name="public/nas_base" /}
{block name="style"}
-
+
+
+
+
+
+
+
+
+
{/block}
{block name="header"}
{/block}
{block name="main"}
+
+
+
+ 出差旅行, 一收就走
+
+ 自在充能, 邂逅生活美学
+
+ 精致桌面 高效美学
+
+
+ 出差旅行, 一收就走
+
+ 自在充能, 邂逅生活美学
+
+ 精致桌面 高效美学
+1转多
+ {assign name="wc_first_section_lf" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_first_section_lf"}
+
+
+
- 随你看世界
+ {assign name="cts_lf" value=":array_shift($cts)" /}
+ {notempty name="cts_lf"}
+
+
+
-
-
-
-
-