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
diff --git a/.gitignore b/.gitignore
index 9991ab61..e3b99a3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ public/.well-known
/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"
+ ]
+ }
+ }
+ }
+}
diff --git a/app/admin/controller/v1/BannerItem.php b/app/admin/controller/v1/BannerItem.php
index 3b196d14..8b94cb27 100644
--- a/app/admin/controller/v1/BannerItem.php
+++ b/app/admin/controller/v1/BannerItem.php
@@ -101,6 +101,8 @@ class BannerItem
'rel_prod_cate_id',
'title',
'title_txt_color',
+ 'short_title',
+ 'short_title_txt_color',
'desc',
'desc_txt_color',
'type',
@@ -156,6 +158,8 @@ class BannerItem
'rel_prod_cate_id',
'title',
'title_txt_color',
+ 'short_title',
+ 'short_title_txt_color',
'desc',
'desc_txt_color',
'type',
@@ -208,7 +212,7 @@ class BannerItem
Log::error(sprintf('%s:%s %s', $th->getFile(), $th->getLine(), $th->getMessage()));
return error('操作失败');
}
-
+
return success('操作成功');
}
@@ -240,6 +244,7 @@ class BannerItem
'banner_name' => '分类名称',
'title' => '横幅名称',
'title_txt_color' => '横幅名称字体颜色',
+ 'short_title' => '横幅简称',
'desc' => '描述',
'desc_txt_color' => '描述字体颜色',
'type' => '前台显示类型',
@@ -271,6 +276,7 @@ class BannerItem
'banner.name' => 'banner_name',
'item.title',
'item.title_txt_color',
+ 'item.short_title',
'item.desc',
'item.desc_txt_color',
'item.type',
diff --git a/app/common/model/SysBannerItemBaseModel.php b/app/common/model/SysBannerItemBaseModel.php
index ba6933ee..37237b98 100644
--- a/app/common/model/SysBannerItemBaseModel.php
+++ b/app/common/model/SysBannerItemBaseModel.php
@@ -17,22 +17,24 @@ class SysBannerItemBaseModel extends BaseModel
// 字段信息
protected $schema = [
- 'id' => 'int',
- 'banner_id' => 'int',
- 'title' => 'string',
- 'title_txt_color' => 'string',
- 'desc' => 'string',
- 'desc_txt_color' => 'string',
- 'type' => 'string',
- 'image' => 'string',
- 'extra_image' => 'string',
- 'video' => 'string',
- 'link_to' => 'string',
- 'link' => 'string',
- 'sort' => 'int',
- 'status' => 'int',
- 'created_at' => 'datetime',
- 'updated_at' => 'datetime',
- 'deleted_at' => 'datetime'
+ 'id' => 'int',
+ 'banner_id' => 'int',
+ 'title' => 'string',
+ 'title_txt_color' => 'string',
+ 'short_title' => 'string',
+ 'short_title_txt_color' => 'string',
+ 'desc' => 'string',
+ 'desc_txt_color' => 'string',
+ 'type' => 'string',
+ 'image' => 'string',
+ 'extra_image' => 'string',
+ 'video' => 'string',
+ 'link_to' => 'string',
+ 'link' => 'string',
+ 'sort' => 'int',
+ 'status' => 'int',
+ 'created_at' => 'datetime',
+ 'updated_at' => 'datetime',
+ 'deleted_at' => 'datetime'
];
}
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..32876a3b
--- /dev/null
+++ b/app/index/view/mobile/topic_power_prodline/index.html
@@ -0,0 +1,749 @@
+{extend name="public/base" /}
+{block name="style"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+{/block}
+{block name="header"}
+
+{/block}
+{block name="main"}
+
+
+
+ {notempty name="data.focus_image"}
+
+ {volist name="data.focus_image" id="fo"}
+
+ 
+
+ {/volist}
+
+
+ {/notempty}
+
+ {assign name="why_choose_title" value=":array_shift($data.why_choose)" /}
+
{$why_choose_title.title|default=''}
+
+ {volist name="data.why_choose" id="ch"}
+
+
+
+
+
+
+
+
$ch.title_txt_color])}>{$ch.title}
+
+
+
$ch.short_title_txt_color])}>{$ch.short_title}
+
{$ch.desc|raw}
+
+
+
+ {/volist}
+
+
+ {assign name="tc_title" value=":array_shift($data.travel_charger)" /}
+
+
{$tc_title.title|default=''}
+
{$tc_title.short_title|default=''}
+
+
+ {assign name="tc_first_section_lf" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_first_section_lf"}
+
+ 
+
+
+
+
+ {/notempty}
+ {assign name="tc_first_section_lr" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_first_section_lr"}
+
+
+
+
+
+ {/notempty}
+
+ {assign name="tc_second_section" value=":array_splice($data.travel_charger, 0, 4)" /}
+ {notempty name="tc_second_section"}
+
+ {assign name="tc_three_section" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+ {/notempty}
+
+ {assign name="hc_title" value=":array_shift($data.home_charger)" /}
+
+
{$hc_title.title|default=''}
+
{$hc_title.short_title|default=''}
+
+
+ {assign name="hc_first_section_lf" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_first_section_lf"}
+
+ 
+
+
+
+
+ {/notempty}
+ {assign name="hc_first_section_lr" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_first_section_lr"}
+
+
+
+
+
+ {/notempty}
+
+ {assign name="hc_second_section" value=":array_splice($data.home_charger, 0, 4)" /}
+ {notempty name="hc_second_section"}
+
+ {/notempty}
+ {assign name="hc_three_section" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="dc_title" value=":array_shift($data.desktop_charger)" /}
+
+
{$dc_title.title|default=''}
+
{$dc_title.short_title|default=''}
+
+
+ {assign name="dc_first_section_lf" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_first_section_lf"}
+
+ 
+
+
+
+
+ {/notempty}
+ {assign name="dc_first_section_lr" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_first_section_lr"}
+
+
+
+
+
+
+ {/notempty}
+
+ {assign name="dc_second_section" value=":array_splice($data.desktop_charger, 0, 2)" /}
+ {notempty name="dc_second_section"}
+
+ {/notempty}
+ {assign name="dc_three_section" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="wc_title" value=":array_shift($data.wall_charger)" /}
+
+
{$wc_title.title|default=''}
+
{$wc_title.short_title|default=''}
+
+
+ {assign name="wc_first_section_lf" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_first_section_lf"}
+
+ 
+
+
+
+
+ {/notempty}
+ {assign name="wc_first_section_lr" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_first_section_lr"}
+
+
+
+
+
+ {/notempty}
+
+ {assign name="wc_more_section" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_more_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="ct_title" value=":array_shift($data.converter)" /}
+
+
{$ct_title.title|default=''}
+
{$ct_title.short_title|default=''}
+
+ {assign name="ct_more_section" value=":array_pop($data.converter)" /}
+ {assign name="ct_chunk_section" value=":array_chunk($data.converter, 2)" /}
+ {assign name="ct_chunk_section_len" value=":count($ct_chunk_section)" /}
+ {volist name="ct_chunk_section" id="cts" key="k"}
+
+ {assign name="cts_lf" value=":array_shift($cts)" /}
+ {notempty name="cts_lf"}
+
+ 
+
+
+
+
+
+
+ {/notempty}
+ {assign name="cts_lr" value=":array_shift($cts)" /}
+ {notempty name="cts_lr"}
+
+
+
+
+
+
+ {/notempty}
+
+ {neq name="k" value="$ct_chunk_section_len"}
+
+ {/neq}
+ {/volist}
+ {notempty name="ct_more_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {notempty name="data.focus_image"}
+
+ {volist name="data.focus_image" id="fo"}
+
+
+
+ {/volist}
+
+
+ {/notempty}
+
+ {assign name="why_choose_title" value=":array_shift($data.why_choose)" /}
+
{$why_choose_title.title|default=''}
+
+ {volist name="data.why_choose" id="ch"}
+
+
+
+
+
+
+
+
$ch.title_txt_color])}>{$ch.title}
+
+
+
$ch.short_title_txt_color])}>{$ch.short_title}
+
{$ch.desc|raw}
+
+
+
+ {/volist}
+
+
+ {assign name="tc_title" value=":array_shift($data.travel_charger)" /}
+
+
{$tc_title.title|default=''}
+
{$tc_title.short_title|default=''}
+
+
+ {assign name="tc_first_section_lf" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_first_section_lf"}
+
+
+
+
+
+
+ {/notempty}
+ {assign name="tc_first_section_lr" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_first_section_lr"}
+
+
+
+
+ {/notempty}
+
+ {assign name="tc_second_section" value=":array_splice($data.travel_charger, 0, 4)" /}
+ {notempty name="tc_second_section"}
+
+ {assign name="tc_three_section" value=":array_shift($data.travel_charger)" /}
+ {notempty name="tc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+ {/notempty}
+
+ {assign name="hc_title" value=":array_shift($data.home_charger)" /}
+
+
{$hc_title.title|default=''}
+
{$hc_title.short_title|default=''}
+
+
+ {assign name="hc_first_section_lf" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_first_section_lf"}
+
+
+
+
+
+
+ {/notempty}
+ {assign name="hc_first_section_lr" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_first_section_lr"}
+
+
+
+
+ {/notempty}
+
+ {assign name="hc_second_section" value=":array_splice($data.home_charger, 0, 4)" /}
+ {notempty name="hc_second_section"}
+
+ {/notempty}
+ {assign name="hc_three_section" value=":array_shift($data.home_charger)" /}
+ {notempty name="hc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="dc_title" value=":array_shift($data.desktop_charger)" /}
+
+
{$dc_title.title|default=''}
+
{$dc_title.short_title|default=''}
+
+
+ {assign name="dc_first_section_lf" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_first_section_lf"}
+
+
+
+
+
+
+ {/notempty}
+ {assign name="dc_first_section_lr" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_first_section_lr"}
+
+
+
+
+
+ {/notempty}
+
+
+ {assign name="dc_second_section" value=":array_splice($data.desktop_charger, 0, 2)" /}
+ {notempty name="dc_second_section"}
+
+ {/notempty}
+ {assign name="dc_three_section" value=":array_shift($data.desktop_charger)" /}
+ {notempty name="dc_three_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="wc_title" value=":array_shift($data.wall_charger)" /}
+
+
{$wc_title.title|default=''}
+
{$wc_title.short_title|default=''}
+
+
+ {assign name="wc_first_section_lf" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_first_section_lf"}
+
+
+
+
+
+
+ {/notempty}
+ {assign name="wc_first_section_lr" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_first_section_lr"}
+
+
+
+
+ {/notempty}
+
+ {assign name="wc_more_section" value=":array_shift($data.wall_charger)" /}
+ {notempty name="wc_more_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ {assign name="ct_title" value=":array_shift($data.converter)" /}
+
+
{$ct_title.title|default=''}
+
{$ct_title.short_title|default=''}
+
+ {assign name="ct_more_section" value=":array_pop($data.converter)" /}
+ {assign name="ct_chunk_section" value=":array_chunk($data.converter, 2)" /}
+ {assign name="ct_chunk_section_len" value=":count($ct_chunk_section)" /}
+ {volist name="ct_chunk_section" id="cts" key="k"}
+
+ {assign name="cts_lf" value=":array_shift($cts)" /}
+ {notempty name="cts_lf"}
+
+
+
+
+
+
+
+
+ {/notempty}
+ {assign name="cts_lr" value=":array_shift($cts)" /}
+ {notempty name="cts_lr"}
+
+
+
+
+ {/notempty}
+
+ {neq name="k" value="$ct_chunk_section_len"}
+
+ {/neq}
+ {/volist}
+ {notempty name="ct_more_section"}
+
+
+ 查看更多
+
+
+ {/notempty}
+
+ 
+