feat: 从产品目录同步产品相关数据

.env

@@ -0,0 +1,5 @@
+
+[JWT]
+TTL=3600
+REFRESH_TTL=20160
+SECRET=b43e6276644ed60e65c50d1b324ba10b

.env.dev

@@ -0,0 +1,32 @@
+APP_DEBUG = true
+
+DB_TYPE = mysql
+DB_HOST = localhost
+DB_NAME = orico-official-website
+DB_USER = orico-ow
+DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
+DB_PORT = 3306
+DB_CHARSET = utf8mb4
+DB_PREFIX = ow_
+
+DEFAULT_LANG = zh-cn
+
+# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
+PROXY_SERVER_IP[] = 120.79.27.160
+
+[JWT]
+TTL=3600
+REFRESH_TTL=20160
+SECRET=b43e6276644ed60e65c50d1b324ba10b
+
+# 后台不需要登录的接口
+[ADMIN_AUTH]
+WHITE_LIST[] = v1/user/login
+WHITE_LIST[] = v1/user/captcha
+
+# 不需记录日志的接口
+[ADMIN_API]
+IGNORE_LOGGING_LIST[] = v1/OperateLog/index
+MAX_IMAGE_SIZE = 5mb # 图片上传最大限制
+MAX_VIDEO_SIZE = 150mb # 视频上传最大限制
+MAX_ATTACHMENT_SIZE = 100mb # 附件上传最大限制

.env.local

@@ -0,0 +1,55 @@
+APP_DEBUG = true
+
+DB_TYPE = mysql
+DB_HOST = 127.0.0.1
+DB_NAME = orico-official-website
+DB_USER = orico-official-website
+DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
+DB_PORT = 3306
+DB_CHARSET = utf8mb4
+DB_PREFIX = ow_
+
+DEFAULT_LANG = zh-cn
+
+# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
+PROXY_SERVER_IP[] = 120.79.27.160
+
+[JWT]
+TTL=3600
+REFRESH_TTL=20160
+SECRET=b43e6276644ed60e65c50d1b324ba10b
+
+# 后台不需要登录的接口
+[ADMIN_AUTH]
+WHITE_LIST[] = v1/user/login
+WHITE_LIST[] = v1/user/captcha
+
+# 不需记录日志的接口
+[ADMIN_API]
+IGNORE_LOGGING_LIST[] = v1/OperateLog/index
+MAX_IMAGE_SIZE = 5mb; # 图片上传最大限制
+MAX_VIDEO_SIZE = 150mb; # 视频上传最大限制
+MAX_ATTACHMENT_SIZE = 100mb; # 附件上传最大限制
+
+# 开放API
+[OPENAPI]
+RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址
+RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址
+
+# 视图模板规则配置
+[VIEW_TPL]
+# 视图目录
+# query 规则：URL参数 mtpl=1 表示移动端访问
+# 例如：http://xxxx.com?mtpl=1
+# domain 规则：根据特定域名，判断是否移动端访问
+# 例如：http://mobile.orico.cn
+RULE = query
+# query 规则参数名
+RULE_QUERY_NAME = mtpl
+# query 规则参数值
+RULE_QUERY_VALUE = 1
+# domain 规则协议
+RULE_DOMAIN_SCHEME[] = http
+RULE_DOMAIN_SCHEME[] = https
+# domain 规则域名
+RULE_DOMAIN_HOST = mobile.orico.cn

.example.env

@@ -1,96 +1,11 @@
 APP_DEBUG = true
 
 DB_TYPE = mysql
-DB_HOST = localhost
-DB_NAME = orico-official-website
-DB_USER = orico-ow
-DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
+DB_HOST = 127.0.0.1
+DB_NAME = test
+DB_USER = username
+DB_PASS = password
 DB_PORT = 3306
-DB_CHARSET = utf8mb4
-DB_PREFIX = ow_
-DB_VERSION = 8
+DB_CHARSET = utf8
 
 DEFAULT_LANG = zh-cn
-
-# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
-PROXY_SERVER_IP[] = 120.79.27.160
-
-# redis 配置
-REDIS_HOST = 127.0.0.1
-REDIS_PORT = 6379
-REDIS_PASSWORD = ''
-REDIS_PREFIX = ow:
-
-[JWT]
-TTL=3600
-REFRESH_TTL=20160
-SECRET=b43e6276644ed60e65c50d1b324ba10b
-
-# 七牛云存储配置
-[QINIU_CLOUD]
-BUCKET = orico-official-website
-BASE_URL = //ow.static.f2b211.com
-ACCESS_KEY = dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms
-SECRET_KEY = KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q
-
-# 后台不需要登录的接口
-[ADMIN_AUTH]
-WHITE_LIST[] = v1/user/login
-WHITE_LIST[] = v1/user/captcha
-WHITE_LIST[] = receive_sync/category
-WHITE_LIST[] = receive_sync/product
-
-# 不需记录日志的接口
-[ADMIN_API]
-IGNORE_LOGGING_LIST[] = v1/OperateLog/index
-MAX_IMAGE_SIZE = 5mb; # 图片上传最大限制
-MAX_VIDEO_SIZE = 150mb; # 视频上传最大限制
-MAX_ATTACHMENT_SIZE = 100mb; # 附件上传最大限制
-
-# 开放API
-[OPENAPI]
-ACCESS_TOKEN_LIFETIME = 3600; # 访问令牌有效期
-REFRESH_TOKEN_LIFETIME = 1209600; # 刷新令牌有效期
-RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址
-RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址
-
-# 七牛云存储配置
-[QINUI]
-BUCKET = orico
-BASE_URL = http://local.orico.com
-ACCESS_KEY = 1234567890
-SECRET_KEY = 1234567890
-
-# 前台视图模板规则配置
-[INDEX_VIEW_TPL]
-# 视图目录
-# query 规则：URL参数 mtpl=1 表示移动端访问
-# 例如：http://xxxx.com?mtpl=1
-# domain 规则：根据特定域名，判断是否移动端访问
-# 例如：http://mobile.orico.cn
-RULE = query
-# query 规则参数名
-RULE_QUERY_NAME = mtpl
-# query 规则参数值
-RULE_QUERY_VALUE = 1
-# domain 规则协议
-RULE_DOMAIN_SCHEME[] = http
-RULE_DOMAIN_SCHEME[] = https
-# domain 规则域名
-RULE_DOMAIN_HOST = mobile.orico.cn
-
-# 前台语言检测配置
-[INDEX_LANG_DETECT]
-# 是否启用域名检测方式来检测语言
-DOMAIN_DETECT = true
-# 域名规则
-# 格式：域名=语言
-# 例如：mobile.orico.cn=zh-cn
-DOMAIN_RULE[] = orico.cn=zh-cn
-DOMAIN_RULE[] = orico.com.cn=zh-cn
-DOMAIN_RULE[] = www.orico.cn=zh-cn
-DOMAIN_RULE[] = www.orico.com.cn=zh-cn
-DOMAIN_RULE[] = ow.f2b211.com=zh-cn
-DOMAIN_RULE[] = orico.cc=en-us
-DOMAIN_RULE[] = www.orico.cc=en-us
-DOMAIN_RULE[] = ow.us.f2b211.com=en-us

.gitattributes

@@ -1,10 +1,12 @@
 *.eot filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
 *.woff filter=lfs diff=lfs merge=lfs -text
 *.woff2 filter=lfs diff=lfs merge=lfs -text
+*.svg filter=lfs diff=lfs merge=lfs -text
+*.tff filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.rar filter=lfs diff=lfs merge=lfs -text
 *.pdf filter=lfs diff=lfs merge=lfs -text
 *.gz filter=lfs diff=lfs merge=lfs -text
 *.gzip filter=lfs diff=lfs merge=lfs -text
-*.ttf filter=lfs diff=lfs merge=lfs -text
 *.otf filter=lfs diff=lfs merge=lfs -text

.gitea/workflows/dev-ci.yaml

@@ -1,26 +0,0 @@
-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

.gitignore

@@ -3,26 +3,10 @@ composer.phar
 composer.lock
 .DS_Store
 Thumbs.db
-.env
-.env.dev
-.env.local
-.env.prod
-.htaccess
-.user.ini
-/404.html
-/index.html
 
-public/dist*
-public/opendoc
-public/logo.png
-public/.well-known
 /.idea
 /.vscode
-/.zed
 /vendor
 /.settings
 /.buildpath
 /.project
-
-CLAUDE.md
-/skills

.zed/settings.json

@@ -1,24 +0,0 @@
-// 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"
-        ]
-      }
-    }
-  }
-}

LICENSE

@@ -1,208 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
-AND DISTRIBUTION
-
-   1. Definitions.
-
-      
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution
-as defined by Sections 1 through 9 of this document.
-
-      
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-      
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct
-or indirect, to cause the direction or management of such entity, whether
-by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
-of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-      
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
-granted by this License.
-
-      
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and configuration
-files.
-
-      
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled object
-code, generated documentation, and conversions to other media types.
-
-      
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the Appendix
-below).
-
-      
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative
-Works shall not include works that remain separable from, or merely link (or
-bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-      
-
-"Contribution" shall mean any work of authorship, including the original version
-of the Work and any modifications or additions to that Work or Derivative
-Works thereof, that is intentionally submitted to Licensor for inclusion in
-the Work by the copyright owner or by an individual or Legal Entity authorized
-to submit on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication
-sent to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor
-for the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-      
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently incorporated
-within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, sublicense, and distribute
-the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License,
-each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import, and otherwise
-transfer the Work, where such license applies only to those patent claims
-licensable by such Contributor that are necessarily infringed by their Contribution(s)
-alone or by combination of their Contribution(s) with the Work to which such
-Contribution(s) was submitted. If You institute patent litigation against
-any entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses granted to You
-under this License for that Work shall terminate as of the date such litigation
-is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or
-Derivative Works thereof in any medium, with or without modifications, and
-in Source or Object form, provided that You meet the following conditions:
-
-(a) You must give any other recipients of the Work or Derivative Works a copy
-of this License; and
-
-(b) You must cause any modified files to carry prominent notices stating that
-You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works that You distribute,
-all copyright, patent, trademark, and attribution notices from the Source
-form of the Work, excluding those notices that do not pertain to any part
-of the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding those
-notices that do not pertain to any part of the Derivative Works, in at least
-one of the following places: within a NOTICE text file distributed as part
-of the Derivative Works; within the Source form or documentation, if provided
-along with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text from the
-Work, provided that such additional attribution notices cannot be construed
-as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction,
-or distribution of Your modifications, or for any such Derivative Works as
-a whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any
-Contribution intentionally submitted for inclusion in the Work by You to the
-Licensor shall be under the terms and conditions of this License, without
-any additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you
-may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as required
-for reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to
-in writing, Licensor provides the Work (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied, including, without limitation, any warranties
-or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
-A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
-of using or redistributing the Work and assume any risks associated with Your
-exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether
-in tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to
-in writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability
-to use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the possibility
-of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work
-or Derivative Works thereof, You may choose to offer, and charge a fee for,
-acceptance of support, warranty, indemnity, or other liability obligations
-and/or rights consistent with this License. However, in accepting such obligations,
-You may act only on Your own behalf and on Your sole responsibility, not on
-behalf of any other Contributor, and only if You agree to indemnify, defend,
-and hold each Contributor harmless for any liability incurred by, or claims
-asserted against, such Contributor by reason of your accepting any such warranty
-or additional liability. END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own identifying
-information. (Don't include the brackets!) The text should be enclosed in
-the appropriate comment syntax for the file format. We also recommend that
-a file or class name and description of purpose be included on the same "printed
-page" as the copyright notice for easier identification within third-party
-archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-
-distributed under the License is distributed on an "AS IS" BASIS,
-
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-See the License for the specific language governing permissions and
-
-limitations under the License.

app/admin/controller/ReceiveProductSync.php

@@ -99,7 +99,6 @@ class ReceiveProductSync
                 }
 
                 $category   = ProductCategoryModel::language($lang_id)->tcoId($tco_category['id'])->find();
-                if (!empty($category)) {
                 $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
                 if (!empty($tco_parent)) {
                     $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
@@ -110,11 +109,10 @@ class ReceiveProductSync
                     $category['path']  = $parent['path'] . $parent['pid'];
                     $category['level'] = $parent['level'] + 1;
                 }
-                    if (!$category->save()) {
+                if (!$category->save($category)) {
                     throw new \Exception('产品分类更新失败');
                 }
             }
-            }
 
             Db::commit();
         } catch (\Throwable $th) {
@@ -164,7 +162,7 @@ class ReceiveProductSync
         }
 
         try {
-            $product_tco_category = ProductTcoCategoryModel::language($lang_id)->erpCode($data['category_erp_code'])->find();
+            $product_tco_category = ProductTcoCategoryModel::language($lang_id)->erpCade($data['category_erp_code'])->find();
             if (empty($product_tco_category)) {
                 throw new \Exception('官网未找到产品目录同步分类');
             }
@@ -185,13 +183,13 @@ class ReceiveProductSync
                     'desc'         => '',
                     'video_img'    => '',
                     'video_url'    => '',
-                    'is_sale'      => 1,
+                    'is_sale'      => 0,
                     'is_new'       => 0,
                     'is_hot'       => 0,
-                    'is_show'      => 0,
+                    'is_show'      => Operate_Of_ReceiveSync::Disable == $data['operate'] ? 0 : 1,
                     'sort'         => 0,
                     'detail'       => '',
-                    'status'       => Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1,
+                    'status'       => 1,
                     'seo_title'    => '',
                     'seo_keywords' => '',
                     'seo_desc'     => '',
@@ -201,16 +199,15 @@ class ReceiveProductSync
                     throw new \Exception('产品创建失败');
                 }
             }
-            // 注释更新同步，防止tco同步修改官网手动调整数据
-            // else if (strtotime($product['updated_at']) < strtotime($data['created_at'])) {
-            //     $product->spu         = $data['spu'];
-            //     $product->name        = $data['name'];
-            //     $product->category_id = $product_category['id'];
-            //     $product->status      = Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1;
-            //     if (!$product->save()) {
-            //         throw new \Exception('产品更新失败');
-            //     }
-            // }
+            else if (strtotime($product['updated_at']) < strtotime($data['created_at'])) {
+                $product->spu         = $data['spu'];
+                $product->name        = $data['name'];
+                $product->category_id = $product_category['id'];
+                $product->is_show     = Operate_Of_ReceiveSync::Disable == $data['operate'] ? 0 : 1;
+                if (!$product->save()) {
+                    throw new \Exception('产品更新失败');
+                }
+            }
         } catch (\Throwable $th) {
             return error(sprintf('%s %s:%d', $th->getMessage(), $th->getFile(), $th->getLine()));
         }

app/admin/controller/v1/Article.php

@@ -228,7 +228,7 @@ class Article
     private function getExportArticleData()
     {
         $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . config('filesystem.disks.public.url') . '/';
         $param = request()->param(['title', 'category_id', 'release_time']);
         $data = ArticleModel::field([
                 '*',
@@ -253,7 +253,7 @@ class Article
             ])
             ->bindAttr('category', ['category_name' => 'name'])
             ->each(function ($item) use($image_host) {
-                $item->image = !empty($item->image) ? url_join($image_host, $item->image) : '';
+                $item->image = !empty($item->image) ? $image_host . $item->image : '';
                 return $item;
             });
 

app/admin/controller/v1/Banner.php

@@ -91,6 +91,7 @@ class Banner
 
         $banner = SysBannerModel::withoutField([
                 'at_page',
+                'unique_label',
                 'language_id',
                 'created_at',
                 'updated_at',
@@ -141,7 +142,6 @@ class Banner
             'name',
             'desc',
             'recommend',
-            'unique_label',
             'at_platform'  => 'pc',
             'status'       => 1
         ]);

app/admin/controller/v1/BannerItem.php

@@ -101,8 +101,6 @@ class BannerItem
             'rel_prod_cate_id',
             'title',
             'title_txt_color',
-            'short_title',
-            'short_title_txt_color',
             'desc',
             'desc_txt_color',
             'type',
@@ -158,8 +156,6 @@ class BannerItem
             'rel_prod_cate_id',
             'title',
             'title_txt_color',
-            'short_title',
-            'short_title_txt_color',
             'desc',
             'desc_txt_color',
             'type',
@@ -244,7 +240,6 @@ class BannerItem
             'banner_name'     => '分类名称',
             'title'           => '横幅名称',
             'title_txt_color' => '横幅名称字体颜色',
-            'short_title'     => '横幅简称',
             'desc'            => '描述',
             'desc_txt_color'  => '描述字体颜色',
             'type'            => '前台显示类型',
@@ -267,16 +262,17 @@ class BannerItem
     // 获取导出数据
     private function getBannerExportData()
     {
-        $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
-        $param = request()->param(['title', 'banner_id', 'created_at']);
+        $param = request()->param([
+            'title',
+            'banner_id',
+            'created_at'
+        ]);
         return SysBannerItemModel::alias('item')
             ->field([
                 'item.id',
                 'banner.name' => 'banner_name',
                 'item.title',
                 'item.title_txt_color',
-                'item.short_title',
                 'item.desc',
                 'item.desc_txt_color',
                 'item.type',
@@ -315,13 +311,7 @@ class BannerItem
                 }
             })
             ->order(['item.sort' => 'asc', 'item.id' => 'desc'])
-            ->select()
-            ->each(function($item) use($image_host) {
-                $item->image       = !empty($item->image) ? url_join($image_host, $item->image) : '';
-                $item->extra_image = !empty($item->extra_image) ? url_join($image_host, $item->extra_image) : '';
-                $item->video       = !empty($item->video) ? url_join($image_host, $item->video) : '';
-                return $item;
-            });
+            ->select();
     }
 
     // 删除

app/admin/controller/v1/NavigationItem.php

@@ -67,8 +67,6 @@ class NavigationItem
                 'id',
                 'pid',
                 'name',
-                'desc',
-                'image',
                 'nav_id',
                 'sort',
                 'status',
@@ -95,9 +93,7 @@ class NavigationItem
             'pid',
             'nav_id',
             'name',
-            'desc',
             'icon',
-            'image',
             'link_to' => 'custom',
             'link',
             'sort',
@@ -125,9 +121,7 @@ class NavigationItem
             'pid',
             'nav_id',
             'name',
-            'desc',
             'icon',
-            'image',
             'link_to',
             'link',
             'sort',

app/admin/controller/v1/Product.php

@@ -57,7 +57,7 @@ class Product
             ])
             ->categoryNullable($param['category_id']??null)
             ->isShowNullable(isset($param['is_show']) ? (bool)$param['is_show'] : null)
-            ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+            ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
                 'page'      => $param['page'],
@@ -83,7 +83,7 @@ class Product
             ])
             ->bypk(request()->param('id'))
             ->find()
-            ?->bindAttr('category', ['category_name'])
+            ->bindAttr('category', ['category_name'])
             ->hidden(['category']);
         if (empty($product)) {
             return error('产品不存在');
@@ -171,7 +171,7 @@ class Product
         // 更新产品参数
         if ($put['params'] != "") {
             ProductParamsModel::productId($id)->delete();
-            if (preg_match_all('/(.+):(.+)/', $put['params'], $match_result)) {
+            if (preg_match_all('/(\S+):(.[^\s]+)/', $put['params'], $match_result)) {
                 $params = [];
                 for ($i = 0; $i < count($match_result[0]); $i++) {
                     $params[] = [
@@ -346,7 +346,7 @@ class Product
     private function getExportProductData()
     {
         $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . config('filesystem.disks.public.url') . '/';
         $param = request()->param([
             'name',
             'spu',
@@ -360,10 +360,10 @@ class Product
                 'spu',
                 'name',
                 'short_name',
-                'cover_image',
+                'CONCAT("' . $image_host . '", `cover_image`)' => 'cover_image',
                 'desc',
-                'video_img',
-                'video_url',
+                'CONCAT("' . $image_host . '", `video_img`)' => 'video_img',
+                'CONCAT("' . $image_host . '", `video_url`)' => 'video_url',
                 'CASE WHEN is_new = 1 THEN "是" ELSE "否" END' => 'is_new',
                 'CASE WHEN is_hot = 1 THEN "是" ELSE "否" END' => 'is_hot',
                 'CASE WHEN is_sale = 1 THEN "是" ELSE "否" END' => 'is_sale',
@@ -390,18 +390,7 @@ class Product
             ->order(['id' => 'asc'])
             ->select()
             ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category_id', 'category'])
-            ->each(function($item) use($image_host) {
-                if (!empty($item["cover_image"])) {
-                    $item["cover_image"] = url_join($image_host, $item["cover_image"]);
-                }
-                if (!empty($item["video_img"])) {
-                    $item["video_img"] = url_join($image_host, $item["video_img"]);
-                }
-                if (!empty($item["video_url"])) {
-                    $item["video_url"] = url_join($image_host, $item["video_url"]);
-                }
-            });
+            ->hidden(['category_id', 'category']);
 
         if (!$products->isEmpty()) {
             // 产品参数

app/admin/controller/v1/ProductCategoryRecommend.php

@@ -1,203 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace app\admin\controller\v1;
-
-use app\admin\model\v1\ProductCategoryRecommendModel;
-use app\admin\validate\v1\ProductCategoryRecommendValidate;
-
-/**
- * 产品分类推荐管理控制器
- */
-class ProductCategoryRecommend
-{
-    /**
-     * 分页列表
-     */
-    public function index()
-    {
-        $param      = request()->get([
-            'keywords',
-            'category_name',
-            'page/d' => 1,
-            'size/d' => 10
-        ]);
-
-        // 查询数据
-        $data = ProductCategoryRecommendModel::withJoin(['category' => function($query) use ($param) {
-                if (!empty($param['category_name'])) {
-                    $query->where('category.name', 'like', '%' . $param['category_name'] . '%');
-                }
-            }])
-            ->withSearch(['keywords'], ['keywords' => $param['keywords']??null])
-            ->language(request()->lang_id)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->paginate([
-                'list_rows' => $param['size'],
-                'page'      => $param['page'],
-            ])
-            ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category', 'language_id', 'updated_at', 'deleted_at'])
-            ?->each(function($item) {
-                // 列表页面图片输出缩略图
-                if (!empty($item['image'])) {
-                    $item['image'] = thumb($item['image']);
-                }
-            });
-
-        return success('获取成功', $data);
-    }
-
-    /**
-     * 导出Excel
-     */
-    public function export()
-    {
-        $schema = [
-            'id'            => 'ID',
-            'image'         => '图片',
-            'category_name' => '分类名称',
-            'desc'          => '产品介绍',
-            'link'          => '链接地址',
-            'sort'          => '排序',
-            'disabled'      => '状态',
-            'created_at'    => '添加时间'
-        ];
-
-        // 获取导出数据
-        $data = $this->getProductCategoryRecommendData();
-
-        // 导出
-        return xlsx_writer($data, $schema, '产品推荐列表' . date('YmdHis'));
-    }
-    // 获取要导出的推荐记录数据
-    private function getProductCategoryRecommendData()
-    {
-        $server     = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
-        $param      = request()->get(['keywords']);
-
-        // 查询数据
-        return ProductCategoryRecommendModel::withJoin(['category' => function($query) use ($param) {
-                if (!empty($param['category_name'])) {
-                    $query->where('category.name', 'like', '%' . $param['category_name'] . '%');
-                }
-            }])
-            ->withSearch(['keywords'], ['keywords' => $param['keywords']??null])
-            ->language(request()->lang_id)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->select()
-            ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category', 'language_id', 'updated_at', 'deleted_at'])
-            ?->each(function($item) use($image_host) {
-                // 拼接完整图片URL
-                if (!empty($item['image'])) {
-                    $item['image'] = url_join($image_host, $item['image']);
-                }
-                // 状态
-                $item['disabled'] = $item['disabled'] == 1 ? '禁用' : '启用';
-            })
-            ->toArray();
-    }
-
-    /**
-     * 获取详细数据
-     */
-    public function read()
-    {
-        $id = request()->param('id/d');
-        $record = ProductCategoryRecommendModel::bypk($id)
-            ->withoutField(['language_id', 'created_at', 'updated_at', 'deleted_at'])
-            ->find();
-        if (empty($record)) {
-            return error('推荐数据不存在');
-        }
-
-        return success('success', $record);
-    }
-
-    /**
-     * 新增数据
-     */
-    public function save()
-    {
-        $post = request()->post([
-            'category_id',
-            'title',
-            'image',
-            'desc',
-            'link',
-            'sort',
-            'disabled'
-        ]);
-        $data = array_merge($post, ['language_id' => request()->lang_id]);
-
-        // 参数校验
-        $validate   = new ProductCategoryRecommendValidate();
-        if (!$validate->scene('create')->check($data)) {
-            return error($validate->getError());
-        }
-
-        // 保存推荐数据
-        $recommend = ProductCategoryRecommendModel::create($data);
-        if ($recommend->isEmpty()) {
-            return error('保存失败');
-        }
-        return success('保存成功');
-    }
-
-    /**
-    * 更新数据
-    */
-    public function update()
-    {
-        $id = request()->param('id/d');
-        $post = request()->post([
-            'category_id',
-            'title',
-            'image',
-            'desc',
-            'link',
-            'sort',
-            'disabled'
-        ]);
-        $data = array_merge($post, ['language_id' => request()->lang_id]);
-
-        // 参数校验
-        $validate   = new ProductCategoryRecommendValidate();
-        $check_data = array_merge($data, ['id' => $id]);
-        if (!$validate->scene('update')->check($check_data)) {
-            return error($validate->getError());
-        }
-
-        // 更新推荐数据
-        $recommend = ProductCategoryRecommendModel::bypk($id)->find();
-        if (empty($recommend)) {
-            return error('请确认操作对象是否存在');
-        }
-        if (!$recommend->save($data)) {
-            return error('操作失败');
-        }
-
-        return success('操作成功');
-    }
-
-    /**
-     * 删除
-     */
-    public function delete()
-    {
-        $id = request()->param('id/d');
-
-        // 删除推荐记录数据
-        $record = ProductCategoryRecommendModel::bypk($id)->find();
-        if (empty($record)) {
-            return error('请确认操作对象是否正确');
-        }
-        if (!$record->delete()) {
-            return error('操作失败');
-        }
-
-        return success('操作成功');
-    }
-}

app/admin/controller/v1/ProductTcoCategory.php

@@ -16,9 +16,8 @@ class ProductTcoCategory
         $param = request()->param(['name']);
 
         $categorys = ProductTcoCategoryModel::field([
-                'id',
-                'tco_id',
-                'tco_pid',
+                'tco_id'  => 'id',
+                'tco_pid' => 'pid',
                 'name',
             ])
             ->withSearch(['name'], [
@@ -26,10 +25,10 @@ class ProductTcoCategory
             ])
             ->language(request()->lang_id)
             ->enabled()
-            ->order(['tco_id' => 'asc'])
+            ->order(['id' => 'asc'])
             ->select()
             ->toArray();
 
-        return success('获取成功', array_to_tree($categorys, 0, 'tco_pid', false, true, 'tco_id'));
+        return success('获取成功', array_to_tree($categorys, 0, 'pid', false));
     }
 }

app/admin/controller/v1/SysMallStoreEntrance.php

@@ -1,201 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace app\admin\controller\v1;
-
-use app\admin\model\v1\SysMallStoreEntranceModel;
-use app\admin\validate\v1\SysMallStoreEntranceValidate;
-
-/**
- * 系统商城店铺入口管理控制器
- */
-class SysMallStoreEntrance
-{
-    /**
-     * 分页列表
-     */
-    public function index()
-    {
-        $param = request()->get([
-            'name',
-            'page/d' => 1,
-            'size/d' => 10
-        ]);
-
-        // 查询数据
-        $data = SysMallStoreEntranceModel::withoutField([
-                'language_id',
-                'hover_image',
-                'updated_at',
-                'deleted_at'
-            ])
-            ->withSearch(['name'], ['name' => $param['name']??null])
-            ->language(request()->lang_id)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->paginate([
-                'list_rows' => $param['size'],
-                'page'      => $param['page'],
-            ])
-            ?->each(function($item) {
-                // 列表页面图片输出缩略图
-                if (!empty($item['image'])) {
-                    $item['image'] = thumb($item['image']);
-                }
-            });
-
-        return success('获取成功', $data);
-    }
-
-    /**
-     * 获取详情
-     */
-    public function read()
-    {
-        $id     = request()->param('id/d');
-        $record = SysMallStoreEntranceModel::bypk($id)
-            ->withoutField(['language_id', 'created_at', 'updated_at', 'deleted_at'])
-            ->find();
-        if (empty($record)) {
-            return error('商城店铺入口数据不存在');
-        }
-
-        return success('success', $record);
-    }
-
-    /**
-     * 新增数据
-     */
-    public function save()
-    {
-        $post = request()->post([
-            'name',
-            'image',
-            'hover_image',
-            'link',
-            'sort',
-            'disabled'
-        ]);
-        $data = array_merge($post, ['language_id' => request()->lang_id]);
-
-        // 参数校验
-        $validate   = new SysMallStoreEntranceValidate();
-        if (!$validate->scene('create')->check($data)) {
-            return error($validate->getError());
-        }
-
-        // 保存数据
-        $entrance = SysMallStoreEntranceModel::create($data);
-        if ($entrance->isEmpty()) {
-            return error('保存失败');
-        }
-        return success('保存成功');
-    }
-
-    /**
-    * 更新数据
-    */
-    public function update()
-    {
-        $id   = request()->param('id/d');
-        $post = request()->post([
-            'name',
-            'image',
-            'hover_image',
-            'link',
-            'sort',
-            'disabled'
-        ]);
-        $data = array_merge($post, ['language_id' => request()->lang_id]);
-
-        // 参数校验
-        $validate   = new SysMallStoreEntranceValidate();
-        $check_data = array_merge($data, ['id' => $id]);
-        if (!$validate->scene('update')->check($check_data)) {
-            return error($validate->getError());
-        }
-
-        // 更新数据
-        $entrance = SysMallStoreEntranceModel::bypk($id)->find();
-        if (empty($entrance)) {
-            return error('请确认操作对象是否存在');
-        }
-        if (!$entrance->save($data)) {
-            return error('操作失败');
-        }
-
-        return success('操作成功');
-    }
-
-    /**
-     * 删除
-     */
-    public function delete()
-    {
-        $id = request()->param('id/d');
-
-        // 删除数据
-        $record = SysMallStoreEntranceModel::bypk($id)->find();
-        if (empty($record)) {
-            return error('请确认操作对象是否正确');
-        }
-        if (!$record->delete()) {
-            return error('操作失败');
-        }
-
-        return success('操作成功');
-    }
-
-    /**
-     * 导出Excel
-     */
-    public function export()
-    {
-        $schema = [
-            'id'           => 'ID',
-            'image'        => '图片',
-            'hover_image'  => '悬浮图',
-            'name'         => '名称',
-            'link'         => '链接地址',
-            'sort'         => '排序',
-            'disabled'     => '状态',
-            'created_at'   => '添加时间'
-        ];
-
-        // 获取导出数据
-        $data = $this->getExportData();
-
-        // 导出
-        return xlsx_writer($data, $schema, '系统商城店铺入口列表' . date('YmdHis'));
-    }
-
-    // 获取要导出的数据
-    private function getExportData()
-    {
-        $server     = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
-        $param      = request()->get(['name']);
-
-        // 查询数据
-        return SysMallStoreEntranceModel::withoutField([
-                'language_id',
-                'updated_at',
-                'deleted_at'
-            ])
-            ->withSearch(['name'], ['name' => $param['name']??null])
-            ->language(request()->lang_id)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->select()
-            ?->each(function($item) use($image_host) {
-                // 拼接完整图片URL
-                if (!empty($item['image'])) {
-                    $item['image'] = url_join($image_host, $item['image']);
-                }
-                if (!empty($item['hover_image'])) {
-                    $item['hover_image'] = url_join($image_host, $item['hover_image']);
-                }
-                // 状态转换
-                $item['disabled'] = $item['disabled'] == 1 ? '禁用' : '启用';
-            })
-            ->toArray();
-    }
-}

app/admin/controller/v1/System.php

@@ -342,30 +342,6 @@ class System
                         'url'  => (string)url('/index/topic/nas/download')
                     ]
                 ]
-            ],
-            [
-                'id'       => 8,
-                'name'     => '电力品线专题',
-                'url'      => '',
-                'children' => [
-                    [
-                        'id'   => 81,
-                        'name' => '首页',
-                        'url'  => (string)url('/index/topic/power_prodline/index')
-                    ],
-                ]
-            ],
-            [
-                'id'       => 9,
-                'name'     => '笔记本（AI PC）专题',
-                'url'      => '',
-                'children' => [
-                    [
-                        'id'   => 91,
-                        'name' => '首页',
-                        'url'  => (string)url('/index/topic/laptop/index')
-                    ],
-                ]
             ]
         ];
     }

app/admin/controller/v1/Upload.php

@@ -9,7 +9,6 @@ use app\admin\model\v1\SysAttachmentUploadRecordModel;
 use Intervention\Image\ImageManager;
 use Intervention\Image\Typography\FontFactory;
 use think\facade\Filesystem;
-use filesystem\Qiniu;
 
 /**
  * 文件上传控制器
@@ -46,39 +45,17 @@ class Upload
             // 获取图片上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique,
-                'filetype_to'    => $filetype_to,
+                'filemd5_unique' => $filemd5_unique
             ) = $this->getUploadOptions('upload_image');
-
-            // 获取文件大小
-            $file_size = $file->getSize();
-            // 获取文件mime类型
-            $mime_type = $file->getOriginalMime();
-
             // 是否需要根据文件MD5值检查文件是否已存在
             $image_model = $filemd5_unique ? SysImageUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($image_model)) {
                 // 检查是否需要保留原文件名生成器
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-
-                // 处理图片
-                $image_manager = ImageManager::gd();
-                if ($filetype_to == 'original') {
                 $filename  = Filesystem::disk('image')->putFile($param['module'], $file, $name_rule());
+                // 处理图片
+                $image_manager = ImageManager::imagick();
                 $image = $image_manager->read('.' . $storage . '/' . $filename);
-                }
-                else if ($filetype_to == 'webp') {
-                    $image = $image_manager->read($file->getRealPath());
-                    // 转换为webp格式
-                    $webp     = $image->toWebp(75);
-                    $root     = config('filesystem.disks.image.root');
-                    $filename = $param['module'] . '/' . ($name_rule() ? $name_rule()() : date('Ymd') . '/' . md5((string)time() . random_str(8))) . '.webp';
-                    $webp->save($this->checkPath($root . '/' . $filename));
-                    // 获取webp文件大小
-                    $file_size = $webp->size();
-                    // 获取webp文件mime类型
-                    $mime_type = $webp->mimetype();
-                }
 
                 // 水印
                 list(
@@ -154,10 +131,10 @@ class Upload
                 $image_model              = new SysImageUploadRecordModel();
                 $image_model->language_id = request()->lang_id;
                 $image_model->module      = $param['module'];
-                $image_model->image_path  = $storage . '/' . $filename;
-                $image_model->image_thumb = $storage . '/' . $thumb_filename;
-                $image_model->file_size   = $file_size;
-                $image_model->file_type   = $mime_type;
+                $image_model->image_path  = $filename;
+                $image_model->image_thumb = $thumb_filename;
+                $image_model->file_size   = $file->getSize();
+                $image_model->file_type   = $file->getOriginalMime();
                 $image_model->file_md5    = $filemd5;
                 $image_model->file_sha1   = $filesha1;
                 if (!$image_model->save()) {
@@ -166,8 +143,8 @@ class Upload
             }
 
             return success('操作成功', [
-                'path'       => $image_model->image_path,
-                'thumb_path' => $image_model->image_thumb,
+                'path'       => $storage . '/' . $image_model->image_path,
+                'thumb_path' => $storage . '/' . $image_model->image_thumb,
                 'filemd5'    => $image_model->file_md5,
                 'filesha1'   => $image_model->file_sha1
             ]);
@@ -177,30 +154,6 @@ class Upload
 
         return error('上传失败');
     }
-    /**
-     * 检查路径
-     * 
-     * @param string $path
-     * @return string
-     */
-    private function checkPath($path): string
-    {
-        $ok       = true;
-        $filename = basename($path);
-        $dirname  = dirname($path);
-        if (!is_dir($dirname)) {
-            $ok = @mkdir($dirname, 0755, true);
-        }
-        else if (!is_writable($dirname)) {
-            $ok = @chmod($dirname,0755);
-        }
-
-        if ($ok) {
-            return $dirname . '/' . $filename;
-        }
-
-        throw new \Exception("上传目标目录不可用");
-    }
     /**
      * 文件名生成回调
      *
@@ -222,12 +175,10 @@ class Upload
         $config_model = new \app\admin\controller\v1\SiteConfig;
         $config       = $config_model->getByGroupUniqueLabel('upload');
         $options      = data_get($config, $module, []);
-        
+        throw_if(empty($options), '上传配置错误');
         return [
             'filename_keep'  => (int)data_get($options, 'filename_keep.value', 0)  == 1,
             'filemd5_unique' => (int)data_get($options, 'filemd5_unique.value', 0) == 1,
-            'filetype_to'    => data_get($options, 'filetype_to.value', 'original'),
-            'save_to'        => data_get($options, 'save_to.value', 'local'),
         ];
     }
     /**
@@ -269,7 +220,7 @@ class Upload
         ];
     }
     /**
-     * 计算文本水印偏移量
+     * 计算文体水印偏移量
      *
      * @param string $position
      * @param integer $offset_x
@@ -347,35 +298,20 @@ class Upload
             // 获取视频上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique,
-                'save_to'        => $save_to,
+                'filemd5_unique' => $filemd5_unique
             ) = $this->getUploadOptions('upload_video');
             // 是否需要根据文件MD5值检查文件是否已存在
             $video = $filemd5_unique ? SysVideoUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($video)) {
-                // 保存位置配置 key
-                $disk = 'video';
                 // 检查是否需要保留原文件名
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-
-                // 保存到七牛云
-                if ($save_to == 'qiniu_cloud') {
-                    $disk      = 'video_qiniu';
-                    $storage   = config('filesystem.disks.video_qiniu.path_prefix');
-                }
-                $filename  = Filesystem::disk($disk)->putFile($param['module'], $file, $name_rule());
-
-                // 组装视频路径
-                $video_path = $storage . '/' . $filename;
-                if ($save_to == 'qiniu_cloud') {
-                    $video_path = Filesystem::disk($disk)->url($filename);
-                }
+                $filename  = Filesystem::disk('video')->putFile($param['module'], $file, $name_rule());
 
                 // 保存视频
                 $video              = new SysVideoUploadRecordModel();
                 $video->language_id = request()->lang_id;
                 $video->module      = $param['module'];
-                $video->video_path  = $video_path;
+                $video->video_path  = $filename;
                 $video->file_size   = $file->getSize();
                 $video->file_type   = $file->getOriginalMime();
                 $video->file_md5    = $filemd5;
@@ -386,7 +322,7 @@ class Upload
             }
 
             return success('上传成功', [
-                'path'      => $video->video_path,
+                'path'      => $storage . '/' . $video->video_path,
                 'file_md5'  => $video->file_md5,
                 'file_sha1' => $video->file_sha1
             ]);
@@ -416,42 +352,25 @@ class Upload
                 return error($validate->getError());
             }
 
-            $storage = config('filesystem.disks.public.url');
-
             $filemd5  = $file->md5();
             $filesha1 = $file->sha1();
 
             // 获取附件上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique,
-                'save_to'        => $save_to
+                'filemd5_unique' => $filemd5_unique
             ) = $this->getUploadOptions('upload_attachment');
             // 是否需要根据文件MD5值检查文件是否已存在
             $attachment = $filemd5_unique ? SysAttachmentUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($attachment)) {
-                // 保存位置配置 key
-                $disk = 'public';
                 // 检查是否需要保留原文件名
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
+                $filename  = Filesystem::disk('public')->putFile('attachments', $file, $name_rule());
 
-                // 保存到七牛云
-                if ($save_to == 'qiniu_cloud') {
-                    $disk      = 'public_qiniu';
-                    $storage   = config('filesystem.disks.public_qiniu.path_prefix');
-                }
-                $filename  = Filesystem::disk($disk)->putFile('attachments', $file, $name_rule());
-
-                // 组装附件路径
-                $attachment_path = $storage . '/' . $filename;
-                if ($save_to == 'qiniu_cloud') {
-                    $attachment_path = Filesystem::disk($disk)->url($filename);
-                }
-
-                // 保存附件
+                // 保存视频
                 $attachment                  = new SysAttachmentUploadRecordModel();
                 $attachment->language_id     = request()->lang_id;
-                $attachment->attachment_path = $attachment_path;
+                $attachment->attachment_path = $filename;
                 $attachment->file_size       = $file->getSize();
                 $attachment->file_type       = $file->getOriginalMime();
                 $attachment->file_md5        = $filemd5;
@@ -461,8 +380,9 @@ class Upload
                 }
             }
 
+            $storage = config('filesystem.disks.public.url');
             return success('上传成功', [
-                'path'      => $attachment->attachment_path,
+                'path'      => $storage . '/' . $attachment->attachment_path,
                 'file_md5'  => $attachment->file_md5,
                 'file_sha1' => $attachment->file_sha1
             ]);

app/admin/controller/v1/Video.php

@@ -209,6 +209,9 @@ class Video
         ]);
 
         $domain     = request()->domain();
+        $image_path = Config::get('filesystem.disks.image.url');
+        $video_path = Config::get('filesystem.disks.video.url');
+
         return  VideoModel::withoutField([
                 'language_id',
                 'updated_at',
@@ -227,9 +230,13 @@ class Video
             ->select()
             ->bindAttr('category', ['category_name' => 'name'])
             ->hidden(['category_id', 'category'])
-            ->each(function ($item) use($domain) {
-                $item->image     = !empty($item->image) ? url_join($domain, $item->image) : '';
-                $item->video     = !empty($item->video) ? url_join($domain, $item->video) : '';
+            ->each(function ($item) use($domain, $image_path, $video_path) {
+                if (!empty($item->image)) {
+                    $item->image = $domain . $image_path . '/' . $item->image;
+                }
+                if (!empty($item->video)) {
+                    $item->video = $domain . $video_path . '/' . $item->video;
+                }
                 $item->recommend = $item->recommend == 1 ? '是' : '否';
                 $item->status    = $item->status    == 1 ? '启用' : '禁用';
                 return $item;

app/admin/model/v1/ProductCategoryModel.php

@@ -32,8 +32,7 @@ class ProductCategoryModel extends ProductCategoryBaseModel
     // 所属产品目录分类id查询
     public function scopeTcoId($query, $value)
     {
-        // $query->where('related_tco_category', '=', $value);
-        $query->whereRaw('FIND_IN_SET(:ref_id, related_tco_category)', ['ref_id' => $value]);
+        $query->where('related_tco_category', '=', $value);
     }
 
     /**

app/admin/model/v1/ProductCategoryRecommendModel.php

@@ -1,47 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\admin\model\v1;
-
-use app\common\model\ProductCategoryRecommendBaseModel;
-use think\model\concern\SoftDelete;
-
-/**
- * 产品分类推荐模型
- * @mixin \think\Model
- */
-class ProductCategoryRecommendModel extends ProductCategoryRecommendBaseModel
-{
-    // 启用软件删除
-    use SoftDelete;
-    // 软件删除时间字段
-    protected $deleteTime = 'deleted_at';
-
-    // 关联语言
-    public function language()
-    {
-        return $this->belongsTo(\app\index\model\LanguageModel::class, 'language_id', 'id');
-    }
-
-    // 关联产品分类
-    public function category()
-    {
-        return $this->belongsTo(\app\index\model\ProductCategoryModel::class, 'category_id', 'id');
-    }
-
-    // 所属语言范围查询
-    public function scopeLanguage($query, $language)
-    {
-        $query->where($this->getTable() . '.language_id', '=', $language);
-    }
-
-    // 关键词搜索
-    public function searchKeywordsAttr($query, string|null $keywords)
-    {
-        if (is_null($keywords)) {
-            return;
-        }
-        $query->where($this->getTable() . '.title', 'like', "%{$keywords}%")
-              ->whereOr($this->getTable() . '.desc', 'like', "%{$keywords}%");
-    }
-}

app/admin/model/v1/SysMallStoreEntranceModel.php

@@ -1,61 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\admin\model\v1;
-
-use app\common\model\SysMallStoreEntranceBaseModel;
-use think\model\concern\SoftDelete;
-
-/**
- * 系统商城店铺入口模型
- * @mixin \think\Model
- */
-class SysMallStoreEntranceModel extends SysMallStoreEntranceBaseModel
-{
-    // 启用软删除
-    use SoftDelete;
-    // 软删除字段
-    protected $deleteTime = 'deleted_at';
-
-    // 关联语言
-    public function language()
-    {
-        return $this->belongsTo(\app\index\model\LanguageModel::class, 'language_id', 'id');
-    }
-
-    // 所属语言范围查询
-    public function scopeLanguage($query, $language)
-    {
-        $query->where($this->getTable() . '.language_id', '=', $language);
-    }
-
-    // 查询启用状态
-    public function scopeEnabled($query)
-    {
-        $query->where('disabled', '=', 0);
-    }
-
-    // 查询禁用状态
-    public function scopeDisabled($query)
-    {
-        $query->where('disabled', '=', 1);
-    }
-
-    // 按名称搜索
-    public function searchNameAttr($query, $value, $data)
-    {
-        if (is_null($value)) {
-            return;
-        }
-        $query->where('name', 'like', "%{$value}%");
-    }
-
-    // 按链接地址搜索
-    public function searchLinkAttr($query, $value, $data)
-    {
-        if (is_null($value)) {
-            return;
-        }
-        $query->where('link_url', 'like', "%{$value}%");
-    }
-}

app/admin/route/v1.php

@@ -311,27 +311,6 @@ Route::group('v1', function () {
 
             // 分类删除
             Route::delete('delete/:id', 'ProductCategory/delete');
-
-            // 产品分类推荐数据
-            Route::group('recommend', function () {
-                // 推荐数据分页列表
-                Route::get('index', 'ProductCategoryRecommend/index');
-
-                // 推荐数据导出
-                Route::get('export', 'ProductCategoryRecommend/export');
-
-                // 推荐数据详情
-                Route::get('read/:id', 'ProductCategoryRecommend/read');
-
-                // 推荐数据新增
-                Route::post('save', 'ProductCategoryRecommend/save');
-
-                // 推荐数据更新
-                Route::put('update/:id', 'ProductCategoryRecommend/update');
-
-                // 推荐数据删除
-                Route::delete('delete/:id', 'ProductCategoryRecommend/delete');
-            });
         });
 
         // 产品购买链接
@@ -595,29 +574,6 @@ Route::group('v1', function () {
     // 反馈管理 - 产品询盘列表
     Route::get('product/inquiry/index', 'ProductInquiry/index');
 
-    // 系统商城店铺入口
-    Route::group('mall', function() {
-        Route::group('store', function() {
-            // 店铺入口列表分页
-            Route::get('index', 'SysMallStoreEntrance/index');
-
-            // 店铺入口导出
-            Route::get('export', 'SysMallStoreEntrance/export');
-
-            // 店铺入口详情
-            Route::get('read/:id', 'SysMallStoreEntrance/read');
-
-            // 店铺入口新增
-            Route::post('save', 'SysMallStoreEntrance/save');
-
-            // 店铺入口更新
-            Route::put('update/:id', 'SysMallStoreEntrance/update');
-
-            // 店铺入口删除
-            Route::delete('delete/:id', 'SysMallStoreEntrance/delete');
-        });
-    });
-
     // 配置项列表
     Route::group('config', function() {
         // 配置分组
@@ -660,12 +616,6 @@ Route::group('v1', function () {
     });
 })->prefix('v1.');
 
-// 接收产品目录同步数据
-Route::group('receive_sync', function () {
-    Route::post('category', 'ReceiveProductSync/category');
-    Route::post('product', 'ReceiveProductSync/product');
-});
-
 Route::miss(function() {
     return '404 Not Found!';
 });

app/admin/validate/v1/ArticleCategoryValidate.php

@@ -64,10 +64,7 @@ class ArticleCategoryValidate extends Validate
         if ($value == 0) {
             return true;
         }
-
-        $children   = [];
         $table_name = (new ArticleCategoryModel)->getTable();
-        if (env('DB_VERSION', '5') == '8') {
         $children = Db::query(
             preg_replace(
                 '/\s+/u', 
@@ -80,20 +77,6 @@ class ArticleCategoryValidate extends Validate
                 SELECT id FROM article_tree_by WHERE id <> {$data['id']};"
             )
         );
-        } else {
-            $children = \think\facade\Db::query("
-                SELECT t2.id
-                    FROM ( 
-                        SELECT 
-                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
-                        FROM 
-                            (SELECT @r := {$data['id']}) vars, $table_name h 
-                        WHERE @r <> 0) t1 
-                    JOIN $table_name t2 
-                    ON FIND_IN_SET(t2.pid, t1._id)
-                ORDER BY t2.id;
-            ");
-        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/ArticleValidate.php

@@ -23,9 +23,9 @@ class ArticleValidate extends Validate
         'sort'         => 'integer',
         'recommend'    => 'require|in:0,1',
         'release_time' => 'dateFormat:Y-m-d H:i:s',
-        'seo_title'    => 'max:512',
-        'seo_keywords' => 'max:512',
-        'seo_desc'     => 'max:1024'
+        'seo_title'    => 'max:255',
+        'seo_keywords' => 'max:255',
+        'seo_desc'     => 'max:255'
     ];
 
     /**
@@ -48,8 +48,8 @@ class ArticleValidate extends Validate
         'recommend.require'       => '推荐状态不能为空',
         'recommend.in'            => '推荐状态的值必须是0或1',
         'release_time.dateFormat' => '发布时间格式不正确',
-        'seo_title.max'           => 'SEO标题长度不能超过512个字符',
-        'seo_keywords.max'        => 'SEO关键字长度不能超过512个字符',
-        'seo_desc.max'            => 'SEO描述长度不能超过1024个字符'
+        'seo_title.max'           => 'SEO标题长度不能超过255个字符',
+        'seo_keywords.max'        => 'SEO关键字长度不能超过255个字符',
+        'seo_desc.max'            => 'SEO描述长度不能超过255个字符'
     ];
 }

app/admin/validate/v1/AttachmentCategoryValidate.php

@@ -49,10 +49,7 @@ class AttachmentCategoryValidate extends Validate
         if ($value == 0) {
             return true;
         }
-
-        $children   = [];
         $table_name = (new AttachmentCategoryModel)->getTable();
-        if (env('DB_VERSION', '5') == '8') {
         $children = Db::query(
             preg_replace(
                 '/\s+/u', 
@@ -65,20 +62,6 @@ class AttachmentCategoryValidate extends Validate
                 SELECT id FROM attachment_tree_by WHERE id <> {$data['id']};"
             )
         );
-        } else {
-            $children = \think\facade\Db::query("
-                SELECT t2.id
-                    FROM ( 
-                        SELECT 
-                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
-                        FROM 
-                            (SELECT @r := {$data['id']}) vars, $table_name h 
-                        WHERE @r <> 0) t1 
-                    JOIN $table_name t2 
-                    ON FIND_IN_SET(t2.pid, t1._id)
-                ORDER BY t2.id;
-            ");
-        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/NavigationItemValidate.php

@@ -20,9 +20,7 @@ class NavigationItemValidate extends Validate
         'nav_id'    => 'require|integer',
         'pid'       => 'integer|different:id|checkPidNotBeChildren',
         'name'      => 'require|max:64',
-        'desc'      => 'max:255',
         'icon'      => 'max:64',
-        'image'     => 'max:255',
         'link_to'   => 'require|max:64|in:article,article_category,product,product_category,system_page,custom',
         'link'      => 'max:255',
         'sort'      => 'integer',
@@ -46,9 +44,7 @@ class NavigationItemValidate extends Validate
         'pid.checkPidNotBeChildren' => '父级ID不能为自身的子导航',
         'name.require'              => '导航名称不能为空',
         'name.max'                  => '导航名称最多不能超过64个字符',
-        'desc.max'                  => '导航名称最多不能超过:rule个字符',
         'icon.max'                  => '图标最多不能超过64个字符',
-        'image.max'                 => '图标最多不能超过:rule个字符',
         'link_to.require'           => '链接类型不能为空',
         'link_to.max'               => '链接类型最多不能超过64个字符',
         'link_to.in'                => '链接类型必须是article,article_category,product_category,product,system_page,custom中之一',
@@ -65,10 +61,7 @@ class NavigationItemValidate extends Validate
         if ($value == 0) {
             return true;
         }
-
-        $children   = [];
         $table_name = (new SysNavigationItemModel)->getTable();
-        if (env('DB_VERSION', '5') == '8') {
         $children = Db::query(
             preg_replace(
                 '/\s+/u', 
@@ -81,20 +74,6 @@ class NavigationItemValidate extends Validate
                 SELECT id FROM tree_by WHERE id <> {$data['id']};"
             )
         );
-        } else {
-            $children = \think\facade\Db::query("
-                SELECT t2.id
-                    FROM (
-                        SELECT
-                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
-                        FROM
-                            (SELECT @r := {$data['id']}) vars, $table_name h
-                        WHERE @r <> 0) t1
-                    JOIN $table_name t2
-                    ON FIND_IN_SET(t2.pid, t1._id)
-                ORDER BY t2.id;
-            ");
-        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/ProductCategoryRecommendValidate.php

@@ -1,63 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\admin\validate\v1;
-
-use think\Validate;
-
-class ProductCategoryRecommendValidate extends Validate
-{
-    /**
-     * 定义验证规则
-     * 格式：'字段名' =>  ['规则1','规则2'...]
-     *
-     * @var array
-     */
-    protected $rule = [
-        'language_id' => 'require|integer',
-        'category_id' => 'require|integer',
-        'title'       => 'require|max:255',
-        'image'       => 'require|max:255',
-        'desc'        => 'require|max:255',
-        'link'        => 'max:500',
-        'sort'        => 'require|integer',
-        'disabled'    => 'in:0,1'
-    ];
-
-    /**
-     * 定义错误信息
-     * 格式：'字段名.规则名' =>  '错误信息'
-     *
-     * @var array
-     */
-    protected $message = [
-        'id.require'          => 'ID不能为空',
-        'id.integer'          => 'ID必须是整数',
-        'language_id.require' => '语言ID不能为空',
-        'language_id.integer' => '语言ID必须是整数',
-        'category_id.require' => '分类ID不能为空',
-        'category_id.integer' => '分类ID必须是整数',
-        'title.require'       => '标题不能为空',
-        'title.max'           => '标题长度不能超过:rule个字符',
-        'image.require'       => '图片不能为空',
-        'image.max'           => '图片长度不能超过:rule个字符',
-        'desc.require'        => '描述不能为空',
-        'desc.max'            => '描述长度不能超过:rule个字符',
-        'link.max'            => '链接长度不能超过:rule个字符',
-        'sort.require'        => '排序不能为空',
-        'sort.integer'        => '排序必须是整数',
-        'disabled.in'         => '禁用状态只能是0或1',
-    ];
-
-    // 新增场景
-    protected function sceneCreate()
-    {
-        return $this->remove('id', 'require|integer');
-    }
-
-    // 更新场景
-    protected function sceneUpdate()
-    {
-        return $this->append('id', 'require|integer');
-    }
-}

app/admin/validate/v1/ProductCategoryValidate.php

@@ -23,7 +23,7 @@ class ProductCategoryValidate extends Validate
         'name'                 => 'require|max:64',
         'icon'                 => 'max:125',
         'desc'                 => 'max:255',
-        'related_tco_category' => 'string|checkRelatedTcoCategory',
+        'related_tco_category' => 'integer',
         'sort'                 => 'integer',
         'level'                => 'integer',
         'is_show'              => 'in:0,1',
@@ -51,8 +51,7 @@ class ProductCategoryValidate extends Validate
         'name.max'                     => '名称最多不能超过64个字符',
         'icon.max'                     => '图标最多不能超过125个字符',
         'desc.max'                     => '描述最多不能超过255个字符',
-        'related_tco_category.string'                  => '关联TCO分类格式错误',
-        'related_tco_category.checkRelatedTcoCategory' => '该TCO分类已绑定',
+        'related_tco_category.integer' => '关联TCO分类格式错误',
         'sort.integer'                 => '排序格式错误',
         'level.integer'                => '级别格式错误',
         'is_show.in'                   => '是否显示格式错误',
@@ -85,32 +84,4 @@ class ProductCategoryValidate extends Validate
     {
         return $this->remove('id', 'require|integer')->remove('pid', 'different|checkPidNotBeChildren');
     }
-
-    // 验证related_tco_category
-    protected function checkRelatedTcoCategory($value, $rule, $data = [])
-    {
-        if (empty($value)) {
-            return true;
-        }
-
-        $val = ProductCategoryModel::where(function($query) use($value) {
-            $arr = explode(",", $value);
-            foreach ($arr as $v) {
-                $query->whereFindInSet('related_tco_category', $v, 'OR');
-            }
-        })->column('id');
-        if (!empty($val)) {
-            $size = count($val);
-            // 如果存在超过一个，直接验证失败
-            if ($size > 1) {
-                return false;
-            }
-            // 如果存在一个，并存在的id不为自身，验证失败（考虑更新场景查到自身情况）
-            if ($size == 1 && $val[0] != $data['id']) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 }

app/admin/validate/v1/ProductValidate.php

@@ -5,6 +5,8 @@ namespace app\admin\validate\v1;
 
 use think\Validate;
 
+use function PHPSTORM_META\type;
+
 class ProductValidate extends Validate
 {
     /**

app/admin/validate/v1/SysBannerItemValidate.php

@@ -15,17 +15,17 @@ class SysBannerItemValidate extends Validate
      */
     protected $rule = [
         'id'              => 'require|integer',
-        'banner_id'       => 'require|integer|gt:0',
+        'banner_id'       => 'require|integer',
         'title'           => 'require|max:256',
         'title_txt_color' => 'max:7',
-        'desc'            => 'max:2048',
+        'desc'            => 'max:1024',
         'desc_txt_color'  => 'max:7',
         'type'            => 'in:image,video',
         'image'           => 'max:255',
         'extra_image'     => 'max:255',
         'video'           => 'max:255',
         'link_to'         => 'requireIf:type,image|max:64|in:article,article_category,product,product_category,system_page,custom',
-        'link'            => 'max:510',
+        'link'            => 'max:255',
         'sort'            => 'integer',
         'status'          => 'in:-1,1'
     ];
@@ -41,11 +41,10 @@ class SysBannerItemValidate extends Validate
         'id.integer'          => 'ID必须是整数',
         'banner_id.require'   => '横幅项分类不能为空',
         'banner_id.integer'   => '横幅项分类必须是整数',
-        'banner_id.gt'        => '该横幅分类不可选',
         'title.require'       => '名称不能为空',
         'title.max'           => '名称最多不能超过256个字符',
         'title_txt_color.max' => '名称字体颜色最多不能超过7个字符',
-        'desc.max'            => '描述最多不能超过2048个字符',
+        'desc.max'            => '描述最多不能超过1024个字符',
         'desc_txt_color.max'  => '描述字体颜色最多不能超过7个字符',
         'type.in'             => '显示类型必须是image或video',
         'image.max'           => '图片地址最多不能超过255个字符',
@@ -54,7 +53,7 @@ class SysBannerItemValidate extends Validate
         'link_to.requireIf'   => '链接类型不能为空',
         'link_to.max'         => '链接类型最多不能超过64个字符',
         'link_to.in'          => '链接类型必须是article,article_category,product,product_category,system_page,custom中之一',
-        'link.max'            => '链接最多不能超过512个字符',
+        'link.max'            => '链接最多不能超过255个字符',
         'sort.integer'        => '排序值必须是整数',
         'status.in'           => '状态必须是-1或1'
     ];

app/admin/validate/v1/SysBannerValidate.php

@@ -43,6 +43,7 @@ class SysBannerValidate extends BaseValidate
         'at_platform.in'        => '显示端口只能是pc或mobile',
         'at_page.max'           => '页面位置最多255个字符',
         'unique_label.max'      => '唯一标识最多64个字符',
+        'unique_label.mustOmit' => '更新时不能有unique_label字段',
         'name.require'          => '名称不能为空',
         'name.max'              => '名称最多64个字符',
         'desc.max'              => '描述最多255个字符',
@@ -60,6 +61,6 @@ class SysBannerValidate extends BaseValidate
     // 编辑场景
     public function sceneEdit()
     {
-        return $this->remove('language_id', 'require|integer');
+        return $this->remove('language_id', 'require|integer')->append('unique_label', 'mustOmit');
     }
 }

app/admin/validate/v1/SysMallStoreEntranceValidate.php

@@ -1,61 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\admin\validate\v1;
-
-use think\Validate;
-
-class SysMallStoreEntranceValidate extends Validate
-{
-    /**
-     * 定义验证规则
-     * 格式：'字段名' =>  ['规则1','规则2'...]
-     *
-     * @var array
-     */
-    protected $rule = [
-        'id'          => 'require|integer',
-        'language_id' => 'require|integer',
-        'name'        => 'require|max:255',
-        'image'       => 'require|max:255',
-        'hover_image' => 'max:255',
-        'link'        => 'url|max:500',
-        'sort'        => 'require|integer',
-        'disabled'    => 'in:0,1',
-    ];
-
-    /**
-     * 定义错误信息
-     * 格式：'字段名.规则名' =>  '错误信息'
-     *
-     * @var array
-     */
-    protected $message = [
-        'id.require'            => 'ID不能为空',
-        'id.integer'            => 'ID必须是整数',
-        'language_id.require'   => '语言ID不能为空',
-        'language_id.integer'   => '语言ID必须是整数',
-        'name.require'          => '商城名称不能为空',
-        'name.max'              => '商城名称长度不能超过:rule个字符',
-        'image.require'         => '图片不能为空',
-        'image.max'             => '图片长度不能超过:rule个字符',
-        'hover_image.max'       => '悬浮图长度不能超过:rule个字符',
-        'link.url'              => '链接地址必须是有效的URL',
-        'link.max'              => '链接地址长度不能超过:rule个字符',
-        'sort.require'          => '排序不能为空',
-        'sort.integer'          => '排序必须是整数',
-        'disabled.in'           => '禁用状态只能是0或1',
-    ];
-
-    // 新增场景
-    protected function sceneCreate()
-    {
-        return $this->remove('id', 'require|integer');
-    }
-
-    // 更新场景
-    protected function sceneUpdate()
-    {
-        return $this->append('id', 'require|integer');
-    }
-}

app/admin/validate/v1/SysMenuValidate.php

@@ -74,10 +74,7 @@ class SysMenuValidate extends Validate
         if ($value == 0) {
             return true;
         }
-
-        $children   = [];
         $table_name = (new SysMenuModel)->getTable();
-        if (env('DB_VERSION', '5') == '8') {
         $children = Db::query(
             preg_replace(
                 '/\s+/u', 
@@ -90,20 +87,6 @@ class SysMenuValidate extends Validate
                 SELECT id FROM menu_tree_by WHERE id <> {$data['id']};"
             )
         );
-        } else {
-            $children = \think\facade\Db::query("
-                SELECT t2.id
-                    FROM ( 
-                        SELECT 
-                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
-                        FROM 
-                            (SELECT @r := {$data['id']}) vars, $table_name h 
-                        WHERE @r <> 0) t1 
-                    JOIN $table_name t2 
-                    ON FIND_IN_SET(t2.pid, t1._id)
-                ORDER BY t2.id;
-            ");
-        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/VideoValidate.php

@@ -17,8 +17,8 @@ class VideoValidate extends Validate
         'id'           => 'require|integer',
         'language_id'  => 'require|integer',
         'category_id'  => 'require|integer',
-        'name'         => 'require|max:128',
-        'desc'         => 'max:512',
+        'name'         => 'require|max:64',
+        'desc'         => 'max:255',
         'image'        => 'max:125',
         'video'        => 'max:125',
         'link'         => 'url|max:125',
@@ -43,8 +43,8 @@ class VideoValidate extends Validate
         'category_id.require' => '分类不能为空',
         'category_id.integer' => '分类参数类型错误',
         'name.require'        => '名称不能为空',
-        'name.max'            => '名称不能超过128个字符',
-        'desc.max'            => '描述不能超过512个字符',
+        'name.max'            => '名称不能超过64个字符',
+        'desc.max'            => '描述不能超过255个字符',
         'image.max'           => '图片不能超过125个字符',
         'video.max'           => '视频不能超过125个字符',
         'link.url'            => '链接格式错误',

app/command/DataMigration.php

@@ -61,9 +61,6 @@ class DataMigration extends Command
 
             // 迁移文章
             // $this->migrateArticle([
-            //     16 => 7,
-            //     31 => 9,
-            //     32 => 8,
             //     68 => 10,
             //     69 => 11,
             //     70 => 12,
@@ -293,15 +290,14 @@ class DataMigration extends Command
         $old_db = Db::connect('old');
 
         $success_map = [];
-        $success_arr = []; // include_once(runtime_path() . 'product_success.php');
+        $success_arr = include_once(runtime_path() . 'product_success.php');
         foreach ($success_arr as $so) {
             $success_map['p_' . $so['cod_product_id']] = $so;
         }
 
-        $arr = include_once(runtime_path() . 'product_ids.php');
         $products = $old_db->name('product')
             ->where('country_code', 'in', ['ZH', 'US'])
-            ->where('id', 'in', array_unique(array_column($arr, 'cod_product_id')))
+            ->where('id', '>', 15789)
             ->order(['id' => 'asc'])
             ->cursor();
 
@@ -378,16 +374,7 @@ class DataMigration extends Command
                     'deleted_at'   => $v['stat'] == -1 ? date('Y-m-d H:i:s') : null,
                 ];
                 // 保存产品数据
-                $prod = Db::name('product')
-                    ->where('language_id', '=', $item['language_id'])
-                    ->where('spu', '=', $item['spu'])
-                    ->find();
-                if (!empty($prod)) {
-                    $id = $prod['id'];
-                    Db::name('product')->where('id', '=', $prod['id'])->update($item);
-                } else {
                 $id = Db::name('product')->insertGetId($item);
-                }
 
                 // 保存产品参数数据
                 if (!empty($v['product_view'])) {
@@ -400,21 +387,7 @@ class DataMigration extends Command
                             'value'      => $p['desc_desc']
                         ];
                     }
-                    $old_params = Db::name('product_params')
-                        ->where('product_id', '=', $id)
-                        ->select();
-                    if ($old_params->isEmpty()) {
                     Db::name('product_params')->insertAll($prarms);
-                    } else {
-                        foreach ($old_params as $op) {
-                            Db::name('product_params')
-                                ->where('product_id', '=', $id)
-                                ->where('name', '=', $op['name'])
-                                ->update([
-                                    'value' => $op['value']
-                                ]);
-                        }
-                    }
                 }
 
                 // 保存sku数据
@@ -471,7 +444,7 @@ class DataMigration extends Command
                                 if ($k != 'sort') {
                                     $attr_value = $at;
                                     if (in_array($k, ['颜色', 'Color'])) {
-                                        // if ($k == 'Color') $k = '颜色';
+                                        if ($k == 'Color') $k = '颜色';
                                         $attr_value = '/static/common/images/colors/' . $at . '.png';
                                     }
                                     $images[$pkey]['color'] = $at;
@@ -495,7 +468,7 @@ class DataMigration extends Command
                             }
                         }
                         $attr_arr = [
-                            'attr_id'    => $attrs_map[$v['country_code']][$v['country_code'] == 'ZH' ? '颜色' : 'Color'],
+                            'attr_id'    => $attrs_map[$v['country_code']]['颜色'],
                             'attr_value' => $attr_value,
                         ];
                         if (
@@ -541,7 +514,7 @@ class DataMigration extends Command
                     $skus[] = [
                         'main_image' => $ti['image_url'],
                         'attrs' => [[
-                            'attr_id'    => $attrs_map[$v['country_code']][$v['country_code'] == 'ZH' ? '颜色' : 'Color'],
+                            'attr_id'    => $attrs_map[$v['country_code']]['颜色'],
                             'attr_value' => $ti['image_color'],
                         ]],
                         'pkey'      => $tpkey
@@ -602,7 +575,6 @@ class DataMigration extends Command
                 }
 
                 foreach ($skus as $sku) {
-                    Db::name('product_sku')->where('product_id', '=', $sku['product_id'])->delete();
                     $sku_id = Db::name('product_sku')->insertGetId([
                         'product_id'  => $sku['product_id'],
                         'sku'         => $sku['sku']??'',
@@ -612,7 +584,6 @@ class DataMigration extends Command
                     if (!empty($sku['attrs'])) {
                         foreach ($sku['attrs'] as $attr) {
                             if (!empty($sku_id)) {
-                                Db::name('product_sku_attr')->where('sku_id', '=', $sku_id)->delete();
                                 Db::name('product_sku_attr')->insert([
                                     'sku_id'     => $sku_id,
                                     'attr_id'    => $attr['attr_id'],
@@ -630,7 +601,7 @@ class DataMigration extends Command
                     sprintf('["ow_product_id" => %d, "cod_product_id" => %d]'.PHP_EOL, $id, $v['id']),
                     FILE_APPEND
                 );
-                $this->println(sprintf('迁移产品ID：%s => %s 【耗时：%s】', $v['id'], $id, round(microtime(true) - $start, 2) . 's'));
+                $this->println(sprintf('迁移产品ID：%s => %s 【耗时：%s】', $v['id'], 0, round(microtime(true) - $start, 2) . 's'));
             } catch (\Throwable $th) {
                 Db::rollback();
                 file_put_contents(
@@ -723,12 +694,9 @@ class DataMigration extends Command
             throw new \Exception('请确认分类ID');
         }
 
-        // 1634
         $article = Db::connect('old')
             ->name('article')
-            ->where('country_code', 'in', ['ZH', 'US'])
             ->where('cid', 'in', array_keys($category_map))
-            ->where('id', '=', 351)
             ->order(['id' => 'asc'])
             ->cursor();
 
@@ -777,16 +745,7 @@ class DataMigration extends Command
                 'release_time' => date('Y-m-d H:i:s', $v['createtime']),
                 'deleted_at'   => $v['stat'] == -1 ? date('Y-m-d H:i:s') : null
             ];
-            $ret = Db::name('article')
-                ->where('language_id', '=', $item['language_id'])
-                ->where('title', '=', $item['title'])
-                ->find();
-            if (empty($ret)) {
             $id = Db::name('article')->insertGetId($item);
-            } else {
-                $id = $ret['id'];
-                Db::name('article')->where('id', '=', $ret['id'])->update($item);
-            }
 
             $this->println(sprintf('迁移文章ID：%s => %s', $v['id'], $id));
         }
@@ -820,15 +779,7 @@ class DataMigration extends Command
                 'recommend'   => $val['is_home'],
                 'sort'        => $val['sort'] == 9999 ? 0 : $val['sort']
             ];
-            $ret = Db::name('faq')
-                ->where('language_id', '=', $item['language_id'])
-                ->where('question', '=', $item['question'])
-                ->find();
-            if (empty($ret)) {
             Db::name('faq')->insert($item);
-            } else {
-                Db::name('faq')->where('id', '=', $ret['id'])->update($item);
-            }
         }
     }
 
@@ -930,8 +881,7 @@ class DataMigration extends Command
     {
         $videos = Db::connect('old')
             ->name('video')
-            // ->where('id', '>', 844)
-            ->where('cid', 'in', array_keys($category_map))
+            ->where('id', '>', 844)
             ->where('country_code', 'in', ['ZH', 'US'])
             ->order(['id' => 'asc'])
             ->cursor();
@@ -971,16 +921,7 @@ class DataMigration extends Command
                 'seo_desc'         => $val['seo_description'],
                 'deleted_at'       => $val['stat'] == -1 ? date('Y-m-d H:i:s') : null
             ];
-            $ret = Db::name('video')
-                ->where('language_id', '=', $item['language_id'])
-                ->where('name', '=', $item['name'])
-                ->find();
-            if (empty($ret)) {
             Db::name('video')->insert($item);
-            } else {
-                Db::name('video')->where('id', '=', $ret['id'])->update($item);
-            }
-            
             $this->println('迁移视频ID：' . $val['id']);
         }
     }
@@ -988,7 +929,7 @@ class DataMigration extends Command
 
 class UploadMannager
 {
-    const   UPLOAD_BASE_API    = 'http://ow.f2b211.com';
+    const   UPLOAD_BASE_API    = 'http://dev.ow.f2b211.com';
     const   DOWNLOAD_BASE_API  = 'http://www.orico.com.cn';
     const   DOWNLOAD_TEMP_PATH = '/var/www/html/orico-official-website/public/migrate_temp_images';
     private $username          = 'admin';
@@ -1001,7 +942,7 @@ class UploadMannager
     {
         // 登录获取token
         $this->token = $this->getAuthorization();
-        $this->maps = []; // include_once(runtime_path() . 'fiber_product_image_mapping.php');
+        $this->maps = include_once(runtime_path() . 'fiber_product_image_mapping.php');
     }
 
     // 下载图片
@@ -1121,7 +1062,6 @@ class UploadMannager
             print($http_code . PHP_EOL);
         }
 
-        file_put_contents(runtime_path() . 'upload.txt', $response . PHP_EOL, FILE_APPEND);
         $ret = json_decode($response, true);
         if (empty($ret)) {
             throw new \Exception($response);

app/command/OpenApiMgr/AddClient.php

@@ -1,42 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\command\OpenApiMgr;
-
-use oauth\OAuthStorage;
-use think\console\Command;
-use think\console\Input;
-use think\console\input\Argument;
-use think\console\input\Option;
-use think\console\Output;
-
-class AddClient extends Command
-{
-    protected function configure()
-    {
-        // 指令配置
-        $this->setName('OpenApiMgr:AddClient')
-            ->addArgument('salt', Argument::OPTIONAL, "开放API的client_secret密钥的盐值")
-            ->setDescription('开放API的client管理');
-    }
-
-    protected function execute(Input $input, Output $output)
-    {
-        $salt = $input->getArgument('salt');
-        $salt = empty($salt) ? null : trim($salt);
-
-        // 指令输出
-        $oauth = new OAuthStorage($salt);
-
-        $client_id = random_str(13, 'all', 0);
-        $client_secret = random_str(32, 'all', 0);
-        
-        $ok = $oauth->addClient($client_id, $client_secret, null);
-        if (!$ok) { 
-            $output->writeln("添加失败");
-            return;
-        }
-
-        $output->writeln("添加成功:\nClientID: {$client_id}\nClientSecret: {$client_secret}\n");
-    }
-}

app/common.php

@@ -80,7 +80,7 @@ if (!function_exists('array_to_tree')) {
      * @param bool $keep_pid 是否保留pid
      * @return array
      */
-    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true, $with_ref = 'id')
+    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true)
     {
         $ret = [];
         foreach ($data as $item) {
@@ -93,7 +93,7 @@ if (!function_exists('array_to_tree')) {
                 if ($keep_pid === false) {
                     unset($item[$with]);
                 }
-                $children = array_to_tree($data, $item[$with_ref], $with, $lv, $keep_pid, $with_ref);
+                $children = array_to_tree($data, $item['id'], $with, $lv, $keep_pid);
                 if ($children) {
                     $item['children'] = $children;
                 }
@@ -145,90 +145,3 @@ if (!function_exists('thumb')) {
         return mb_substr($url, 0, $idx, 'utf-8') . '_thumb' . mb_substr($url, $idx, $len - $idx, 'utf-8');
     }
 }
-
-if (!function_exists('get_filesystem_url')) {
-    /**
-     * 获取文件系统的访问 URL
-     * @param string $url 文件地址
-     * @param string $disk 磁盘配置 key
-     * @return string
-     */
-    function get_filesystem_url(string|null $url, string $disk): string
-    {
-        if (is_null($url)) {
-            return '';
-        }
-
-        if (\think\helper\Str::startsWith($url, ['http://', 'https://', '//'])) {
-            return $url;
-        }
-        if (empty($disk)) {
-            return '';
-        }
-        return \think\facade\Filesystem::disk($disk)->url($url);
-    }
-}
-
-if (!function_exists('url_filesystem_detect')) {
-    /**
-     * 检测文件地址并根据情况转换为文件系统地址
-     * @param string $url 文件地址
-     * @return string
-     */
-    function url_filesystem_detect(string|null $url): string
-    {
-        if  (is_null($url)) {
-            return '';
-        }
-
-        $idx = strrpos($url, '.');
-        if ($idx === false) {
-            return $url;
-        }
-
-        $disks = [
-            'public_qiniu' => '_' . base64_encode('public_qiniu'),
-            'video_qiniu'  => '_' . base64_encode('video_qiniu')
-        ];
-        foreach ($disks as $disk => $marker) {
-            if (str_ends_with(mb_substr($url, 0, $idx), $marker)) {
-                return get_filesystem_url($url, $disk);
-            }
-        }
-
-        return $url;
-    }
-}
-
-if (!function_exists('url_join')) {
-    /**
-     * 合并URL
-     * @param string $url 基础URL
-     * @param string $path 路径
-     * @param bool $remove_slash 是否移除首尾的斜杠
-     * @return string
-     */
-    function url_join(string $url, string $path, bool $remove_slash = true): string
-    {
-        if (empty($url)) {
-            return $path;
-        }
-        if (empty($path)) {
-            return $url;
-        }
-        if (\think\helper\Str::startsWith($path, ['http://', 'https://', '//'])) {
-            return $path;
-        }
-        
-        if ($remove_slash) {
-            if (str_ends_with($url, '/') && str_starts_with($path, '/')) {
-                return $url . substr($path, 1);
-            }
-            if (!str_ends_with($url, '/') && !str_starts_with($path, '/')) {
-                return $url . '/' . $path;
-            }
-        }
-
-        return $url . $path;
-    }
-}

app/common/model/ProductCategoryRecommendBaseModel.php

@@ -1,33 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\common\model;
-
-/**
- * 产品分类推荐模型
- * @mixin \think\Model
- */
-class ProductCategoryRecommendBaseModel extends BaseModel
-{
-    // 表名
-    protected $name = 'product_category_recommend';
-
-    // 主键
-    protected $pk = 'id';
-
-    // 字段信息
-    protected $schema = [
-        'id'          => 'int',
-        'language_id' => 'int',
-        'category_id' => 'int',
-        'title'       => 'string',
-        'image'       => 'string',
-        'desc'        => 'string',
-        'link'        => 'string',
-        'sort'        => 'int',
-        'disabled'    => 'int',
-        'created_at'  => 'datetime',
-        'updated_at'  => 'datetime',
-        'deleted_at'  => 'datetime'
-    ];
-}

app/common/model/SysBannerItemBaseModel.php

@@ -21,8 +21,6 @@ class SysBannerItemBaseModel extends BaseModel
         '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',

app/common/model/SysMallStoreEntranceBaseModel.php

@@ -1,32 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\common\model;
-
-/**
- * 系统商城店铺入口模型
- * @mixin \think\Model
- */
-class SysMallStoreEntranceBaseModel extends BaseModel
-{
-    // 表名
-    protected $name = 'sys_mall_store_entrance';
-
-    // 主键
-    protected $pk = 'id';
-
-    // 字段信息
-    protected $schema = [
-        'id'           => 'int',
-        'language_id'  => 'int',
-        'name'         => 'string',
-        'image'        => 'string',
-        'hover_image'  => 'string',
-        'link'         => 'string',
-        'sort'         => 'int',
-        'disabled'     => 'int',
-        'created_at'   => 'datetime',
-        'updated_at'   => 'datetime',
-        'deleted_at'   => 'datetime',
-    ];
-}

app/common/model/SysNavigationItemBaseModel.php

@@ -21,9 +21,7 @@ class SysNavigationItemBaseModel extends BaseModel
         'nav_id'     => 'int',
         'pid'        => 'int',
         'name'       => 'string',
-        'desc'       => 'string',
         'icon'       => 'string',
-        'image'      => 'string',
         'link_to'    => 'string',
         'link'       => 'string',
         'sort'       => 'int',

app/common/model/SysRoleAuthorityBaseModel.php

@@ -18,6 +18,6 @@ class SysRoleAuthorityBaseModel extends Model
     protected $schema = [
         'role_id' => 'int',
         'menu_id' => 'int',
-        'permission' => 'string',
+        'permission' => 'int',
     ];
 }

app/index/common.php

@@ -194,14 +194,14 @@ if (!function_exists('get_platform')) {
         } else {
             // 在非移动端环境，根据配置规则判断是否要显示移动端
             $view_cfg = $view_cfg = [
-                'rule'  => env('INDEX_VIEW_TPL.RULE', 'query'),
+                'rule'  => env('VIEW_TPL.RULE', 'query'),
                 'query' => [
-                    'name'  => env('INDEX_VIEW_TPL.RULE_QUERY_NAME', 'mtpl'),
-                    'value' => env('INDEX_VIEW_TPL.RULE_QUERY_VALUE', '1'),
+                    'name'  => env('VIEW_TPL.RULE_QUERY_NAME', 'mtpl'),
+                    'value' => env('VIEW_TPL.RULE_QUERY_VALUE', '1'),
                 ],
                 'domain' => [
-                    'scheme' => env('INDEX_VIEW_TPL.RULE_DOMAIN_SCHEME', ['http']),
-                    'host'   => env('INDEX_VIEW_TPL.RULE_DOMAIN_HOST'),
+                    'scheme' => env('VIEW_TPL.RULE_DOMAIN_SCHEME', ['http']),
+                    'host'   => env('VIEW_TPL.RULE_DOMAIN_HOST'),
                 ],
             ];
             if ($view_cfg['rule'] == 'query') {
@@ -226,18 +226,18 @@ if (!function_exists('get_platform')) {
 if (!function_exists('highlight_keywords')) {
     /**
      * 高亮关键词
-     * @param string $text // 要处理的文本
-     * @param string $keyword // 关键词
-     * @param string|callable $repalce // 替换函数或字符串
+     * @param string $item
+     * @param string $keywords
+     * @param array $class
      * @return string
      */
-    function highlight_keywords(string $text, string $keyword, string|callable $replace): string
+    function highlight_keywords(string $text, string $keywords, array $class=[]): string
     {
-        return preg_replace_callback('/' . preg_quote($keyword, '/') . '+/i', function($match) use($text, $replace) {
-            if (empty($match)) return $text;
-            if (is_string($replace)) return '<strong>' . $match[0] . '</strong>';
-            if (is_callable($replace)) return $replace($match[0]);
-            return $match[0];
+        return preg_replace_callback('/' . preg_quote($keywords, '/') . '+/i', function($match) use($text, $class) {
+            if (empty($match)) {
+                return $text;
+            }
+            return '<strong class="' . implode(' ', $class) .  '">' . $match[0] . '</strong>';
         }, $text);
     }
 }

app/index/controller/Article.php

@@ -170,9 +170,9 @@ class Article extends Common
         ]);
         $ret = ArticleLeaveMessageModel::create($data);
         if ($ret->isEmpty()) {
-            return error(lang('信息提交失败！'));
+            return error(lang('留言提交失败'));
         }
 
-        return success(lang('信息已成功提交！'));
+        return success(lang('留言提交成功'));
     }
 }

app/index/controller/Attachment.php

@@ -21,7 +21,7 @@ class Attachment extends Common
     {
         $param = request()->param([
             'id',
-            'keyword' => '',
+            'keyword',
             'page/d' => 1,
             'size/d' => 12,
         ]);
@@ -48,9 +48,9 @@ class Attachment extends Common
                 'support_platform',
                 'attach',
             ])
-            ->withSearch(['name'], ['name' => !empty($param['keyword']) ? trim($param['keyword']) : null])
+            ->withSearch(['name'], ['name' => $param['keyword']??null])
             ->language($this->lang_id)
-            ->category(!empty($param['id']) ? $param['id'] : $categorys[0]['id']??null)
+            ->category($param['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
@@ -59,16 +59,6 @@ class Attachment extends Common
                     'id' => $param['id']??null
                 ]
             ]);
-        if (!$attachements->isEmpty()) {
-            $attachements->each(function($item) {
-                if (is_array($item->attach)) {
-                    $item->attach = array_map(function($v) {
-                        $v['file_path'] = url_filesystem_detect($v['file_path']);
-                        return $v;
-                    }, $item->attach);
-                }
-            });
-        }
         View::assign('attachements', $attachements);
         View::assign('page', $attachements->render());
 
@@ -119,9 +109,9 @@ class Attachment extends Common
                 'video',
                 'link'
             ])
-            ->withSearch(['name'], ['name' => !empty($param['keyword']) ? trim($param['keyword']) : null])
+            ->withSearch(['name'], ['name' => $param['keyword']??null])
             ->language($this->lang_id)
-            ->category(!empty($param['id']) ? $param['id'] : $video_categorys[0]['id']??null)
+            ->category($param['id']??$video_categorys[0]['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
@@ -132,9 +122,6 @@ class Attachment extends Common
             ]);
         
         if (!$videos->isEmpty()) {
-            $videos->each(function($item) {
-                $item->video = url_filesystem_detect($item->video);
-            });
             $videos->setCollection($videos->getCollection()->chunk(2));
         }
         View::assign('videos', $videos);

app/index/controller/Common.php

@@ -8,7 +8,6 @@ use app\index\model\LanguageModel;
 use app\index\model\ProductCategoryModel;
 use app\index\model\ProductModel;
 use app\index\model\SysConfigModel;
-use app\index\model\SysMallStoreEntranceModel;
 use app\index\model\SysNavigationItemModel;
 use think\facade\Lang;
 use think\facade\View;
@@ -39,7 +38,7 @@ abstract class Common extends BaseController
         }
 
         // 获取产品分类
-        $categorys = $this->getProductCategory($this->lang_id, true);
+        $categorys = $this->getProductCategory($this->lang_id);
         // 输出产品分类
         View::assign('header_categorys', $categorys);
 
@@ -48,9 +47,6 @@ abstract class Common extends BaseController
         // 输出热销产品
         View::assign('header_hot_products', $hot_products);
 
-        // 获取商品购买入口
-        View::assign("header_mall_entrance", $this->getMallStoreEntrance($this->lang_id));
-
         // 输出顶部导航
         View::assign('header_navigation', $this->getNavigation('NAV_67f3701f3e831', $this->lang_id));
 
@@ -82,7 +78,7 @@ abstract class Common extends BaseController
     }
 
     // 获取产品分类
-    protected function getProductCategory($language = 1, $with_recommends = false)
+    protected function getProductCategory($language = 1)
     {
         $categorys = ProductCategoryModel::field([
                 'id',
@@ -91,48 +87,15 @@ abstract class Common extends BaseController
                 'icon',
                 'level'
             ])
-            ->when($with_recommends, function($query) {
-                $query->with(['recommends' => function($query) {
-                    $query->field(['id', 'category_id', 'title', 'image', 'desc', 'link'])->disabled(false)
-                        ->order(['sort' => 'asc', 'id' => 'desc']);
-                }]);
-            })
             ->language($language)
             ->displayed()
             ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->select()
-            ->hidden(["recommends.category_id"]);
+            ->select();
         if ($categorys->isEmpty()) {
             return [];
         }
 
-        return $this->toTreeAndChunk($categorys->toArray(), 0, 1);
-    }
-    private function toTreeAndChunk(array $categorys, int $pid, int|bool $level): array
-    {
-        $ret = [];
-        foreach ($categorys as $item) {
-            if ($item['pid'] == $pid) {
-                $lv = $level;
-                if ($level !== false) {
-                    $item['level'] = $level;
-                    $lv            = $level + 1;
-                }
-                $children = $this->toTreeAndChunk($categorys, $item['id'], $lv);
-                if (!empty($children)) {
-                    if ($lv == 1) {
-                        $item['children'] = array_chunk($children, 2);
-                    } else if ($lv == 2) {
-                        $item['children'] = array_chunk($children, 3);
-                    } else {
-                        $item['children'] = $children;
-                    }
-                }
-                $ret[] = $item;
-            }
-        }
-
-        return $ret;
+        return array_to_tree($categorys->toArray(), 0, 'pid', 1, false);
     }
 
     // 获取顶部导航
@@ -143,7 +106,6 @@ abstract class Common extends BaseController
                 'language_id'  =>  $language,
                 'status'       => 1
             ])
-            ->where('status', '=', 1)
             ->order(['sort' => 'asc', 'id' => 'asc'])
             ->select();
         if ($nav->isEmpty()) {
@@ -201,26 +163,6 @@ abstract class Common extends BaseController
         return $languages;
     }
 
-    // 获取商品购买入口
-    private function getMallStoreEntrance($language = 1)
-    {
-        return SysMallStoreEntranceModel::field([
-                'id',
-                'name',
-                'image',
-                'hover_image',
-                'link'
-            ])
-            ->language($language)
-            ->enabled()
-            ->order(['sort' => 'asc', 'id' => 'desc'])
-            ->select()
-            ?->each(function($item) {
-                $item->image = thumb($item->image);
-                return $item;
-            });
-    }
-
     // 获取系统联系方式配置
     protected function getSysConfig($language, $group = [])
     {

app/index/controller/Product.php

@@ -104,7 +104,7 @@ class Product extends Common
                     ->onSale(true)
                     ->onShelves(true)
                     ->append(['p' => $list[0]['id']])
-                    ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
                     ->limit(5)
                     ->buildSql();
                 $query = \think\facade\Db::table("($sql) as a");
@@ -126,7 +126,7 @@ class Product extends Common
                         ->enabled(true)
                         ->onSale(true)
                         ->onShelves(true)
-                        ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+                        ->order(['sort' => 'asc', 'id' => 'desc'])
                         ->limit(5);
                     });
                 }
@@ -192,7 +192,7 @@ class Product extends Common
                 ->enabled(true)
                 ->onSale(true)
                 ->onShelves(true)
-                ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+                ->order(['sort' => 'asc', 'id' => 'desc'])
                 ->select();
             if (!$products->isEmpty()) {
                 // 获取sku信息
@@ -267,59 +267,6 @@ class Product extends Common
         return View::fetch('subcategory');
     }
 
-
-    /**
-     * 单纯分类页
-     */
-    public function classify()
-    {
-        $pid    = request()->param('id/d', 0);
-
-        // 获取当前选中的父分类
-        $parent = ProductCategoryModel::field(['id', 'name'])->find($pid);
-        View::assign('parent', $parent);
-
-        // 获取分类及产品信息
-        $categorys = ProductCategoryModel::field(['id', 'pid', 'name', 'path', 'level'])
-            ->language($this->lang_id)
-            ->displayed(true)
-            ->children($pid)
-            ->order(['pid' => 'asc', 'sort' => 'asc', 'id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        // 组装第三级分类所属产品数据
-        $lv3_id_arr = array_column(array_filter($categorys, fn($item)=> $item['level'] === 3), 'id');
-        $products   = ProductModel::field([
-                'id',
-                'category_id',
-                'name',
-                'short_name',
-                'cover_image',
-                'spu'
-            ])
-            ->byCategory($lv3_id_arr)
-            ->language($this->lang_id)
-            ->enabled(true)
-            ->onSale(true)
-            ->onShelves(true)
-            ->select()
-            ->toArray();
-        $product_groups = [];
-        foreach ($products as $product) {
-            $product_groups[$product['category_id']][] = $product;
-        }
-        foreach ($categorys as $key => $category) {
-            if ($category['level'] < 3) continue;
-            $categorys[$key]['products'] = $product_groups[$category['id']] ?? [];
-        }
-
-        $tree = array_to_tree($categorys, $pid);
-        View::assign('categorys', $tree);
-
-        return View::fetch('classify');
-    }
-
     /**
      * 产品搜索
      */
@@ -330,7 +277,7 @@ class Product extends Common
             'page/d' => 1,
             'size/d' => 10
         ]);
-        $keywords = !empty($param['keywords']) ? trim($param['keywords']) : '';
+        $keywords = $param['keywords'] ?? '';
 
         // 关键词搜索
         $products = ProductModel::field([
@@ -352,10 +299,9 @@ class Product extends Common
                 'query'     => request()->param()
             ])
             ->each(function ($item) use($keywords) {
-                $replace            = fn($txt) => '<strong class="redpoint">' . $txt . '</strong>';
-                $item['spu']        = highlight_keywords($item['spu'], $keywords, $replace);
-                $item['name']       = highlight_keywords($item['name'], $keywords, $replace);
-                $item['short_name'] = highlight_keywords($item['short_name'], $keywords, $replace);
+                $item['spu']        = highlight_keywords($item['spu'], $keywords, ['redpoint']);
+                $item['name']       = highlight_keywords($item['name'], $keywords, ['redpoint']);
+                $item['short_name'] = highlight_keywords($item['short_name'], $keywords, ['redpoint']);
                 return $item;
             });
         View::assign('products', $products);
@@ -449,11 +395,8 @@ class Product extends Common
                 ->order(['sort' => 'asc', 'id' => 'desc'])
                 ->select()
                 ->hidden(['platform'])
-                ->bindAttr('platform', ['platform_name' => 'platform', 'platform_sort' => 'sort'])
+                ->bindAttr('platform', ['platform_name' => 'platform'])
                 ->toArray();
-            // 根据购买链接平台排序
-            $sort_by_arr = array_column($product_purchase_links, 'platform_sort');
-            array_multisort($sort_by_arr, SORT_ASC, $product_purchase_links);
 
             // 获取相关产品信息
             $related = ProductRelatedModel::with(['product' => function($query) {

app/index/controller/TopicLaptop.php

@@ -1,104 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\controller;
-
-use app\index\model\SysBannerModel;
-use think\facade\View;
-
-class TopicLaptop extends Common
-{
-    /**
-     * 专题 - 笔记本电脑首页
-     */
-    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_693a268c8aa5f', // 专题 - 笔记本首页 - 焦点图
-                'BANNER_693a26b1ad252', // 专题 - 笔记本首页 - 性能介绍
-                'BANNER_693a27b767c8c', // 专题 - 笔记本首页 - CPU介绍
-                'BANNER_693a28740b8a7', // 专题 - 笔记本首页 - 显卡介绍
-                'BANNER_693a28aa8412d', // 专题 - 笔记本首页 - 运行内存介绍
-                'BANNER_693a29009fa72', // 专题 - 笔记本首页 - 硬盘介绍
-                'BANNER_693a29263c609', // 专题 - 笔记本首页 - 散热系统介绍
-                'BANNER_693a2959958bc', // 专题 - 笔记本首页 - 行业App运行介绍
-                'BANNER_693a298342b38', // 专题 - 笔记本首页 - 柔光屏介绍
-                'BANNER_693a2ad31fbe8', // 专题 - 笔记本首页 - 色域介绍
-                'BANNER_693a2b0327ac3', // 专题 - 笔记本首页 - 防眩光介绍
-                'BANNER_693a2cc70c762', // 专题 - 笔记本首页 - 外形质感介绍
-                'BANNER_693a2d3113d14', // 专题 - 笔记本首页 - 网卡介绍
-                'BANNER_693a2d53ac247', // 专题 - 笔记本首页 - 电池续航介绍
-                'BANNER_693a2d7f5fa21', // 专题 - 笔记本首页 - 接口介绍
-                'BANNER_693a2f2114eb3', // 专题 - 笔记本首页 - 使用场景焦点图
-                'BANNER_693a2f92baaa3', // 专题 - 笔记本首页 - 摄像头/麦克风/安全介绍
-                'BANNER_693a2fad26f55', // 专题 - 笔记本首页 - 系统预装介绍
-                'BANNER_693a2ff4629bd', // 专题 - 笔记本首页 - 产品检测介绍
-                'BANNER_693a30e9e4572', // 专题 - 笔记本首页 - 网页脚注
-            ])
-            ->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;
-            }
-
-            // 焦点图轮播图
-            $data['top_focus_images'] = data_get($banners_map, 'BANNER_693a268c8aa5f')?->items->toArray();
-            // 性能介绍
-            $data['perf'] = data_get($banners_map, 'BANNER_693a26b1ad252')?->items->toArray();
-            // CPU介绍
-            $data['cpu'] = data_get($banners_map, 'BANNER_693a27b767c8c')?->items->toArray();
-            // 显卡介绍
-            $data['gpu'] = data_get($banners_map, 'BANNER_693a28740b8a7')?->items->toArray();
-            // 运行内存介绍
-            $data['ram'] = data_get($banners_map, 'BANNER_693a28aa8412d')?->items->first()?->toArray();
-            // 硬盘介绍
-            $data['hard_drive'] = data_get($banners_map, 'BANNER_693a29009fa72')?->items->toArray();
-            // 散热系统介绍
-            $data['cooling_system'] = data_get($banners_map, 'BANNER_693a29263c609')?->items->toArray();
-            // 行业App运行介绍
-            $data['apps'] = data_get($banners_map, 'BANNER_693a2959958bc')?->items->first()?->toArray();
-            // 柔光屏介绍
-            $data['screen_soft_light'] = data_get($banners_map, 'BANNER_693a298342b38')?->items->toArray();
-            // 色域介绍
-            $data['screen_color_gamut'] = data_get($banners_map, 'BANNER_693a2ad31fbe8')?->items->toArray();
-            // 防眩光介绍
-            $data['screen_anti_glare'] = data_get($banners_map, 'BANNER_693a2b0327ac3')?->items->toArray();
-            // 外形质感介绍
-            $data['exterior_texture'] = data_get($banners_map, 'BANNER_693a2cc70c762')?->items->toArray();
-            // 网卡介绍
-            $data['network_card'] = data_get($banners_map, 'BANNER_693a2d3113d14')?->items->toArray();
-            // 电池续航介绍
-            $data['battery_life'] = data_get($banners_map, 'BANNER_693a2d53ac247')?->items->toArray();
-            // 接口介绍
-            $data['interface'] = data_get($banners_map, 'BANNER_693a2d7f5fa21')?->items->toArray();
-            // 使用场景焦点图
-            $data['scene_focus_images'] = data_get($banners_map, 'BANNER_693a2f2114eb3')?->items->toArray();
-            // 摄像头/麦克风/安全介绍
-            $data['camare_microphone_security'] = data_get($banners_map, 'BANNER_693a2f92baaa3')?->items->toArray();
-            // 系统预装介绍
-            $data['unified_preinstall'] = data_get($banners_map, 'BANNER_693a2fad26f55')?->items->first()?->toArray();
-            // 产品检测介绍
-            $data['product_testing'] = data_get($banners_map, 'BANNER_693a2ff4629bd')?->items->toArray();
-            // 网页脚注
-            $data['webpage_footnotes'] = data_get($banners_map, 'BANNER_693a30e9e4572')?->items->first()?->toArray();
-        }
-        View::assign('data', $data);
-
-        return View::fetch('index');
-    }
-}

app/index/controller/TopicNas.php

@@ -192,8 +192,6 @@ class TopicNas extends Common
     {
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
-        $parent_two = ArticleCategoryModel::parent($parent)->language($this->lang_id)->column('id');//二级分类id
-        array_push($parent_two,$parent);
         $article_categorys = ArticleCategoryModel::with(['article' => function($query) {
                 $query->field(['id', 'title', 'category_id'])
                     ->order(['sort' => 'asc', 'id' => 'desc'])
@@ -201,48 +199,14 @@ class TopicNas extends Common
             }])
             ->field([
                 'id',
-                'pid',
                 'name',
                 'icon'
             ])
             ->language($this->lang_id)
-//            ->parent($parent)
-            ->parentChild($parent_two)
+            ->parent($parent)
             ->isShow(true)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
-        //查询三级分类
-        $article_categorys_new = [];
-        $article_categorys_two = [];
-//        dump($article_categorys->toArray());exit;
-        if (!$article_categorys->isEmpty()) {
-            foreach ($article_categorys->toArray() as $kk=>$vv) {
-                if ( $parent == $vv['pid'] ) {
-                    array_push($article_categorys_new,$vv);
-                } else {
-                    $article_categorys_two[$vv['pid']][] = $vv;
-                }
-            }
-            if ( !empty($article_categorys_two) ) {
-                foreach ($article_categorys_new as &$vvv) {
-                    $articles = $vvv['article'];
-                    if ( isset($article_categorys_two[$vvv['id']]) ) {
-                        foreach ($article_categorys_two[$vvv['id']] as $v) {
-                            foreach ($v['article'] as $av) {
-                                if ( count($articles) < 3 ) {
-                                    array_push($articles,$av);
-                                }
-                            }
-                        }
-                    }
-                    $vvv['article'] = $articles;
-                }
-            }
-        }
-
-
-        View::assign('article_categorys', $article_categorys_new);
-//        View::assign('article_categorys', $article_categorys);
+        View::assign('article_categorys', $article_categorys);
 
         $contacts = [];
         // 获取banner数据
@@ -281,46 +245,19 @@ class TopicNas extends Common
 
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
-        $parent_two = ArticleCategoryModel::parent($parent)->language($this->lang_id)->column('id');//二级分类id
-        array_push($parent_two,$parent);
         $article_categorys = ArticleCategoryModel::with(['article' => function ($query) {
                 $query->field(['id', 'title', 'category_id'])->order(['sort' => 'asc', 'id' => 'desc']);
             }])
             ->field([
                 'id',
-                'pid',
                 'name',
                 'icon'
             ])
             ->language($this->lang_id)
-//            ->parent($parent)
-            ->parentChild($parent_two)
+            ->parent($parent)
             ->isShow(true)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
-//        dump($article_categorys->toArray());exit;
-        //查询三级分类
-        $article_categorys_new = [];
-        $article_categorys_two = [];
-        if (!$article_categorys->isEmpty()) {
-            foreach ($article_categorys->toArray() as $kk=>$vv) {
-                if ( $parent == $vv['pid'] ) {
-                    $vv['child'] = '';
-                    array_push($article_categorys_new,$vv);
-                } else {
-                    $article_categorys_two[$vv['pid']][] = $vv;
-                }
-            }
-            if ( !empty($article_categorys_two) ) {
-                foreach ($article_categorys_new as &$vvv) {
-                    $vvv['child'] = isset($article_categorys_two[$vvv['id']])?$article_categorys_two[$vvv['id']]:'';
-                }
-            }
-        }
-//        dump($article_categorys_new);exit;
-//        dump($article_categorys_two);exit;
-
-        View::assign('article_categorys', $article_categorys_new);
+        View::assign('article_categorys', $article_categorys);
 
         return View::fetch('help_detail');
     }
@@ -337,9 +274,7 @@ class TopicNas extends Common
             ->value('id');
             
         // 获取帮且中心分类子分类
-        $categorys  = [];
         $table_name = (new ArticleCategoryModel)->getTable();
-        if (env('DB_VERSION', '5') == '8') {
         $categorys = \think\facade\Db::query(preg_replace(
             '/\s+/u', 
             ' ',
@@ -350,20 +285,6 @@ class TopicNas extends Common
             )
             SELECT id FROM article_tree_by WHERE id <> {$parent}"
         ));
-        } else {
-            $categorys = \think\facade\Db::query("
-                SELECT t2.id
-                    FROM ( 
-                        SELECT 
-                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
-                        FROM 
-                            (SELECT @r := $parent) vars, $table_name h 
-                        WHERE @r <> 0) t1 
-                    JOIN $table_name t2 
-                    ON FIND_IN_SET(t2.pid, t1._id)
-                ORDER BY t2.id;
-            ");
-        }
         if (empty($categorys)) return success('success', []);
 
         // 获取文章数据
@@ -378,18 +299,8 @@ class TopicNas extends Common
             ->language($this->lang_id)
             ->where('category_id', 'IN', array_column($categorys, 'id'))
             ->select();
-        //查询上级id
-        $parent_two = ArticleCategoryModel::parentColumn(array_column($categorys, 'id'))->language($this->lang_id)->column('pid','id');//二级分类id
-        $articles_data = $articles->toArray();
-        foreach ($articles_data as &$v) {
-            $v['pid'] = 0;
-            if ( $parent_two[$v['category_id']] !== $parent ) {
-                $v['pid'] = $v['category_id'];
-                $v['category_id'] = $parent_two[$v['category_id']];
-            }
-        }
 
-        return success('success', $articles_data);
+        return success('success', $articles->toArray());
     }
     
     /**

app/index/controller/TopicPowerProdline.php

@@ -1,90 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace app\index\controller;
-
-use app\index\model\SysBannerModel;
-use think\facade\View;
-use think\Request;
-
-/**
- * 专题 - 电力品线控制器
- */
-class TopicPowerProdline extends Common
-{
-    /**
-     * 专题 - 电力品线首页
-     */
-    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');
-    }
-}

app/index/lang/en-us/mobile.php

@@ -6,9 +6,6 @@ return [
     '产品列表' => 'Products',
     '搜索' => 'Search',
     '搜索历史' => 'Search History',
-    '请输入搜索关键词' => 'Please enter a search keyword',
-    '搜索记录' => 'Search History',
-    '清空' => 'Clear',
     '请择地区' => 'SELECT A REGION',
     '产品' => 'Product',
     '联系方式' => 'Contact',
@@ -56,7 +53,6 @@ return [
     'product/search' => [
         '搜索' => 'Search',
         '请搜索' => 'Please search...',
-        '暂无数据' => 'No data',
     ],
     // 产品详情
     'product/detail' => [
@@ -222,21 +218,4 @@ return [
         '联系我们' => 'Contact US',
         '目录' => 'Content'
     ],
-
-    // 笔记本专题 - 首页
-    'topiclaptop/index' => [
-        'CineBench R23 多核跑分' => 'Outperforms Ryzen 5 & Intel i5',
-        '*此跑分为ORICO实验室测定所得，请以实际使用为准' => '*Data measured by ORICO Lab. Actual performance may vary.',
-        '3DMARK Time Spy显卡得分' => 'Handles Office & Gaming with Ease',
-        '肯辛通锁孔' => 'Kensington <br/> Lock Slot',
-        '千兆网口' => 'Gigabit <br/> Ethernet',
-        'USB-A<br/>(5Gbps)' => 'USB-A <br/> (5Gbps)',
-        '3.5mm<br/>耳麦合一' => '3.5mm <br/> Combo Audio',
-        'TF口3.0' => 'TF 3.0 <br/> Card Slot',
-        '全功能<br/>USB-C' => 'All-in-One <br/> USB-C',
-        "接口大满贯" => "Full-Featured Ports",
-        "酷睿i5-12450H" => "Core i5-12450H",
-        "锐龙9 6900HX" => "Ryzen9 6900HX",
-        "标配多种接口，会议室连接电脑、</br>U盘传输文件、TF卡读取等，全都轻松搞定" => "Versatile Ports for Easy Connectivity. Effortlessly</br> link to projectors, U disks, TF cards, and more.",
-    ],
 ];

app/index/lang/en-us/pc.php

@@ -5,17 +5,10 @@ return [
     '产品列表' => 'Products',
     '店铺' => 'Store',
     '搜索记录' => 'Search History',
+    '热销产品' => 'Popular Products',
     '产品' => 'Product',
     '联系我们' => 'Contact',
 
-    // 新导航栏 - 2023-03-31
-    '搜索' => 'Search',
-    '搜索产品、分类...' => 'Search products and categories...',
-    '最近搜索' => 'Recent Searches',
-    '清空' => 'Clear',
-    '热销产品' => 'Popular Products',
-    '购买' => 'Buy',
-
     // 返回文本
     '提交成功' => 'success',
     '提交失败' => 'fail',
@@ -168,7 +161,6 @@ return [
     // 产品 - 产品详情页
     'product/detail' => [
         '首页' => 'Home',
-        '型号' => 'Product Model',
         '产品详情' => 'Product Description',
         '相关产品' => 'Related Products',
         '发送查询' => 'Send Inquiry',
@@ -185,11 +177,6 @@ return [
         '提交' => 'SUBMIT',
     ],
 
-    // 产品 - 搜索
-    'product/search' => [
-        '暂无数据' => 'No data',
-    ],
-
     // 产品 - 分类
     'product/category' => [
         '查看全部' => 'View All',
@@ -231,21 +218,4 @@ return [
         '联系我们' => 'Contact US',
         '目录' => 'Content'
     ],
-
-    // 笔记本专题 - 首页
-    'topiclaptop/index' => [
-        'CineBench R23 多核跑分' => 'Outperforms Ryzen 5 & Intel i5',
-        '*此跑分为ORICO实验室测定所得，请以实际使用为准' => '*Data measured by ORICO Lab. Actual performance may vary.',
-        '3DMARK Time Spy显卡得分' => 'Handles Office & Gaming with Ease',
-        '肯辛通锁孔' => 'Kensington <br/> Lock Slot',
-        '千兆网口' => 'Gigabit <br/> Ethernet',
-        'USB-A<br/>(5Gbps)' => 'USB-A <br/> (5Gbps)',
-        '3.5mm<br/>耳麦合一' => '3.5mm <br/> Combo Audio',
-        'TF口3.0' => 'TF 3.0 <br/> Card Slot',
-        '全功能<br/>USB-C' => 'All-in-One <br/> USB-C',
-        "接口大满贯" => "Full-Featured Ports",
-        "酷睿i5-12450H" => "Core i5-12450H",
-        "锐龙9 6900HX" => "Ryzen9 6900HX",
-        "标配多种接口，会议室连接电脑、U盘传输文件、TF卡读取等，全都轻松搞定" => "Versatile Ports for Easy Connectivity. Effortlessly link to pro",
-    ],
 ];

app/index/middleware.php

@@ -2,8 +2,7 @@
 // 这是系统自动生成的middleware定义文件
 return [
     // 启用多语言支持
-    // think\middleware\LoadLangPack::class,
-    app\index\middleware\LoadLangPack::class,
+    think\middleware\LoadLangPack::class,
     // 确认请求来源
     app\index\middleware\ConfirmRequestFrom::class,
 ];

app/index/middleware/LoadLangPack.php

@@ -1,39 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\middleware;
-
-use think\Request;
-
-class LoadLangPack extends \think\middleware\LoadLangPack
-{
-    // 重写检测语言方法
-    protected function detect(Request $request): string
-    {
-        $domain_detect = env('INDEX_LANG_DETECT.DOMAIN_DETECT', false);
-        if ($domain_detect) {
-            $lang = $this->getLangSet($request, env('INDEX_LANG_DETECT.DOMAIN_RULE', []));
-            if ($lang != '') {
-                return $lang;
-            }
-        }
-
-        return parent::detect($request);
-    }
-
-    // 根据请求及规则获取语言
-    private function getLangSet(Request $request, array $rules): string
-    {
-        $map = [];
-        foreach ($rules as $v) {
-            $val  = str_replace('，', ',', $v);
-            $item = explode(',', $v);
-            foreach ($item as $val) {
-                $it          = explode('=', $val);
-                $map[$it[0]] = $it[1];
-            }
-        }
-        
-        return $map[$request->host()] ?? '';
-    }
-}

app/index/model/ArticleCategoryModel.php

@@ -46,27 +46,6 @@ class ArticleCategoryModel extends ArticleCategoryBaseModel
         $query->where('pid', '=', $parent);
     }
 
-    // 所属上级分类范围查询
-    public function scopeParentChild($query, $parent)
-    {
-        if (is_array($parent)) {
-            $query->where('pid', 'IN', $parent);
-            return;
-        }
-        $query->where('pid', '=', $parent);
-    }
-
-    // 所属上级分类查询
-    public function scopeParentColumn($query, $parent)
-    {
-        if (is_array($parent)) {
-            $query->where('id', 'IN', $parent);
-            return;
-        }
-        $query->where('id', '=', $parent);
-    }
-
-
     // 所属子分类范围查询
     public function scopeChild($query, $id, $merge_self = false)
     {

app/index/model/ProductCategoryModel.php

@@ -17,12 +17,6 @@ class ProductCategoryModel extends ProductCategoryBaseModel
     // 软件删除时间字段
     protected $deleteTime = 'deleted_at';
 
-    // 关联产品推荐
-    public function recommends()
-    {
-        return $this->hasMany(ProductCategoryRecommendModel::class, 'category_id', 'id');
-    }
-
     // 所属语言范围查询
     public function scopeLanguage($query, $language)
     {

app/index/model/ProductCategoryRecommendModel.php

@@ -1,30 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\model;
-
-use app\common\model\ProductCategoryRecommendBaseModel;
-use think\model\concern\SoftDelete;
-
-/**
- * 产品分类推荐模型
- * @mixin \think\Model
- */
-class ProductCategoryRecommendModel extends ProductCategoryRecommendBaseModel
-{
-    // 启用软件删除
-    use SoftDelete;
-    // 软件删除时间字段
-    protected $deleteTime = 'deleted_at';
-
-    // 所属语言范围查询
-    public function scopeLanguage($query, $language)
-    {
-        $query->where($this->getTable() . '.language_id', '=', $language);
-    }
-
-    public function scopeDisabled($query, $disabled = true)
-    {
-        $query->where($this->getTable() . '.disabled', '=', (int)$disabled);
-    }
-}

app/index/model/SysMallStoreEntranceModel.php

@@ -1,43 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\model;
-
-use app\common\model\SysMallStoreEntranceBaseModel;
-use think\model\concern\SoftDelete;
-
-/**
- * 系统商城店铺入口模型
- * @mixin \think\Model
- */
-class SysMallStoreEntranceModel extends SysMallStoreEntranceBaseModel
-{
-    // 启用软删除
-    use SoftDelete;
-    // 软删除字段
-    protected $deleteTime = 'deleted_at';
-
-    // 关联语言
-    public function language()
-    {
-        return $this->belongsTo(\app\index\model\LanguageModel::class, 'language_id', 'id');
-    }
-
-    // 所属语言范围查询
-    public function scopeLanguage($query, $language)
-    {
-        $query->where($this->getTable() . '.language_id', '=', $language);
-    }
-
-    // 查询启用状态
-    public function scopeEnabled($query)
-    {
-        $query->where('disabled', '=', 0);
-    }
-
-    // 查询禁用状态
-    public function scopeDisabled($query)
-    {
-        $query->where('disabled', '=', 1);
-    }
-}

app/index/route/route.php

@@ -18,8 +18,6 @@ Route::group('product', function () {
     Route::get('category/:id', 'Product/category');
     // 产品分类 - 查看子类
     Route::get('subcategory/:id', 'Product/subcategory');
-    // 单纯分类页
-    Route::get('classify/:id', 'Product/classify');
     // 产品详情页
     Route::get('detail/:id', 'Product/detail');
     // 产品询盘
@@ -107,18 +105,6 @@ Route::group('topic', function () {
         // 专题-Nas软件下载页
         Route::get('download', 'TopicNas/download');
     });
-
-    // 专题 - 电力品线
-    Route::group('power_prodline', function() {
-       // 专题 - 电力品线首页
-       Route::get('index', 'TopicPowerProdline/index');
-    });
-
-    // 专题 - 笔记本电脑
-    Route::group('laptop', function() {
-        // 专题 - 笔记本电脑首页
-        Route::get('index', 'TopicLaptop/index');
-    });
 });
 
 // 数据迁移

app/index/view/mobile/attachment/video.html

@@ -14,7 +14,7 @@
         <div class="tabs">
             {notempty name="video_categorys"}
             {volist name="video_categorys" id="va"}
-            <a href="{:url('attachment/video', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
+            <a href="{:url('attachment/index', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
             {/volist}
             {/notempty}
         </div>

app/index/view/mobile/index/index.html

@@ -9,7 +9,7 @@
         <!-- banner-->
         <div class="oidx-banner">
             {notempty name="focus_images"}
-            <div class="swiper-container bannerswiper" style="background: #fff;">
+            <div class="swiper-container bannerswiper">
                 <div class="swiper-wrapper">
                     {volist name="focus_images" id="fi"}
                     <div class="swiper-slide">
@@ -101,7 +101,7 @@
                 <a href="{$sc.link}"><img src="{$sc.image}" /></a>
                 <div class="position_a text_center wow animated bounceInLeft">
                     <p class="f_weight_500 timetitle" {:style(['color'=>$sc['title_txt_color']])}>{$sc.title}</p>
-                    <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc|raw}</p>
+                    <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc}</p>
                     <p class=" margin-top-20 f_weight_400">
                         <a href="{$sc.link}" class="timeblue"> {:lang_i18n('了解更多')} <img src="__IMAGES__/more-r.png"></a>
                     </p>
@@ -141,7 +141,7 @@
                             <img src="{$bs.image}">
                             <div class="position_a text_center">
                                 <p class=" timetitle" {:style(['color'=>$bs['title_txt_color']])}>{$bs.title} </p>
-                                <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc|raw}</p>
+                                <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc}</p>
                                 <p class=" margin-top-20 f_weight_400">
                                     <span class="  timeblue">
                                         <a href="{$bs.link}">{:lang_i18n('了解更多')}<img src="__IMAGES__/more-r.png"></a>

app/index/view/mobile/product/category.html

@@ -46,7 +46,7 @@
                     {volist name="vo.products" id="pro" length="4"}
                     <li class="img-responsive">
                         <a href="{:url('product/detail', ['id' => $pro.id])}">
-                            <img src="{:thumb($pro.cover_image)}">
+                            <img src="{$pro.cover_image}">
                             <span class="title">{$pro.name}</span>
                             <span class="subtitle">{$pro.spu}</span>
                         </a>

app/index/view/mobile/product/classify.html

@@ -1,225 +0,0 @@
-{extend name="public/base" /}
-
-{block name="style"}
-<link rel="stylesheet" href="__CSS__/category.css">
-
-<script type="text/javascript">
-  (function (doc, win) {
-        var docEl = doc.documentElement;
-        var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize';
-
-        function setRootFontSize() {
-            var clientWidth = docEl.clientWidth;
-            if (!clientWidth) return;
-            var fontSize = clientWidth / 8.04; // 750px/7.5=100px，375px/7.5=50px
-            // 直接修改内联样式，优先级最高
-            docEl.setAttribute('style', 'font-size: ' + fontSize + 'px !important;');
-        }
-
-        setRootFontSize();
-        win.addEventListener(resizeEvt, setRootFontSize);
-        doc.addEventListener('DOMContentLoaded', setRootFontSize);
-    })(document, window);
-</script>
-
-
-
-
-{/block}
-
-{block name="main"}
-<!-- 顶部返回栏（已完全按图纸修改） -->
-<div class="top-box">
-    <div class="top-bar">
-        <div class="back">
-            <image src="__IMAGES__/left.png"></image>
-        </div>
-        <div class="title">{$parent.name|default=''}</div>
-    </div>
-</div>
-<div class="main">
-    <!-- 左侧导航 -->
-    {if condition="!empty($categorys)"}
-    <ul class="sidebar">
-        {volist name="categorys" id="category"}
-        <li class="nav-item {eq name='$key' value='0'}active{/eq}" data-tab="tab{$category.id}">{$category.name}</li>
-        {/volist}
-        <li style="background: #fff;" class="li-bottom"></li>
-    </ul>
-
-    <!-- 右侧分区内容 -->
-    <div class="right-content">
-        {volist name="categorys" id="category"}
-        <div class="tab-pane {eq name='$key' value='0'}active{/eq}" id="tab{$category.id}">
-            {if condition="!empty($category.children)"}
-            {volist name="$category.children" id="child"}
-            <section class="sec-box">
-                <div class="sec-header">
-                    <div class="sec-title">{$child.name}</div>
-                    <a class="sec-arrow" href="{:url('product/subcategory', ['id' => $child.id])}" target="_self">
-                        <img src="__IMAGES__/y.png" alt="">
-                    </a>
-                </div>
-                {if condition="!empty($child.products)"}
-                <div class="scroll-box">
-                    {volist name="$child.products" id="pro"}
-                    <a class="card" href="{:url('product/detail', ['id' => $pro.id])}" style="background: #fff;">
-                        <div class="card-img">
-                            <img src="{$pro.cover_image}" alt="">
-                        </div>
-                        <div class="card-info">
-                            <div class="card-name">{$pro.name}</div>
-                            <div class="card-model">{$pro.spu}</div>
-                        </div>
-                    </a>
-                    {/volist}
-                </div>
-                {/if}
-            </section>
-            {/volist}
-            {/if}
-        </div>
-        {/volist}
-    </div>
-    {/if}
-</div>
-{/block}
-
-{block name="script"}
-
-<script>
-    // 点击右侧箭头滚动
-    function scrollNext (el)
-    {
-        const box = el.closest('section')?.querySelector('.scroll-box')
-            || el.parentElement.nextElementSibling
-        if (box) box.scrollBy({ left: 150, behavior: 'smooth' })
-    }
-    const back = document.querySelector('.back')
-    // 左侧Tab切换
-    const navItems = document.querySelectorAll('.nav-item')
-    const tabPanes = document.querySelectorAll('.tab-pane')
-
-    navItems.forEach(item =>
-    {
-        item.addEventListener('click', () =>
-        {
-            // 切换左侧激活状态
-            navItems.forEach(i => i.classList.remove('active'))
-            item.classList.add('active')
-            // 切换右侧内容
-            const target = item.dataset.tab
-            tabPanes.forEach(p => p.classList.remove('active'))
-            document.getElementById(target)?.classList.add('active')
-        })
-    })
-
-    back.addEventListener('click',()=>{
-        window.location.href = document.referrer;
-    })
-// 更新侧边栏相邻元素的圆角
-function updateSidebarAdjacentRadius() {
-    const sidebarItems = document.querySelectorAll('.sidebar li');
-    
-    // 先移除所有相邻类名
-    sidebarItems.forEach(item => {
-        item.classList.remove('active-prev', 'active-next');
-    });
-    
-    // 找到当前激活的项
-    let activeIndex = -1;
-    sidebarItems.forEach((item, index) => {
-        if (item.classList.contains('active')) {
-            activeIndex = index;
-        }
-    });
-    
-    // 添加上一个和下一个的类名（使用requestAnimationFrame确保DOM更新）
-    requestAnimationFrame(() => {
-        if (activeIndex > 0) {
-            sidebarItems[activeIndex - 1].classList.add('active-prev');
-        }
-        if (activeIndex < sidebarItems.length - 1) {
-            sidebarItems[activeIndex + 1].classList.add('active-next');
-        }
-    });
-}
-
-// 绑定点击事件
-document.querySelectorAll('.sidebar li').forEach(item => {
-    item.addEventListener('click', function() {
-        // 移除所有active
-        document.querySelectorAll('.sidebar li').forEach(li => {
-            li.classList.remove('active');
-        });
-        // 添加active
-        this.classList.add('active');
-        // 更新相邻圆角
-        updateSidebarAdjacentRadius();
-        
-  
-    });
-});
-
-// 页面初始化时调用
-if (document.querySelector('.sidebar li.active')) {
-    updateSidebarAdjacentRadius();
-}
-
-
-// 动态计算 li-bottom 的高度
-function setLiBottomHeight() {
-    const sidebar = document.querySelector('.sidebar');
-    const liBottom = document.querySelector('.sidebar .li-bottom');
-    const sidebarItems = document.querySelectorAll('.sidebar li:not(.li-bottom)');
-    
-    if (!sidebar || !liBottom || sidebarItems.length === 0) return;
-    
-    // 计算所有正常li的总高度
-    let totalHeight = 0;
-    sidebarItems.forEach(item => {
-        totalHeight += item.offsetHeight;
-    });
-    
-    // 获取sidebar的高度
-    const sidebarHeight = sidebar.offsetHeight;
-    
-    // 计算剩余高度
-    const remainingHeight = sidebarHeight - totalHeight;
-    
-    // 赋值给 li-bottom
-    if (remainingHeight > 0) {
-        liBottom.style.height = remainingHeight + 'px';
-    } else {
-        liBottom.style.height = '0px';
-        liBottom.style.display = 'none';
-    }
-}
-
-// 页面加载时执行
-window.addEventListener('load', function() {
-    setLiBottomHeight();
-});
-
-// 窗口大小改变时重新计算
-window.addEventListener('resize', function() {
-    console.log('切换了吗')
-    setLiBottomHeight();
-});
-
-// 如果侧边栏内容有动态变化，使用 MutationObserver 监听
-const observer = new MutationObserver(function() {
-    setLiBottomHeight();
-});
-
-// 监听侧边栏变化
-const sidebar = document.querySelector('.sidebar');
-if (sidebar) {
-    observer.observe(sidebar, { 
-        childList: true, 
-        subtree: true, 
-        attributes: true 
-    });
-}
-</script>
-{/block}

app/index/view/mobile/product/detail.html

@@ -22,11 +22,7 @@
                 <a class="href_01">{:lang_i18n('首页')}</a>
                 {volist name="product_categorys" id="ca"}
                 <span class="icon-arrow arrow_address"></span>
-                {eq name="ca.pid" value="0"}
                 <a class="href_02" href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a>
-                {else /}
-                <a class="href_02" href="{:url('product/subcategory', ['id' => $ca.id])}">{$ca.name}</a>
-                {/eq}
                 {/volist}
             </div>
         </div>
@@ -41,13 +37,6 @@
                         <img src="{$photo}" alt="" />
                     </div>
                     {/volist}
-                    {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
-                    <div class="swiper-slide">
-                        <video poster="{$product.video_img}" autoplay="autoplay" muted="muted" loop="loop" id="video" controls>
-                            <source src="{$product.video_url}" type="video/mp4"/>
-                        </video>
-                    </div>
-                    {/if}
                 </div>
                 <!-- 如果需要分页器 -->
                 <div class="swiper-pagination"></div>

app/index/view/mobile/product/search.html

@@ -17,7 +17,7 @@
         <div class="prlist">
             {volist name="products" id="pro"}
             <a class="pritem" href="{:url('product/detail',['id'=>$pro.id])}">
-                <img src="{:thumb($pro.cover_image)}" class="primg"/>
+                <img src="{$pro.cover_image}" class="primg"/>
                 <div class="prinfo">
                     <span class="t1">{$pro.name|raw}</span>
                     <span class="t2">{$pro.spu|raw}</span>
@@ -28,7 +28,7 @@
         <!-- 分页 -->
         <div>{$page|raw}</div>
         {else/}
-        <div style="text-align: center; padding: 10%;">{:lang_i18n('暂无数据')}</div>
+        <div style="text-align: center; padding: 10%;">暂无数据</div>
         {/notempty}
     </div>
 </div>

app/index/view/mobile/product/subcategory.html

@@ -19,7 +19,6 @@
         <div class="m_Container">
             {notempty name="categorys_data"}
             <div class="product_list">
-                {if condition="in_array('products', array_keys($categorys_data[0]))"}
                 <ul>
                     {assign name="products" value=":\think\helper\Arr::flatMap(fn($pro) => $pro['products'], $categorys_data)" /}
                     {volist name="products" id="pr"}
@@ -56,7 +55,6 @@
                     </li>
                     {/volist}
                 </ul>
-                {/if}
             </div>
             {/notempty}
         </div>

app/index/view/mobile/public/base.html

@@ -11,12 +11,13 @@
 		<link rel="stylesheet" type="text/css" href="__CSS__/public.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/font.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/style.css" />
+		<!-- <link rel="stylesheet" type="text/css" href="__CSS__/fonts.css" /> -->
         <link rel="stylesheet" type="text/css" href="__CSS__/header.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/footer.css" />
         {block name="style"}{/block}
-		<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css" />
-		<script src="__JS__/jquery-3.6.0.min.js"></script>
-		<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"></script>
+		<link rel="stylesheet" href="https://unpkg.com/swiper@9/swiper-bundle.min.css">
+		<script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+		<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script>
 		<!-- Matomo -->
 		<script>
 			var _paq = window._paq = window._paq || [];
@@ -26,7 +27,7 @@
 			(function() {
 				var u="//analytics.f2b211.com/";
 				_paq.push(['setTrackerUrl', u+'matomo.php']);
-				_paq.push(['setSiteId', '2']);
+				_paq.push(['setSiteId', '1']);
 				var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
 				g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
 			})();
@@ -36,7 +37,7 @@
 	<body>
 		<noscript>
 			<!-- Matomo Image Tracker-->
-			<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+			<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=1&amp;rec=1" style="border:0" alt="" />
 			<!-- End Matomo -->
 		</noscript>
         {block name="header"}

app/index/view/mobile/public/footer.html

@@ -29,13 +29,12 @@
                 {/notempty}
                 <li>
                     <h3>{:lang_i18n('联系方式')}</h3>
-                    {if condition="!empty($contact_config)"}
-                        {volist name="contact_config" id="vo"}
-                            {if condition="$vo.type != 'image'"}
-                                <p>{$vo.value}</p>
-                            {/if}
-                        {/volist}
-                    {/if}
+                    {notempty name="contact_config.website_email"}
+                    <p>{$contact_config.website_email.title}： {$contact_config.website_email.value}</p>
+                    {/notempty}
+                    {notempty name="contact_config.website_hotline_office_hours"}
+                    <p>{$contact_config.website_hotline_office_hours.title}： {$contact_config.website_hotline_office_hours.value}</p>
+                    {/notempty}
                 </li>
             </ul>
         </div>
@@ -65,7 +64,7 @@
         <div class="copy-text">
             {$basic_config.website_powerby.value}
             {notempty name="$basic_config.website_icp"}
-            <a href="https://beian.miit.gov.cn/" style="color:white;">{$basic_config.website_icp.value|raw}</a>
+            <a href="https://beian.miit.gov.cn/" style="color:white;">（{$basic_config.website_icp.value}）</a>
             {/notempty}
         </div>
         {/notempty}

app/index/view/mobile/public/header.html

@@ -1,662 +1,161 @@
-<link rel="stylesheet" href="__CSS__/new_header.css">
-<header>
-    <div class="mobile-header-box">
-        <div class="mobile-header-left">
-            <img src="__IMAGES__/header/nav.png" class="nav-img">
-            <img src="__IMAGES__/header/x.png" class="nav-img1">
-            <a href="/" target="_self" style="display: flex; justify-content: center;">
-                <img src="__IMAGES__/logo.png" class="nav-log">
-            </a>
-        </div>
-        <div class="mobile-header-right">
-            <img src="__IMAGES__/header/search.png" class="nav-search">
-            <img src="__IMAGES__/header/lang.png" class="nav-lang">
-            <img src="__IMAGES__/header/card.png" class="nav-card">
+<header class="oircoEgapp-head">
+    <div class="headtop">
+        <a href="/"><img src="__IMAGES__/logo.png" class="headerlogimg" /></a>
+        <div class="action-r">
+            <div class="right img-responsive cursor_p">
+                <span class="icon-category cursor_p top-menu-toggle"><i class="icon-menu-svg"></i></span>
+                <span class="icon-keyword cursor_p top-search-toggle"><i class="icon-search-svg"></i></span>
+                <span class="mask-up cursor_p top-country-toggle"><i class="icon-lag-svg"></i></span>
             </div>
         </div>
-
-    <div class="nav-dropdown-menu" style="height: 100vh; overflow-y: scroll;-webkit-overflow-scrolling: touch;padding-bottom:9rem;">
-        <!-- 产品列表 - 有子菜单 -->
-        <div class="menu-item has-child">
-            <div class="menu-item-box">
-                <span>{:lang_i18n('产品列表')}</span>
-                <img src="__IMAGES__/header/b.png" class="menu-item-img">
     </div>
-            {if condition="!empty($header_categorys)"}
-            <div class="sub-menu" style="overflow-y: auto;">
-                {volist name="header_categorys" id="vo" key="idx"}
-                <div class="sub-item"><a href="{:url('product/classify', ['id' => $vo.id])}" target="_self">{$vo.name}</a></div>
+    <!-- 顶部菜单-->
+    <div class="top-menu">
+        <div class="it-ct">
+            <div class="it-1"><a href="/">{:lang_i18n('首页')}</a></div>
+        </div>
+        <div class="it-ct">
+            <div class="it-1">
+                <div class="it-1-more">{:lang_i18n('产品列表')}<i class="icon-arrow"></i></div>
+                {notempty name="header_categorys"}
+                {volist name="header_categorys" id="ca"}
+                <div class="it-1-2"><a href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a></div>
                 {/volist}
+                {/notempty}
             </div>
-            {/if}
         </div>
-
-        {if condition="!empty($header_navigation)"}
+        {notempty name="header_navigation"}
         {volist name="header_navigation" id="nav"}
-        {empty name='nav.children'}
-        <div class="menu-item no-child" data-link="{$nav.link}">
+        <div class="it-ct">
+            <div class="it-1">
+                {empty name="nav.children"}
+                <a href="{$nav.link}">{$nav.name}</a>
                 {else/}
-        <div class="menu-item has-child" data-link="{$nav.link}">
+                <div class="it-1-more">{$nav.name}<i class="icon-arrow"></i></div>
+                {volist name="nav.children" id="ch"}
+                <div class="it-1-2"><a href="{$ch.link}">{$ch.name}</a></div>
+                {/volist}
                 {/empty}
-            <div class="menu-item-box">
-                <span>{$nav.name}</span>
-                <img src="__IMAGES__/header/b.png" class="menu-item-img">
             </div>
-            {if condition="!empty($nav.children)"}
-            <div class="sub-menu" style="border: none;" >
-                {volist name="nav.children" id="child"}
-                <div class="sub-item no-padding ">
-                    <a href="{$child.link}" target="{$child.blank==1?'_blank':'_self'}" class="sub-item-card">
-                        <img src="{$child.image}" alt="" class="sub-item-card-img">
-                        <div class="sub-item-card-title">{$child.name}</div>
-                        <div class="sub-item-card-name">{$child.desc}</div>
-                    </a>
         </div>
         {/volist}
+        {/notempty}
     </div>
-            {/if}
-        </div>
-        {/volist}
-        {/if}
-    </div>
-
-    <!-- ====================== 购物车弹窗 ====================== -->
-    <div class="modal-overlay" id="cartModal">
-        <div class="modal-content">
-            <img src="__IMAGES__/header/x.png" class="modal-close">
-            {if condition="!empty($header_mall_entrance)"}
-            <div class="modal-items-list">
-                {volist name="header_mall_entrance" id="ma"}
-                {if condition="!empty($ma.link)"}
-                <a class="modal-item" href="{$ma.link}" target="_self">
-                    <img src="{$ma.image}" alt="" class="modal-item-img">
-                    <div class="modal-item-title">{$ma.name}</div>
-                </a>
-                {else/}
-                <!--悬浮图-->
-                <div class="modal-item" data-link="{$ma.link}" style="cursor: pointer;">
-                    <img src="{$ma.image}" alt="" class="modal-item-img">
-                    <div class="modal-item-title">{$ma.name}</div>
-                </div>
-                <div class="modal-item" style="display:none">
-                    <img src="{$ma.hover_image}" alt="" class="modal-item-img">
-                </div>
-                {/if}
-                {/volist}
-            </div>
-            {/if}
+    <!-- 顶部搜索-->
+    <div class="top-search">
+        <div class="marsk-container">
+            <div class="popup-quick">
+                <div class="ac-close float_r "><img src="__IMAGES__/close.png"></div>
+                <div class="search-in">
+                    <form action="{:url('product/search')}" method="get">
+                        <input type="text" name="keywords" placeholder="{:lang_i18n('产品')} USB 2.0...">
+                        <button type="submit" id="search-btnput" class="search-button">{:lang_i18n('搜索')}</button>
+                    </form>
+                    <div class="title-text">
+                        <p><a href="#">{:lang_i18n('搜索历史')}</a></p>
+                        <div id="history"></div>
                     </div>
                 </div>
-
-    <!-- ====================== 语言弹窗 ====================== -->
-    <div class="modal-overlay" id="langModal">
-        <div class="lang-modal-content">
-            <img src="__IMAGES__/header/x.png" class="modal-close">
-            <div class="lang-items-list">
+            </div>
+        </div>
+    </div>
+    <!-- 顶部国家选择-->
+    <div class="top-country">
+        <div class="mask"></div>
+        <div class="action-sheet">
+            <div class="menu-title">
+                <div class="menu-name">{:lang_i18n('请择地区')}</div>
+                <div class="close-icon">
+                    <img src="__IMAGES__/close.png">
+                </div>
+            </div>
+            <ul>
                 {volist name="header_languages" id="la"}
-                <a class="lang-item" href="{$la.lang_url}" target="_self">
-                    <img src="{$la.lang_icon}" />
-                    <div>{$la.country_en_name} - {$la.lang_en_name}</div>
+                <li>
+                    <a href="{$la.lang_url}" target="_blank">
+                        <img src="{$la.lang_icon}">{$la.country_en_name} - {$la.lang_en_name}
                     </a>
+                </li>
                 {/volist}
-            </div>
-        </div>
-    </div>
-
-    <!-- ====================== 搜索弹窗 ====================== -->
-    <div class="modal-overlay" id="searchModal">
-        <div class="search-modal-content">
-            <img src="__IMAGES__/header/x.png" class="modal-close">
-            <div class="search-input-box">
-                <input type="text" placeholder="{:lang_i18n('请输入搜索关键词')}" id="searchInput">
-
-                <div class="search-clear-box">
-                    <img src="__IMAGES__/header/x.png" alt="{:lang_i18n('清除')}" class="search-clear-btn" id="searchClearBtn" style="display: none;">
-                </div>
-                <!-- <span style="width: 1px; color:#d9d9d9;margin: 0 10px;">|</span> -->
-                <div class="search-submit-box">
-                    <img src="__IMAGES__/header/search.png" alt="{:lang_i18n('搜索')}" class="search-submit-icon" id="searchSubmit">
-                </div>
-            </div>
-            <div class="search-history">
-                <div class="search-history-header">
-                    <div class="search-history-title">{:lang_i18n('搜索记录')}</div>
-                    <div class="search-history-clear" id="clearAllHistory">{:lang_i18n('清空')}</div>
-                </div>
-                <div class="search-history-list" id="searchHistoryList">
-                    <!-- 搜索记录会动态显示在这里 -->
-                </div>
-            </div>
+            </ul>
         </div>
     </div>
 </header>
-<script>
-
-    document.addEventListener('DOMContentLoaded', function ()
-    {
-        const navBtn = document.querySelector('.nav-img');
-        const navBtn1 = document.querySelector('.nav-img1');
-        const dropdownMenu = document.querySelector('.nav-dropdown-menu');
-
-        // 禁止body滚动
-        function disableBodyScroll() {
-            document.body.style.overflow = 'hidden';
-            document.body.style.position = 'fixed';
-            document.body.style.top = `-${window.scrollY}px`;
-            document.body.style.width = '100%';
-        }
-
-        // 恢复body滚动
-        function enableBodyScroll() {
-            const scrollY = document.body.style.top;
-            document.body.style.overflow = '';
-            document.body.style.position = '';
-            document.body.style.top = '';
-            document.body.style.width = '';
-            if (scrollY) {
-                window.scrollTo(0, parseInt(scrollY || '0') * -1);
-            }
-        }
-
-        // 复位所有子菜单（关闭并重置滚动位置）
-        function resetAllSubMenus() {
-            let hasOpenMenu = false;
-            document.querySelectorAll('.has-child .sub-menu').forEach(function(subMenu) {
-                if (subMenu.classList.contains('show')) {
-                    hasOpenMenu = true;
-                }
-                subMenu.classList.remove('show');
-                // 重置滚动位置到顶部
-                subMenu.scrollTop = 0;
+<script type="text/javascript">
+    $(function() {
+        // 点击顶部菜单
+        $(".top-menu-toggle").click(function() {
+            $(".top-menu").slideToggle(800);
+        })
+        // 点击一级菜单显示二级菜单
+        $(".it-1-more").on("click", function() {
+            $('.it-1-2').hide();
+            $('.icon-arrow').removeClass('rotate');
+            $(this).siblings('.it-1-2').slideToggle(800);
+            $(this).find('.icon-arrow').addClass('rotate');
         });
-            document.querySelectorAll('.has-child').forEach(function(item) {
-                item.classList.remove('open');
+        //点击搜索
+        $('.top-search-toggle').click(function() {
+            $(".marsk-container").show();
+        })
+        $('.ac-close').click(function() {
+            $(".marsk-container").hide();
+        })
+        // 顶部国家选择
+        $('.top-country-toggle').click(function(){
+            $(".mask,.action-sheet").show();
+        })
+        $('.top-country .close-icon').click(function(){
+            $(".mask,.action-sheet").hide();
+        })
+
+        // 移动端顶部宽度设置和主体内容宽度一致
+        var pageWidth = $('.oricoEGapp').outerWidth();
+        // 设置.header-PC元素的宽度
+        $('.oircoEgapp-head').css('width', pageWidth + 'px');
+        // 可选：监听窗口大小变化，实时更新宽度
+        $(window).resize(function() {
+            var newWidth = $('.oricoEGapp').outerWidth();
+            $('.oircoEgapp-head').css('width', newWidth + 'px');
         });
         
-            // 如果没有打开的菜单，恢复body滚动
-            if (!hasOpenMenu) {
-                enableBodyScroll();
-            }
-        }
+        // 回显搜索历史记录
+        history();
+    })
 
-        // 关闭单个子菜单并重置滚动位置
-        function closeSubMenu(subMenu, menuItem) {
-            if (subMenu) {
-                subMenu.classList.remove('show');
-                subMenu.scrollTop = 0; // 重置滚动位置
-            }
-            if (menuItem) {
-                menuItem.classList.remove('open');
-            }
-            // 检查是否还有其他打开的菜单
-            const anyOpen = document.querySelector('.has-child .sub-menu.show');
-            if (!anyOpen) {
-                enableBodyScroll();
-            }
-        }
-
-        // 打开子菜单
-        function openSubMenu(subMenu, menuItem) {
-            // 禁止body滚动
-            disableBodyScroll();
-            
-            subMenu.classList.add('show');
-            menuItem.classList.add('open');
-            // 确保新打开的菜单滚动位置在顶部
-            subMenu.scrollTop = 0;
-        }
-
-        // 打开菜单
-        navBtn.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            // 禁止body滚动
-            disableBodyScroll();
-            // 关闭所有弹窗
-            closeAllModals();
-            dropdownMenu.classList.add('show');
-            navBtn.style.display = 'none';
-            navBtn1.style.display = 'block';
-        });
-
-        // 关闭菜单 - 复位所有子菜单
-        navBtn1.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            dropdownMenu.classList.remove('show');
-            navBtn.style.display = 'block';
-            navBtn1.style.display = 'none';
-            
-            // 复位所有子菜单到初始状态
-            resetAllSubMenus();
-        });
-
-        // ====================== 处理所有菜单项（同一时间只展开一个） ======================
-        document.querySelectorAll('.menu-item').forEach(function (item)
-        {
-            const isHasChild = item.classList.contains('has-child');
-            const subMenu = item.querySelector('.sub-menu');
-            const box = item.querySelector('.menu-item-box');
-
-            if (isHasChild && subMenu) {
-                // 移除原有事件，重新绑定（确保只有一个展开）
-                const newBox = box.cloneNode(true);
-                box.parentNode.replaceChild(newBox, box);
-                
-                newBox.addEventListener('click', function (e)
-                {
-                    e.stopPropagation();
-                    
-                    // 检查当前是否已展开
-                    const isOpen = subMenu.classList.contains('show');
-                    
-                    // 关闭所有其他子菜单并重置滚动位置
-                    document.querySelectorAll('.has-child').forEach(function (otherItem) {
-                        const otherSubMenu = otherItem.querySelector('.sub-menu');
-                        if (otherSubMenu && otherSubMenu !== subMenu) {
-                            otherSubMenu.classList.remove('show');
-                            otherSubMenu.scrollTop = 0; // 重置滚动位置
-                            otherItem.classList.remove('open');
-                        }
-                    });
-                    
-                    // 切换当前菜单
-                    if (!isOpen) {
-                        openSubMenu(subMenu, item);
+    function history() {
+        var keywords = new URL(window.location.href).searchParams.get('keywords')
+        var history_keywords = localStorage.getItem('header_search_keywords');
+        if (!history_keywords) {
+            history_keywords = [];
         } else {
-                        closeSubMenu(subMenu, item);
-                    }
-                });
-            } else {
-                const link = item.getAttribute('data-link');
-                if (link) {
-                    item.addEventListener('click', function (e)
-                    {
-                        e.stopPropagation();
-                        window.location.href = link;
-                    });
-                }
-            }
-        });
-
-        // 阻止子菜单链接冒泡
-        document.querySelectorAll('.sub-item').forEach(function (sub)
-        {
-            sub.addEventListener('click', function (e)
-            {
-                e.stopPropagation();
-            });
-        });
-
-        dropdownMenu.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-        });
-
-        navBtn1.style.display = 'none';
-        navBtn.style.display = 'block';
-
-        // 关闭所有弹窗的公共函数
-        function closeAllModals ()
-        {
-            cartModal.classList.remove('show');
-            langModal.classList.remove('show');
-            searchModal.classList.remove('show');
-            if (searchInput) {
-                searchInput.value = '';
-                if (searchClearBtn) searchClearBtn.style.display = 'none';
-            }
+            history_keywords = JSON.parse(history_keywords);
         }
 
-        // ====================== 购物车弹窗交互 ======================
-        const cardBtn = document.querySelector('.nav-card');
-        const cartModal = document.getElementById('cartModal');
-        const cartModalClose = cartModal.querySelector('.modal-close');
+        // 记录搜索关键词
+        if (keywords) {
+            if (history_keywords.includes(keywords)) {
+                history_keywords.splice(history_keywords.indexOf(keywords), 1);
+            }
+            history_keywords.unshift(keywords);
+            if (history_keywords.length > 3) {
+                history_keywords.pop();
+            }
+            localStorage.setItem('header_search_keywords', JSON.stringify(history_keywords));
+        }
 
-        cardBtn.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            // 关闭下拉菜单和其他弹窗
-            dropdownMenu.classList.remove('show');
-            navBtn.style.display = 'block';
-            navBtn1.style.display = 'none';
-            closeAllModals();
-            // 复位所有子菜单
-            resetAllSubMenus();
-            cartModal.classList.add('show');
+        // 回显搜索历史
+        history_keywords.forEach(function(item) {
+            $('#history').append(
+                $('<a>')
+                .css({
+                    'margin-right': '10px'
+                })
+                .attr('href', '{:url("product/search")}?keywords=' + item)
+                .text(item)
+            );
         });
 
-        cartModalClose.addEventListener('click', function ()
-        {
-            cartModal.classList.remove('show');
-        });
-
-        cartModal.addEventListener('click', function (e)
-        {
-            if (e.target === cartModal) {
-                cartModal.classList.remove('show');
+        return history_keywords;
     }
-        });
-
-        // ====================== 语言弹窗交互 ======================
-        const langBtn = document.querySelector('.nav-lang');
-        const langModal = document.getElementById('langModal');
-        const langModalClose = langModal.querySelector('.modal-close');
-
-        langBtn.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            // 关闭下拉菜单和其他弹窗
-            dropdownMenu.classList.remove('show');
-            navBtn.style.display = 'block';
-            navBtn1.style.display = 'none';
-            closeAllModals();
-            // 复位所有子菜单
-            resetAllSubMenus();
-            langModal.classList.add('show');
-        });
-
-        langModalClose.addEventListener('click', function ()
-        {
-            langModal.classList.remove('show');
-        });
-
-        langModal.addEventListener('click', function (e)
-        {
-            if (e.target === langModal) {
-                langModal.classList.remove('show');
-            }
-        });
-
-        document.querySelectorAll('.lang-item').forEach(function (item)
-        {
-            item.addEventListener('click', function (e)
-            {
-                e.stopPropagation();
-                console.log('选择了语言:', this.innerText);
-                langModal.classList.remove('show');
-            });
-        });
-
-        // ====================== 搜索记录功能 ======================
-        // 获取搜索记录
-        function getSearchHistory ()
-        {
-            const history = localStorage.getItem('searchHistory');
-            return history ? JSON.parse(history) : [];
-        }
-
-        // 保存搜索记录
-        function saveSearchHistory (history)
-        {
-            localStorage.setItem('searchHistory', JSON.stringify(history));
-        }
-
-        // 添加搜索记录
-        function addSearchHistory (keyword)
-        {
-            if (!keyword || !keyword.trim()) return;
-            keyword = keyword.trim();
-            let history = getSearchHistory();
-            history = history.filter(item => item !== keyword);
-            history.unshift(keyword);
-            if (history.length > 10) {
-                history = history.slice(0, 10);
-            }
-            saveSearchHistory(history);
-            renderSearchHistory();
-        }
-
-        // 删除单条搜索记录
-        function deleteSearchHistoryItem (keyword)
-        {
-            let history = getSearchHistory();
-            history = history.filter(item => item !== keyword);
-            saveSearchHistory(history);
-            renderSearchHistory();
-        }
-
-        // 清空所有搜索记录
-        function clearAllSearchHistory ()
-        {
-            saveSearchHistory([]);
-            renderSearchHistory();
-        }
-
-        // 渲染搜索记录列表
-        function renderSearchHistory ()
-        {
-            const historyList = document.getElementById('searchHistoryList');
-            const history = getSearchHistory();
-
-            if (!historyList) return;
-
-            if (history.length === 0) {
-                historyList.innerHTML = '<div class="empty-history">暂无搜索记录</div>';
-                return;
-            }
-
-            historyList.innerHTML = '';
-            history.forEach(function (keyword)
-            {
-                const itemDiv = document.createElement('div');
-                itemDiv.className = 'search-history-item';
-                itemDiv.innerHTML = `
-                    <span>${escapeHtml(keyword)}</span>
-                    <img src="__IMAGES__/header/x.png" class="delete-icon" data-keyword="${escapeHtml(keyword)}">
-                `;
-                itemDiv.addEventListener('click', function (e)
-                {
-                    if (e.target.classList && e.target.classList.contains('delete-icon')) {
-                        e.stopPropagation();
-                        deleteSearchHistoryItem(keyword);
-                    } else {
-                        e.stopPropagation();
-                        searchInput.value = keyword;
-                        doSearch(keyword);
-                    }
-                });
-                historyList.appendChild(itemDiv);
-            });
-        }
-
-        // 简单的防XSS
-        function escapeHtml (str)
-        {
-            return str.replace(/[&<>]/g, function (m)
-            {
-                if (m === '&') return '&amp;';
-                if (m === '<') return '&lt;';
-                if (m === '>') return '&gt;';
-                return m;
-            });
-        }
-
-        // ====================== 搜索弹窗交互 ======================
-        const searchBtn = document.querySelector('.nav-search');
-        const searchModal = document.getElementById('searchModal');
-        const searchModalClose = searchModal.querySelector('.modal-close');
-        const searchInput = document.getElementById('searchInput');
-        const searchSubmit = document.getElementById('searchSubmit');
-        const searchClearBtn = document.getElementById('searchClearBtn');
-        const clearAllHistoryBtn = document.getElementById('clearAllHistory');
-
-        searchInput.addEventListener('input', function (e)
-        {
-            if (searchInput.value.length > 0) {
-                searchClearBtn.style.display = 'block';
-            } else {
-                searchClearBtn.style.display = 'none';
-            }
-        });
-
-        searchClearBtn.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            searchInput.value = '';
-            searchClearBtn.style.display = 'none';
-            searchInput.focus();
-        });
-
-        if (clearAllHistoryBtn) {
-            clearAllHistoryBtn.addEventListener('click', function (e)
-            {
-                e.stopPropagation();
-                clearAllSearchHistory();
-            });
-        }
-
-        searchBtn.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            // 关闭下拉菜单和其他弹窗
-            dropdownMenu.classList.remove('show');
-            navBtn.style.display = 'block';
-            navBtn1.style.display = 'none';
-            closeAllModals();
-            // 复位所有子菜单
-            resetAllSubMenus();
-            renderSearchHistory();
-            searchModal.classList.add('show');
-            setTimeout(() =>
-            {
-                searchInput.focus();
-            }, 100);
-        });
-
-        searchModalClose.addEventListener('click', function ()
-        {
-            searchModal.classList.remove('show');
-            searchInput.value = '';
-            searchClearBtn.style.display = 'none';
-        });
-
-        searchModal.addEventListener('click', function (e)
-        {
-            if (e.target === searchModal) {
-                searchModal.classList.remove('show');
-                searchInput.value = '';
-                searchClearBtn.style.display = 'none';
-            }
-        });
-
-        // 执行搜索
-        function doSearch (keyword)
-        {
-            if (keyword && keyword.trim()) {
-                const searchKeyword = keyword.trim();
-                console.log('搜索关键词:', searchKeyword);
-                if (searchKeyword) {
-                    addSearchHistory(searchKeyword);
-                    window.location.href = "{:url('product/search')}?keywords=" + encodeURIComponent(searchKeyword);
-                    searchModal.classList.remove('show');
-                    searchInput.value = '';
-                    searchClearBtn.style.display = 'none';
-                }
-
-            }
-        }
-        
-        searchSubmit.addEventListener('click', function (e)
-        {
-            e.stopPropagation();
-            doSearch(searchInput.value);
-        });
-
-        searchInput.addEventListener('keypress', function (e)
-        {
-            console.log(e,'========e=============')
-            if (e.key === 'Enter' || e.key === 'enter' || e.keyCode === 13) {
-                e.preventDefault();
-                doSearch(searchInput.value);
-            }
-        });
-        
-        // ====================== 添加：点击空白区域关闭所有子菜单 ======================
-        document.addEventListener('click', function(e) {
-            // 如果点击的不是菜单项内部，关闭所有子菜单
-            if (!e.target.closest('.menu-item')) {
-                resetAllSubMenus();
-            }
-        });
-        
-        // ====================== 购物车弹窗悬浮图功能 ======================
-        // 处理购物车弹窗中的图片悬浮效果
-        function initCartModalHover() {
-            const modalItems = document.querySelectorAll('#cartModal .modal-item');
-            
-            modalItems.forEach(function(item) {
-                // 查找当前item中是否有悬浮图（隐藏的那个）
-                const defaultImg = item.querySelector('.modal-item-img');
-                const hiddenItem = item.nextElementSibling;
-                let hoverImg = null;
-                
-                // 检查下一个元素是否是隐藏的悬浮图容器
-                if (hiddenItem && hiddenItem.classList && hiddenItem.classList.contains('modal-item') && hiddenItem.style.display === 'none') {
-                    hoverImg = hiddenItem.querySelector('.modal-item-img');
-                }
-                
-                // 如果有悬浮图
-                if (hoverImg && defaultImg) {
-                    const originalSrc = defaultImg.src;
-                    const hoverSrc = hoverImg.src;
-                    const link = item.getAttribute('data-link');
-                    
-                    // 移除原有的href，因为需要悬浮图效果
-                    item.style.cursor = 'pointer';
-                    
-                    // 鼠标移入：显示悬浮图
-                    item.addEventListener('mouseenter', function(e) {
-                        e.stopPropagation();
-                        defaultImg.src = hoverSrc;
-                    });
-                    
-                    // 鼠标移出：恢复普通图
-                    item.addEventListener('mouseleave', function(e) {
-                        e.stopPropagation();
-                        defaultImg.src = originalSrc;
-                    });
-                    
-                    // 点击事件：如果有链接就跳转
-                    item.addEventListener('click', function(e) {
-                        e.stopPropagation();
-                        if (link && link !== '#') {
-                            window.location.href = link;
-                        }
-                    });
-                } else {
-                    // 没有悬浮图，保持原有链接
-                    const link = item.getAttribute('href') || item.getAttribute('data-link');
-                    if (link && link !== '#') {
-                        item.addEventListener('click', function(e) {
-                            e.stopPropagation();
-                            window.location.href = link;
-                        });
-                    }
-                }
-            });
-        }
-        
-        // 在购物车弹窗打开时初始化悬浮图功能
-        const cartModalObserver = new MutationObserver(function(mutations) {
-            mutations.forEach(function(mutation) {
-                if (mutation.attributeName === 'class') {
-                    if (cartModal.classList.contains('show')) {
-                        setTimeout(function() {
-                            initCartModalHover();
-                        }, 50);
-                    }
-                }
-            });
-        });
-        
-        if (cartModal) {
-            cartModalObserver.observe(cartModal, { attributes: true });
-            // 如果弹窗默认是打开的，也初始化一次
-            if (cartModal.classList.contains('show')) {
-                initCartModalHover();
-            }
-        }
-    });
 </script>
-

app/index/view/mobile/public/nas_header.html

@@ -12,30 +12,22 @@
                 <span class="icon-category cursor_p top-menu-toggle"><i class="icon-menu-svg"></i></span>
             </div>
         </div>
-    </div>
-     <!-- 顶部国家选择-->
-    <div class="top-country">
-        <div class="mask"></div>
-        <div class="action-sheet">
-            <div class="menu-title">
-                <div class="menu-name">{:lang_i18n('请择地区')}</div>
-                <div class="close-icon">
-                    <img src="__IMAGES__/close.png">
-                </div>
-            </div>
-            <ul>
-                {volist name="header_languages" id="la"}
-                <li>
-                    <a href="{$la.lang_url}" target="_blank">
-                        <img src="{$la.lang_icon}">{$la.country_en_name} - {$la.lang_en_name}
-                    </a>
-                </li>
-                {/volist}
-            </ul>
-        </div>
     </div>
     <!-- 顶部菜单-->
     <div class="top-menu">
+        <div class="it-ct">
+            <div class="it-1"><a href="/">{:lang_i18n('首页')}</a></div>
+        </div>
+        <div class="it-ct">
+            <div class="it-1">
+                <div class="it-1-more">{:lang_i18n('产品列表')}<i class="icon-arrow"></i></div>
+                {notempty name="header_categorys"}
+                {volist name="header_categorys" id="ca"}
+                <div class="it-1-2"><a href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a></div>
+                {/volist}
+                {/notempty}
+            </div>
+        </div>
         {notempty name="header_navigation"}
         {volist name="header_navigation" id="nav"}
         <div class="it-ct">
@@ -67,13 +59,7 @@
             $(this).siblings('.it-1-2').slideToggle(800);
             $(this).find('.icon-arrow').addClass('rotate');
         });
-        // 顶部国家选择
-        $('.top-country-toggle').click(function(){
-            $(".mask,.action-sheet").show();
-        })
-        $('.top-country .close-icon').click(function(){
-            $(".mask,.action-sheet").hide();
-        })
+
         // 移动端顶部宽度设置和主体内容宽度一致
         var pageWidth = $('.oricoEGapp').outerWidth();
         // 设置.header-PC元素的宽度

app/index/view/mobile/topic_nas/help_detail.html

@@ -33,17 +33,14 @@
             </div>
         </div>
         <!-- 文章内容 -->
-        <div class="ql-container">
-            <div id="rendered-content" class="nhlp-app-content ql-editor">
+        <div id="rendered-content" class="nhlp-app-content">
             {$article.content|raw|default=''}
         </div>
-        </div>
         <!-- 搜索 -->
         <div class="nhlpapp-search">
             <div class="nhlpappshtop">
                 <div class="nhlpapp-shdiv">
-                    <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}"
-                        autocomplete="off">
+                    <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off">
                     <img src="__IMAGES__/ssapp.png" class="searchimg">
                 </div>
                 <span class="closetx">{:lang_i18n('取消')}</span>
@@ -53,44 +50,22 @@
             <div class="dropdown" id="dropdown"></div>
         </div>
         <!-- 分类文章目录 -->
-        <div class="nhlpapp-pagescate" {:style(['display'=> $Request.get.view == 'more' ? 'block' : 'none'])}>
+        <div class="nhlpapp-pagescate" {:style(['display' => $Request.get.view == 'more' ? 'block' : 'none'])}>
             <div class="nars-hlpdt-ml">
                 {notempty name="article_categorys"}
                 <div class="nav-tree">
-
-                    
                     {volist name="article_categorys" id="ac" key="idx"}
                     <div class="categoryhelp">
                         <div class="categoryhelp-title">
                             <div>
-                                <img src="__IMAGES__/nars-jt.png"
-                                    class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
+                                <img src="__IMAGES__/nars-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
                             </div>
                             <span>{$ac.name}</span>
                         </div>
-                        <ul class="sub-list" {if condition='$ac.id == $Request.get.cid' }style="display: block;" {/if}>
-                            {volist name="ac.child" id="ad"}
-                            <li class="two-mues">
-                                <a href="#" class="two-a">
-                                    <div><img src="__IMAGES__/nars-jt.png"
-                                              class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}">
-                                    </div>
-                                    <span>{$ad.name}</span>
-                                </a>
-                                <ul class="thress-mues" {if condition='$ad.id == $Request.get.pid' }style="display: block;" {/if}>
-                                    {volist name="ad.article" id="ae"}
-                                    <li>
-                                        <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id ,'pid' => $ad.id, 'id' => $ae.id])}"
-                                           style="margin-left:18%;padding: 0.4rem;">{$ae.title}</a>
-                                    </li>
-                                    {/volist}
-                                </ul>
-                            </li>
-                            {/volist}
+                        <ul class="sub-list" {if condition='$ac.id == $Request.get.cid'}style="display: block;"{/if}>
                             {volist name="ac.article" id="ar"}
                             <li>
-                                <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id , 'id' => $ar.id])}"
-                                    style="padding-top: 6px;">
+                                <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id , 'id' => $ar.id])}" style="padding-top: 6px;">
                                     {$ar.title}
                                 </a>
                             </li>
@@ -98,34 +73,10 @@
                         </ul>
                     </div>
                     {/volist}
-
-
-
                 </div>
                 {/notempty}
             </div>
         </div>
-        <!-- 顶部国家选择-->
-        <div class="top-country">
-            <div class="mask"></div>
-            <div class="action-sheet">
-                <div class="menu-title">
-                    <div class="menu-name">{:lang_i18n('请择地区')}</div>
-                    <div class="close-icon">
-                        <img src="__IMAGES__/close.png">
-                    </div>
-                </div>
-                <ul>
-                    {volist name="header_languages" id="la"}
-                    <li>
-                        <a href="{$la.lang_url}" target="_blank">
-                            <img src="{$la.lang_icon}">{$la.country_en_name} - {$la.lang_en_name}
-                        </a>
-                    </li>
-                    {/volist}
-                </ul>
-            </div>
-        </div>
     </div>
 </div>
 {/block}
@@ -151,17 +102,6 @@
             $(this).next('.sub-list').slideToggle();
             $(this).find('.arrow').toggleClass('rotate');
         });
-        //分类二三级交互
-        $('.two-a').click(function(e) {
-			e.preventDefault();
-			e.stopPropagation(); // 阻止事件冒泡
-
-			// 切换当前二级菜单的箭头方向
-			$(this).find('.arrow').toggleClass('rotate');
-
-			// 切换对应的三级菜单显示/隐藏
-			$(this).siblings('.thress-mues').slideToggle();
-		});
         // 点击顶部搜索图标-点击取消关闭
         $('#ssico').click(function () {
             $('.nhlpapp-pagescate').hide();
@@ -170,13 +110,6 @@
         $('.closetx').click(function () {
             $('.nhlpapp-search').hide();
         });
-        // 顶部国家选择
-        $('.top-country-toggle').click(function () {
-            $(".mask,.action-sheet").show();
-        })
-        $('.top-country .close-icon').click(function () {
-            $(".mask,.action-sheet").hide();
-        })
         // 搜索
         var timeout = null;
         $('#search-input').on('focus input', function () {
@@ -209,27 +142,6 @@
                 })
             }, 300);
         });
-        // 英文截断处理
-        // 目标容器：富文本内容所在的元素
-        const contentContainer = $('#rendered-content');
-
-        // 遍历所有包含文本内容的标签（p、h1-h6、strong等）
-        contentContainer.find('*').each(function () {
-            const $element = $(this);
-            const htmlContent = $element.html();
-
-            // 条件1：排除内容仅为一个&nbsp;的标签（如<p>&nbsp;</p>）
-            if (htmlContent.trim() === '&nbsp;') {
-                return; // 不处理，继续下一个元素
-            }
-
-            // 条件2：检查是否包含&nbsp;且有实际文本内容
-            if (htmlContent.includes('&nbsp;')) {
-                // 将所有&nbsp;替换为普通空格（有效占位符，支持单词完整换行）
-                const newContent = htmlContent.replace(/&nbsp;/g, ' ');
-                $element.html(newContent);
-            }
-        });
     });
 </script>
 {/block}

app/index/view/mobile/topic_power_prodline/index.html

@@ -1,763 +0,0 @@
-{extend name="public/base" /}
-{block name="style"}
-<!-- 将rem适配JS移到这里，确保优先执行 -->
-<script type="text/javascript">
-    (function (doc, win) {
-        var docEl = doc.documentElement;
-        var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize';
-        
-        function setRootFontSize() {
-            var clientWidth = docEl.clientWidth;
-            if (!clientWidth) return;
-            var fontSize = clientWidth / 7.5; // 750px/7.5=100px，375px/7.5=50px
-            // 直接修改内联样式，优先级最高
-            docEl.setAttribute('style', 'font-size: ' + fontSize + 'px !important;');
-        }
-        
-        setRootFontSize();
-        win.addEventListener(resizeEvt, setRootFontSize);
-        doc.addEventListener('DOMContentLoaded', setRootFontSize);
-    })(document, window);
-</script>
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/index.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/swiper.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/nav.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/advantage.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/moren.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/mask.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product_list.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product_card.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/footer.css">
-
-{/block}
-
-{block name="main"}
-<!-- <a class="header" href="/">
-    <div class="header-img">
-        <img src="__IMAGES__/logo.png" alt="">
-    </div>
-</a> -->
-<!-- 轮播核心容器 -->
-<div class="swiper-container auto-swiper-container" >
-    {notempty name="data.focus_image"}
-    <div class="swiper-wrapper">
-        {volist name="data.focus_image" id="fo"}
-        <a class="swiper-slide auto-swiper-slide" href="{$fo.link}">
-            <img src="{$fo.image}" alt="{$fo.title}"  />
-        </a>
-        {/volist}
-    </div>
-    <div class="swiper-pagination"></div>
-    {/notempty}
-</div>
-<!-- 分类 -->
-{notempty name="data.category"}
-<div class="nav-box">
-    {volist name="data.category" id="ca"}
-    <a class="nav-item" href="{$ca.link}">
-        <img src="{$ca.image}" alt="{$ca.title}">
-        <p {:style(['color'=>$ca.title_txt_color])}>{$ca.title}</p>
-    </a>
-    {/volist}
-</div>
-{/notempty}
-<!-- 500万 -->
-{notempty name="data.why_choose"}
-<div class="advantage-section">
-    {assign name="why_choose_title" value=":array_shift($data.why_choose)" /}
-    <h2 class="advantage-section__title">{$why_choose_title.title|default=''|raw}</h2>
-    <div class="advantage-section__list">
-        {volist name="data.why_choose" id="ch"}
-        <div class="advantage-card-wrap">
-            <div class="advantage-card" data-target="design">
-                <img src="{$ch.image}" alt="{$ch.title}:{$ch.short_title}" class="advantage-card__img">
-                <div class="advantage-card__content">
-                    <!-- 标题+箭头容器：水平+垂直双居中，内部文字左、箭头右 -->
-                    <div class="advantage-card__heading-wrap">
-                        <div class="advantage-card__heading" {:style(['color'=>$ch.title_txt_color])}>{$ch.title}</div>
-                        <img src="__IMAGES__/jiant.png" alt="" class="card-arrow">
-                    </div>
-                    <div class="advantage-card__description" {:style(['color'=>$ch.short_title_txt_color])}>{$ch.short_title}</div>
-                    <div style="display:none;" class="mack-conten-text">{$ch.desc|raw}</div>
-                </div>
-            </div>
-         </div>
-        {/volist}
-    </div>
-</div>
-{/notempty}
-<!-- 产品差旅充 -->
-{notempty name="data.travel_charger"}
-<div class="product-box">
-    {assign name="tc_title" value=":array_shift($data.travel_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$tc_title.title|default=''}</h2>
-        <p class="product-title-p">{$tc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container" >
-        {assign name="tc_first_section_lf" value=":array_shift($data.travel_charger)" /}
-        {notempty name="tc_first_section_lf"}
-        <a class="product-left" href="{$tc_first_section_lf.link}">
-            <img src="{$tc_first_section_lf.image}" alt="{$tc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover  top55">
-                <img src="{$tc_first_section_lf.extra_image}" alt="{$tc_first_section_lf.short_title}" class="img1">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="tc_first_section_lr" value=":array_shift($data.travel_charger)" /}
-        {notempty name="tc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$tc_first_section_lr.image}" alt="{$tc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$tc_first_section_lr.video}" class="right-content right-video" muted loop playsinline>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-            <button class="video-play-btn">
-                <span class="play-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <path d="M9 7L16 12L9 17V7Z" fill="white" />
-                    </svg>
-                </span>
-                <!-- 暂停图标（默认隐藏） -->
-                <span class="pause-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <rect x="8" y="7" width="3" height="10" fill="white" />
-                        <rect x="13" y="7" width="3" height="10" fill="white" />
-                    </svg>
-                </span>
-            </button>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="tc_second_section" value=":array_splice($data.travel_charger, 0, 4)" /}
-    {notempty name="tc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container">
-            {volist name="tc_second_section" id="tss"}
-            <a class="product-card-wrap" href="{$tss.link}">
-                <div class="product-card" >
-                    <div class="product-card-img">
-                        <img src="{$tss.image}" alt="{$tss.title}">
-                    </div>
-                    <div class="product-card-text">
-                        <div class="product-card-title" {:style(['color'=>$tss.title_txt_color])}>{$tss.title}</div>
-                        <div class="product-card-desc" {:style(['color'=>$tss.short_title_txt_color])}>{$tss.short_title}</div>
-                    </div>
-                    <div class="product-card-link">
-                        <img src="__IMAGES__/ljgd.png" alt="查看更多">
-                    </div>
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-    {assign name="tc_three_section" value=":array_shift($data.travel_charger)" /}
-    {notempty name="tc_three_section"}
-    <a href="{$tc_three_section.link}" class="more">
-        <div class="more-img">
-            {$tc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-    {/notempty}
-</div>
-{/notempty}
-<!-- 产品 家居充-->
-{notempty name="data.home_charger"}
-<div class="product-box">
-    {assign name="hc_title" value=":array_shift($data.home_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$hc_title.title|default=''}</h2>
-        <p class="product-title-p">{$hc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="hc_first_section_lf" value=":array_shift($data.home_charger)" /}
-        {notempty name="hc_first_section_lf"}
-        <a class="product-left" href="{$hc_first_section_lf.link}">
-            <img src="{$hc_first_section_lf.image}" alt="{$hc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover">
-                <img src="{$hc_first_section_lf.extra_image}" alt="{$hc_first_section_lf.short_title}" class="img2">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="hc_first_section_lr" value=":array_shift($data.home_charger)" /}
-        {notempty name="hc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$hc_first_section_lr.image}" alt="{$hc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$hc_first_section_lr.video}" class="right-content right-video" muted loop playsinline >
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-            <button class="video-play-btn">
-                <span class="play-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <path d="M9 7L16 12L9 17V7Z" fill="white" />
-                    </svg>
-                </span>
-                <!-- 暂停图标（默认隐藏） -->
-                <span class="pause-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <rect x="8" y="7" width="3" height="10" fill="white" />
-                        <rect x="13" y="7" width="3" height="10" fill="white" />
-                    </svg>
-                </span>
-            </button>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="hc_second_section" value=":array_splice($data.home_charger, 0, 4)" /}
-    {notempty name="hc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container">
-            {volist name="hc_second_section" id="hcs"}
-            <a class="product-card-wrap" href="{$hcs.link}">
-                <div class="product-card" href="#">
-                    <div class="product-card-img">
-                        <img src="{$hcs.image}" alt="{$hcs.short_title}">
-                    </div>
-                    <div class="product-card-text">
-                        <div class="product-card-title">{$hcs.title}</div>
-                        <div class="product-card-desc">{$hcs.short_title}</div>
-                    </div>
-                    <div class="product-card-link">
-                        <img src="__IMAGES__/ljgd.png" alt="查看更多">
-                    </div>
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-    {/notempty}
-    {assign name="hc_three_section" value=":array_shift($data.home_charger)" /}
-    {notempty name="hc_three_section"}
-    <a href="{$hc_three_section.link}" class="more">
-        <div class="more-img">
-            {$hc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-<!-- 产品 桌面充（悬浮图上右超出）底部列表样式不一样(左文右图) -->
-<div class="product-box">
-    {assign name="dc_title" value=":array_shift($data.desktop_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$dc_title.title|default=''}</h2>
-        <p class="product-title-p">{$dc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="dc_first_section_lf" value=":array_shift($data.desktop_charger)" /}
-        {notempty name="dc_first_section_lf"}
-        <a class="product-left" href="{$dc_first_section_lf.link}">
-            <img src="{$dc_first_section_lf.image}" alt="{$dc_first_section_lf.short_title}" class="product-img">
-            <!-- 公共类+定位类：尺寸和第一个完全一致，仅定位不同 -->
-            <div class="product-img-hover right" >
-                <img src="{$dc_first_section_lf.extra_image}" alt="{$dc_first_section_lf.short_title}" class="img3">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="dc_first_section_lr" value=":array_shift($data.desktop_charger)" /}
-        {notempty name="dc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$dc_first_section_lr.image}"
-                alt="使用场景" class="right-content right-img">
-                <!--muted loop playsinline controls-->
-            <video
-                src="{$dc_first_section_lr.video}"
-                class="right-content right-video"  muted loop playsinline >
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-            <button class="video-play-btn">
-                <span class="play-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <path d="M9 7L16 12L9 17V7Z" fill="white" />
-                    </svg>
-                </span>
-                <!-- 暂停图标（默认隐藏） -->
-                <span class="pause-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <rect x="8" y="7" width="3" height="10" fill="white" />
-                        <rect x="13" y="7" width="3" height="10" fill="white" />
-                    </svg>
-                </span>
-            </button>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="dc_second_section" value=":array_splice($data.desktop_charger, 0, 2)" /}
-    {notempty name="dc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container">
-            {volist name="dc_second_section" id="dcs"}
-            <a class="product-card-wrap" href="{$dcs.link}">
-                <div class="product-card" href="#">
-                    <div class="product-card-img">
-                        <img src="{$dcs.image}" alt="{$dcs.short_title}">
-                    </div>
-                    <div class="product-card-text">
-                        <div class="product-card-title">{$dcs.title}</div>
-                        <div class="product-card-desc">{$dcs.short_title}</div>
-                    </div>
-                    <div class="product-card-link">
-                        <img src="__IMAGES__/ljgd.png" alt="查看更多">
-                    </div>
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-
-    {/notempty}
-    {assign name="dc_three_section" value=":array_shift($data.desktop_charger)" /}
-    {notempty name="dc_three_section"}
-    <a href="{$dc_three_section.link}" class="more">
-        <div class="more-img">
-            {$dc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-<!-- 墙插 -->
-{notempty name="data.wall_charger"}
-<div class="product-box">
-    {assign name="wc_title" value=":array_shift($data.wall_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$wc_title.title|default=''}</h2>
-        <p class="product-title-p">{$wc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="wc_first_section_lf" value=":array_shift($data.wall_charger)" /}
-        {notempty name="wc_first_section_lf"}
-        <a class="product-left" href="{$wc_first_section_lf.link}">
-            <img src="{$wc_first_section_lf.image}" alt="{$wc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover  top70">
-                <img src="{$wc_first_section_lf.extra_image}" alt="{$wc_first_section_lf.title}" class="img4">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="wc_first_section_lr" value=":array_shift($data.wall_charger)" /}
-        {notempty name="wc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$wc_first_section_lr.image}" alt="{$wc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$wc_first_section_lr.video}" class="right-content right-video" muted loop playsinline>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-            <button class="video-play-btn">
-                <span class="play-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <path d="M9 7L16 12L9 17V7Z" fill="white" />
-                    </svg>
-                </span>
-                <!-- 暂停图标（默认隐藏） -->
-                <span class="pause-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <rect x="8" y="7" width="3" height="10" fill="white" />
-                        <rect x="13" y="7" width="3" height="10" fill="white" />
-                    </svg>
-                </span>
-            </button>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="wc_more_section" value=":array_shift($data.wall_charger)" /}
-    {notempty name="wc_more_section"}
-    <a href="{$wc_more_section.link}" class="more">
-        <div class="more-img">
-            {$wc_more_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-{notempty name="data.converter"}
-<!-- 转换器 -->
-<div class="product-box">
-    {assign name="ct_title" value=":array_shift($data.converter)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$ct_title.title|default=''}</h2>
-        <p class="product-title-p">{$ct_title.short_title|default=''}</p>
-    </div>
-    {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"}
-    <div class="product-container">
-        {assign name="cts_lf" value=":array_shift($cts)" /}
-        {notempty name="cts_lf"}
-        <a class="product-left" href="{$cts_lf.link}">
-            <img src="{$cts_lf.image}" alt="{$cts_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同  -->
-            <!--style="display:flex;justify-content: center;"-->
-            <div class="product-img-hover  top40" >
-                <!-- style="width:70%"-->
-                <img src="{$cts_lf.extra_image}" alt="{$cts_lf.title}" class="img5">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="cts_lr" value=":array_shift($cts)" /}
-        {notempty name="cts_lr"}
-        <div class="product-right">
-            <img src="{$cts_lr.image}" alt="{$cts_lr.title}" class="right-content right-img">
-            <video src="{$cts_lr.video}" class="right-content right-video" muted loop playsinline>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-              <!-- 播放图标 -->
-              <button class="video-play-btn">
-                <span class="play-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <path d="M9 7L16 12L9 17V7Z" fill="white" />
-                    </svg>
-                </span>
-                <!-- 暂停图标（默认隐藏） -->
-                <span class="pause-icon">
-                    <svg width="40" height="40" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <circle cx="12" cy="12" r="10" fill="rgba(0,0,0,0.5)" />
-                        <rect x="8" y="7" width="3" height="10" fill="white" />
-                        <rect x="13" y="7" width="3" height="10" fill="white" />
-                    </svg>
-                </span>
-            </button>
-        </div>
-        {/notempty}
-    </div>
-    {neq name="k" value="$ct_chunk_section_len"}
-    <div class="line"></div>
-    {/neq}
-    {/volist}
-    {notempty name="ct_more_section"}
-    <a href="{$ct_more_section.link}" class="more">
-        <div class="more-img">
-            {$ct_more_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-{notempty name="data.footer_info"}
-<!-- 底部 -->
-<div class="prodline-footer-box">
-    <div class="prodline-footer-box-img">
-        <img src="{$data.footer_info.0.image}" alt="">
-    </div>
-</div>
-{/notempty}
-<!-- 蒙版 -->
-<div class="mask" id="mask">
-    <div class="mask-content" >
-        <span class="close-btn">&times;</span>
-        <div class="mask-scroll-content"></div>
-    </div>
-</div> 
-
-
-
-
-{/block}
-{block name="script"}
-<script type="text/javascript">
-    let swiper=null;
-    const advantageItems = document.querySelectorAll('.advantage-card');
-    let scrollTop = 0; // 保存页面滚动位置
-    let closeBtnHtml = null; // 关闭按钮元素（全局变量，避免重复创建）
-    const mask = document.getElementById('mask');
-    const maskContent = document.querySelector('.mask-content');
-    const maskScrollContent = document.querySelector('.mask-scroll-content'); // 滚动容器（关键！）
-    const closeBtn = document.querySelector('.close-btn')
-    // 初始化：确保 maskScrollContent 存在于 maskContent 中（避免被清空）
-    if (!maskScrollContent) {
-        // 如果页面没有 mask-scroll-content，动态创建（确保结构稳定）
-        const scrollContent = document.createElement('div');
-        scrollContent.className = 'mask-scroll-content';
-        maskContent.appendChild(scrollContent);
-    }
-
-    function createCloseBtn() {
-        if (closeBtnHtml) {
-            closeBtnHtml.remove();
-        }
-
-        closeBtnHtml = document.createElement('span');
-        closeBtnHtml.className = 'close-btn';
-        closeBtnHtml.innerHTML = '&times;';
-
-        closeBtnHtml.addEventListener('click', hideMask);
-
-        // 挂载到 maskContent（而非 scrollContent），避免被滚动影响位置
-        maskContent.prepend(closeBtnHtml);
-    }
-
-    function showMask(contentHtml) {
-        // 保存页面滚动位置
-        scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-        
-        // 关键：将内容填充到 scrollContent 中（而非直接替换 maskContent）
-        maskScrollContent.innerHTML = contentHtml; 
-        createCloseBtn();
-        
-        // 显示蒙版
-        mask.style.display = 'flex';
-        
-        // 禁止滚动（复用你的逻辑）
-        document.documentElement.classList.add('no-scroll');
-        document.body.classList.add('no-scroll');
-        document.body.style.top = `-${scrollTop}px`;
-        
-        // 额外：打开蒙版时就重置滚动位置（避免残留上次滚动状态）
-        maskScrollContent.scrollTop = 0;
-    }
-
-    function hideMask() {
-        // 关键步骤 1：先重置 scrollContent 的滚动位置（此时元素还未被销毁）
-        maskScrollContent.scrollTop = 0;
-        
-        // 关键步骤 2：清空 scrollContent 的内容（而非 maskContent）
-        maskScrollContent.innerHTML = ""; 
-        
-        // 隐藏蒙版
-        mask.style.display = 'none';
-        
-        // 恢复滚动（复用你的逻辑）
-        document.documentElement.classList.remove('no-scroll');
-        document.body.classList.remove('no-scroll');
-        document.body.style.top = '';
-        
-        // 还原页面滚动位置
-        window.scrollTo(0, scrollTop);
-        
-        // 移除关闭按钮（可选，避免残留）
-        if (closeBtnHtml) {
-            closeBtnHtml.remove();
-            closeBtnHtml = null;
-        }
-    }
-        // 点击卡片显示详情
-    advantageItems.forEach((item) => {
-        item.addEventListener('click', (e) => {
-            // 获取当前点击卡片内的.mack-conten-text元素
-            const currentMackContent = e.currentTarget.querySelector('.mack-conten-text');
-            if (currentMackContent) {
-                // 关键修改：获取该元素的子内容（innerHTML 本身就是内部HTML，不含当前元素标签）
-                // 若想更彻底，可遍历子节点拼接内容（兼容特殊场景）
-                let contentHtml = '';
-                Array.from(currentMackContent.childNodes).forEach(child => {
-                    // 只保留元素节点和文本节点（过滤空节点）
-                    if (child.nodeType === 1 || child.nodeType === 3) {
-                        contentHtml += child.outerHTML || child.textContent;
-                    }
-                });
-                // 显示蒙版并传入纯净的子内容
-                showMask(contentHtml);
-            } 
-            });
-    });
-    // 关闭按钮事件
-    closeBtn.addEventListener('click', hideMask);
-    // 点击蒙版背景关闭（可选）
-    mask.addEventListener('click', (e) => {
-        if (e.target === mask) hideMask();
-    });
-
-    // ESC 键关闭（可选）
-    document.addEventListener('keydown', (e) => {
-        if (e.key === 'Escape' && mask.style.display === 'flex') hideMask();
-    });
-
-    // 关键：拦截蒙版的 touchmove 事件，阻止滚动穿透（移动端核心）
-    mask.addEventListener(
-        'touchmove',
-        (e) => {
-            // 只有点击蒙版背景（不是内容区域）才阻止滚动
-            if (e.target === mask) {
-                e.preventDefault(); // 阻止默认触摸滚动行为
-                e.stopPropagation(); // 阻止事件冒泡
-            }
-        },
-        { passive: false }
-    ); // passive: false 必须，否则 preventDefault 无效
-    document.addEventListener('DOMContentLoaded', () => {
-            // 初始化所有视频容器
-            function initVideoContainers() {
-                const productRights = document.querySelectorAll('.product-right');
-                // 支持的视频格式
-                const supportedVideoFormats = ['.mp4', '.webm', '.ogg', '.mov', '.avi', '.mkv', '.flv', '.wmv'];
-                productRights.forEach((container, index) => {
-                    const video = container.querySelector('.right-video');
-                    const btn = container.querySelector('.video-play-btn');
-                    const img = container.querySelector('.right-img');
-                    if (!video || !btn || !img) return;
-                    const videoSrc = video.src.trim()
-                    console.log(videoSrc,'=videoSrc=')
-                    // 修复：正确检测有效视频地址
-                    // 排除空字符串、null、undefined
-                    const hasValidVideo = !!videoSrc && videoSrc.trim() !== '' && videoSrc !== 'undefined' && videoSrc !== 'null';
-
-                    // 验证视频格式是否有效
-                    const isValidFormat = supportedVideoFormats.some(format => 
-                        videoSrc.toLowerCase().endsWith(format) || 
-                        (videoSrc.includes('?') && videoSrc.toLowerCase().split('?')[0].endsWith(format))
-                    );
-
-                    // 初始化状态：无视频或格式无效则保持图片显示，永不切换
-                    if (!hasValidVideo || !isValidFormat) {
-                        img.style.display = 'block';
-                        video.style.display = 'none';
-                        btn.style.display = 'none';
-                        // 绑定空方法，防止调用报错
-                        video.switchMedia = function() {};
-                        console.log(`容器${index}：无有效视频(src="${videoSrc}")，保持图片显示`);
-                        return;
-                    }
-
-                    // 有有效视频的情况
-                    console.log(`容器${index}：有有效视频(src="${videoSrc}")，初始化播放逻辑`);
-                    
-                    // 初始状态
-                    video.style.display = 'none';
-                    video.pause();
-                    img.style.display = 'block';
-                    btn.style.display = 'none';
-                    btn.style.opacity = '0';
-
-                    // 同步状态函数
-                    function syncMediaState() {
-                        if (img.style.display === 'block') {
-                            btn.style.display = 'none';
-                            btn.style.opacity = '0';
-                        } else {
-                            btn.style.display = 'block';
-                            btn.style.opacity = '1';
-                            btn.classList.toggle('paused', !video.paused && !video.ended);
-                        }
-                    }
-
-                    // 按钮点击事件
-                    btn.addEventListener('click', () => {
-                        if (video.paused) {
-                            video.play().catch(() => syncMediaState());
-                        } else {
-                            video.pause();
-                        }
-                        syncMediaState();
-                    });
-
-                    // 视频事件监听
-                    ['play', 'pause', 'ended', 'playing', 'waiting'].forEach(event => {
-                        video.addEventListener(event, syncMediaState);
-                    });
-
-                    // 滚动切换函数
-                    video.switchMedia = function(showVideo) {
-                        // 只处理有有效视频的情况
-                        if (showVideo) {
-                            img.style.display = 'none';
-                            video.style.display = 'block';
-                            video.play().catch(() => {
-                                console.log(`容器${index}：自动播放失败，需要用户交互`);
-                                syncMediaState();
-                            });
-                        } else {
-                            video.pause();
-                            img.style.display = 'block';
-                            video.style.display = 'none';
-                        }
-                        syncMediaState();
-                    };
-
-                    // 初始同步
-                    syncMediaState();
-                });
-            }
-
-            // 滚动监听 - 优化版
-            function setupScrollWatcher() {
-                let ticking = false;
-                
-                function updateVideoVisibility() {
-                    const productRights = document.querySelectorAll('.product-right');
-                    
-                    productRights.forEach(container => {
-                        const video = container.querySelector('.right-video');
-                        if (!video || !video.switchMedia) return;
-
-                        // 检查是否在视口中
-                        const rect = container.getBoundingClientRect();
-                        const viewHeight = window.innerHeight || document.documentElement.clientHeight;
-                        const isInView = rect.top < viewHeight * 0.7 && rect.bottom > viewHeight * 0.3;
-                        
-                        // 只对有有效视频的元素调用switchMedia
-                        video.switchMedia(isInView);
-                    });
-                    
-                    ticking = false;
-                }
-                
-                // 使用requestAnimationFrame优化性能
-                window.addEventListener('scroll', () => {
-                    if (!ticking) {
-                        requestAnimationFrame(updateVideoVisibility);
-                        ticking = true;
-                    }
-                });
-            }
-
-            // 初始化
-            initVideoContainers();
-            setupScrollWatcher();
-            
-            // 初始检查一次
-            setTimeout(() => {
-                const event = new Event('scroll');
-                window.dispatchEvent(event);
-            }, 300);
-    });
-
-    window.onload = function () {
-        if (typeof Swiper === 'undefined') {
-            console.error('Swiper加载失败，请刷新页面重试');
-            return;
-        }
-
-        swiper = new Swiper('.auto-swiper-container', {
-            autoplay: {
-                delay: 3000, // 3秒切换
-                disableOnInteraction: false,
-            },
-            loop: false,
-            slidesPerView: 1,
-            spaceBetween: 0,
-            // 启用分页指示标（核心配置）
-            pagination: {
-                el: '.swiper-pagination', // 对应 HTML 中的指示标容器
-                clickable: true, // 允许点击指示标切换
-                // dynamicBullets: true, // 动态指示标（当前激活放大）
-                //dynamicMainBullets: 3, // 动态模式显示3个核心指示标
-            },
-            navigation: false,
-            scrollbar: false,
-            on: {
-                resize: function () {
-                    this.update();
-                },
-            },
-        });
-
-        window.addEventListener('resize', function () {
-            swiper.update();
-        });
-
-        // 初始化时触发滚动事件，确保状态正确
-        window.dispatchEvent(new Event('scroll'));
-    };
-</script>
-{/block}

app/index/view/pc/about_us/mileage.html

@@ -5,7 +5,7 @@
 {block name="main"}
 <div class="orico_Page_achievement">
     <div class="achievementMain">
-        <img src="__IMAGES__/Achievement.webp" class="acvImg" />
+        <img src="__IMAGES__/Achievement.png" class="acvImg" />
         <div class="achInfo">
             <div class="title">{:lang_i18n('ORICO荣耀')}</div>
             {notempty name="achievement"}

app/index/view/pc/about_us/story.html

@@ -6,7 +6,7 @@
 <div class="orico_Page_brand">
     <!--内容 -->
     <div class="brandMain">
-        <img src="__IMAGES__/OurBrand.webp" class="img-responsive" />
+        <img src="__IMAGES__/OurBrand.png" class="img-responsive" />
         {notempty name="banners"}
         <div class="our_brand_con">
             {volist name="banners" id="ba" offset="0" length="2"}

app/index/view/pc/article/detail.html

@@ -24,9 +24,7 @@
 					<p>{$detail.release_time|date_format_i18n}</p>
 				</div>
 				<!-- 文本渲染-->
-				<div class="ql-container">
-					<div class="blog_content ql-editor">{$detail.content|raw}</div>
-				</div>
+				<div class="blog_content">{$detail.content|raw}</div>
 			</div>
 			<!-- 评论只显示前面五条--->
 			{notempty name="comments"}

app/index/view/pc/attachment/index.html

@@ -7,14 +7,14 @@
     <!-- 内容 -->
     <div class="downloadMain">
         <div class="topimg">
-            <img src="__IMAGES__/banner_01.webp" />
+            <img src="__IMAGES__/banner_01.png" />
             <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/index')}" method="get">
                 <div class="search_all">
-                    <input type="hidden" name="id" value="{$Request.get.id??$categorys[0]['id']??''}" />
+                    <input type="hidden" name="id" value="{$Request.get.id}" />
                     <input type="text" name="keyword" placeholder="{:lang_i18n('搜索')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>

app/index/view/pc/attachment/video.html

@@ -7,14 +7,14 @@
     <!-- 内容 -->
     <div class="downloadMain">
         <div class="topimg">
-            <img src="__IMAGES__/banner_01.webp" />
+            <img src="__IMAGES__/banner_01.png" />
             <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/video')}" method="get">
                 <div class="search_all">
-                    <input type="hidden" name="id" value="{$Request.get.id??$video_categorys[0]['id']??''}" />
+                    <input type="hidden" name="id" value="{$Request.get.id}" />
                     <input type="text" name="keyword" placeholder="{:lang_i18n('搜索')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>

app/index/view/pc/index/index.html

@@ -9,7 +9,7 @@
 	<div class="pageMain">
 		<!-- banner -->
 		{notempty name="focus_images"}
-		<div class="swiper-container bannerswiper" style="background: #fff;">
+		<div class="swiper-container bannerswiper">
 			<div class="swiper-wrapper">
 				{volist name="focus_images" id="focus"}
 				<div class="swiper-slide">
@@ -112,13 +112,13 @@
 		<div class="sceneIntroduction">
 			{volist name="scenes" id="scene"}
 			<div class="sceneitem">
-				<a class="sceneInfo" href="{$scene.link}">
-					<!-- <p class="scenetitle" {notempty name="scene.title_txt_color" }style="color:{$scene.title_txt_color};" {/notempty}>{$scene.title}</p>
+				<div class="sceneInfo">
+					<p class="scenetitle" {notempty name="scene.title_txt_color" }style="color:{$scene.title_txt_color};" {/notempty}>{$scene.title}</p>
 					<p class="subtitle" {notempty name="scene.desc_txt_color" }style="color:{$scene.desc_txt_color};" {/notempty}>
 						{$scene.desc|raw}</p>
-					<a class="sceneMore" href="{$scene.link}">{:lang_i18n('了解更多')} ></a> -->
+					<a class="sceneMore" href="{$scene.link}">{:lang_i18n('了解更多')} ></a>
+				</div>
 				<div style="background-image: url('{$scene.image}');" class="sceneimg"></div>
-				</a>
 			</div>
 			{/volist}
 		</div>
@@ -129,10 +129,10 @@
 			<span class="otsbtitle">{:lang_i18n('强大功能、简单使用')}</span>
 			<div class="beforeafter ba-slider">
 				<!-- 对比前的图片 -->
-				<img src="__IMAGES__/indeximg1.webp">
+				<img src="__IMAGES__/indeximg1.jpg">
 				<div class="resize">
 					<!-- 对比后的图片 -->
-					<img src="__IMAGES__/indeximg2.webp">
+					<img src="__IMAGES__/indeximg2.jpg">
 				</div>
 				<!-- 可拖动的分隔条 -->
 				<span class="handle"></span>

app/index/view/pc/product/category.html

@@ -6,7 +6,7 @@
 <div class="orico_Page_category">
 	<!-- banner轮播 -->
 	{notempty name="focus_image"}
-	<div class="opdBanner" >
+	<div class="opdBanner">
 		{volist name="focus_image" id="fi"}
 		<a {notempty name="fi.link" }href="{$fi.link}" {/notempty}>
 			<img src="{$fi.image}" class="opdbannerImg" />

app/index/view/pc/product/detail.html

@@ -22,11 +22,7 @@
             <a class="pathname" href="/">{:lang_i18n('首页')}</a>
             {volist name="product_categorys" id="ca"}
             <div class="arrow"></div>
-            {eq name="ca.pid" value="0"}
             <a class="pathname" href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a>
-            {else /}
-            <a class="pathname" href="{:url('product/subcategory', ['id' => $ca.id])}">{$ca.name}</a>
-            {/eq}
             {/volist}
         </div>
         <!-- 产品主图切换和参数详情-->
@@ -39,26 +35,33 @@
                         <!-- 左边切换按钮 -->
                         <div class="scrollbutton smallImgUp disabled"></div>
                         <!-- 小图片预览 -->
-                        <div id="imageMenu_{$sku.id}" class="imageMenu">
+                        <div id="imageMenu">
                             <ul class="image_list">
-                                {volist name="sku.photo_album" id="photo"}
-                                <li class="onlickImg"><img src="{:thumb($photo)}" data-url="{$photo}" /></li>
-                                {/volist}
                                 {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
                                 <!-- 产品视频 -->
-                                <li class="onlickImg"><img src="{:thumb($product.video_img)}" data-url="{$product.video_url}" /></li>
+                                <li id="onlickImg"><img src="{:thumb($product.video_img)}" data-url="{$product.video_url}" /></li>
                                 {/if}
+                                {volist name="sku.photo_album" id="photo"}
+                                <li id="onlickImg"><img src="{:thumb($photo)}" data-url="{$photo}" /></li>
+                                {/volist}
                             </ul>
                         </div>
                         <!-- 右边切换按钮 -->
                         <div class="scrollbutton smallImgDown"></div>
                     </div>
                     <!-- 产品大图 -->
-                    <div class="bigImg" id="vertical" style="width: 75%;">
+                    <div class="bigImg" id="vertical">
                         <!-- 主图 -->
+                        {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
+                        <!-- 如果有视频情况下默认先显示视频 -->
+                        <video poster="{$product.video_img}" autoplay="autoplay" muted="muted" loop="loop" id="video" controls style="width: 510px;height: 510px; position: relative;z-index: 998;">
+                            <source src="{$product.video_url}" type="video/mp4"/>
+                        </video>
+                        {else/}
                         {notempty name="sku.photo_album[0]"}
                         <img src="{$sku.photo_album[0]}" id="midimg" />
                         {/notempty}
+                        {/if}
                     </div>
                 </div>
                 {/volist}
@@ -70,11 +73,6 @@
                     <p>{$product.short_name|default=''}</p>
                     <div class="proTfg">
                         <ul class="swt-Table">
-                            <li class="Table-Row">
-                                <div class="ms3 Table-Cell">{:lang_i18n('型号')}</div>
-                                <div class="ms2 Table-Cell"></div>
-                                <div class="ms4 Table-Cell">{$product.spu}</div>
-                            </li>
                             {volist name="product_params" id="pp"}
                             <li class="Table-Row">
                                 <div class="ms3 Table-Cell">{$pp.name}</div>
@@ -116,7 +114,6 @@
                     {volist name="product_purchase_links" id="ppp" key="k"}
                     <a class="thebt bttype{$k}" href="{$ppp.link}">{$ppp.platform_name}</a>
                     {/volist}
-                    <br/>
                     {eq name=":cookie('think_lang')" value="en-us"}
                     <a class="thebt bttype3" id="open_form_modal">{:lang_i18n('发送查询')}</a>
                     {/eq}
@@ -133,12 +130,10 @@
                 {/notempty}
             </div>
             <!-- 富文本渲染-->
-            <div class="ql-container">
-                <div class="products_des ql-editor" id="detail">
+            <div class="products_des" id="detail">
                 {$product.detail|default=''|raw}
             </div>
         </div>
-        </div>
         <!-- 关联产品 -->
         {notempty name="product_related"}
         <div class="glcpmain" id="related">
@@ -230,7 +225,7 @@
                             <textarea name="message" id="message"></textarea>
                         </div>
                     </div>
-                    <button type="submit" class="submit-btn">{:lang_i18n('提交')}</button>
+                    <button type="button" id="send" class="submit-btn">{:lang_i18n('提交')}</button>
                 </form>
             </div>
         </div>
@@ -278,12 +273,21 @@
         // 处理表单提交
         modal.find("form").submit(function(e) {
             e.preventDefault();
-            var form = $(this)
             var formData = $(this).serialize();
+            // 这里可以添加代码将formData发送到服务器
+            // 例如通过AJAX
+            console.log("提交的数据: " + formData);
+            // 提交成功后可以选择关闭模态框
+            modal.hide();
+        });
+
+        // 提交询盘
+        $('#send').click(function() {
+            var form = $(this).parents('form');
             $.ajax({
                 url: "{:url('product/inquiry')}",
                 type: 'POST',
-                data: formData,
+                data: form.serialize(),
                 success: function(r) {
                     if (r.code == 0) {
                         form[0].reset(); // 重置表单
@@ -293,7 +297,6 @@
                 },
                 error: function(e) {
                     console.error(e);
-                    modal.hide();
                 }
             })
         });

app/index/view/pc/product/search.html

@@ -14,7 +14,6 @@
 			</div>
 		</form>
 		<!-- 搜索结果列表-->
-		{notempty name="products"}
 		<ul class="seul">
 			{volist name="products" id="pro"}
 			<a href="{:url('product/detail', ['id' => $pro['id']])}">
@@ -33,10 +32,6 @@
 			</a>
 			{/volist}
 		</ul>
-		<div>{$page|raw}</div>
-		{else/}
-		<div style="text-align: center; padding: 10%;">{:lang_i18n('暂无数据')}</div>
-		{/notempty}
 	</div>
 </div>
 {/block}

app/index/view/pc/public/base.html

@@ -24,19 +24,23 @@
 		// 直接输出对应的 HTML 标签
 		if (isUCBrowser()) {
 			document.write(`
-			<link rel="stylesheet" href="__JS__/swiper-bundle8.4.7.min.css">
-			<script type="text/javascript" src="__JS__/swiper-bundle8.4.7.min.js"><\/script>
+			<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swiper@8.4.7/swiper-bundle.min.css">
+			<script src="https://cdn.jsdelivr.net/npm/swiper@8.4.7/swiper-bundle.min.js"><\/script>
 		`);
 		} else {
 			document.write(`
-			<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css">
-			<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"><\/script>
+			<link rel="stylesheet" href="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.css">
+			<script src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"><\/script>
 		`);
 		}
 	</script>
 
 	<!-- 你的 jQuery 和其他脚本 -->
-	<script src="__JS__/jquery-3.6.0.min.js"></script>
+	<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+	<!-- <link rel="stylesheet" href="https://unpkg.com/swiper@9/swiper-bundle.min.css">
+	<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script> -->
+	<script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+
 	<script type="text/javascript" src="__JS__/before-after.min.js"></script>
 	<script type="text/javascript" src="__JS__/large.js"></script>
 	<script type="text/javascript">
@@ -108,7 +112,7 @@
 		(function() {
 			var u="//analytics.f2b211.com/";
 			_paq.push(['setTrackerUrl', u+'matomo.php']);
-			_paq.push(['setSiteId', '2']);
+			_paq.push(['setSiteId', '1']);
 			var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
 			g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
 		})();
@@ -120,7 +124,7 @@
 <body>
 	<noscript>
 		<!-- Matomo Image Tracker-->
-		<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+		<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=1&amp;rec=1" style="border:0" alt="" />
 		<!-- End Matomo -->
 	</noscript>
 	{block name="header"}

app/index/view/pc/public/footer.html

@@ -27,9 +27,7 @@
           <p class="ftitle">{:lang_i18n('产品')}</p>
           <ul>
             {volist name="header_categorys" id="vo"}
-              {if condition="!empty($vo.name)"}
             <li><a href="{:url('product/category', ['id' => $vo.id])}" class="fline">{$vo.name}</a></li>
-              {/if}
             {/volist}
           </ul>
         </div>
@@ -40,7 +38,7 @@
           {if condition="!empty($vo.children)"}
           <ul>
             {volist name="vo.children" id="vc"}
-            <li><a href="{$vc.link}" class="fline" target="{$vc.blank==1?'_blank':'_self'}">{$vc.name}</a></li>
+            <li><a href="{$vc.link}" class="fline">{$vc.name}</a></li>
             {/volist}
           </ul>
           {/if}
@@ -82,7 +80,7 @@
         <div class="ftcopyright">
           <span>{$basic_config.website_powerby.value}</span>
           {if condition="!empty($basic_config.website_icp)"}
-          <a href="https://beian.miit.gov.cn/">{$basic_config.website_icp.value|raw}</a>
+          <a href="https://beian.miit.gov.cn/">（{$basic_config.website_icp.value}）</a>
           {/if}
         </div>
         {/if}
@@ -91,10 +89,12 @@
     </div>
   </div>
 </footer>
+{eq name=":cookie('think_lang')" value="zh-cn"}
 <div class="backtop">
   <img src="__IMAGES__/ic-backtop.png" class="ictop" />
-  <span>{eq name=":cookie('think_lang')" value="en-us"}TOP{else /}返回顶部{/eq}</span>
+  <span>返回顶部</span>
 </div>
+{/eq}
 <script>
   $(document).ready(function () {
     // 获取窗口高度

app/index/view/pc/public/nas_base.html

@@ -13,27 +13,7 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/topic_nas_header.css" />
     <link rel="stylesheet" type="text/css" href="__CSS__/orico_footer.css" />
     {block name="style"}{/block}
-    <script src="__JS__/jquery-3.6.0.min.js"></script>
-    <script>
-		// 增强型 UC 浏览器检测
-		function isUCBrowser() {
-			const ua = navigator.userAgent.toLowerCase();
-			return ua.includes('ubrowser');
-		}
-
-		// 直接输出对应的 HTML 标签
-		if (isUCBrowser()) {
-			document.write(`
-			<link rel="stylesheet" href="__JS__/swiper-bundle8.4.7.min.css">
-			<script type="text/javascript" src="__JS__/swiper-bundle8.4.7.min.js"><\/script>
-		`);
-		} else {
-			document.write(`
-			<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css">
-			<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"><\/script>
-		`);
-		}
-	</script>
+    <script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
     <script>
         $(window).ready(function () {
 			if ($(window).width() < 1024) {
@@ -55,7 +35,7 @@
         (function() {
             var u="//analytics.f2b211.com/";
             _paq.push(['setTrackerUrl', u+'matomo.php']);
-            _paq.push(['setSiteId', '2']);
+            _paq.push(['setSiteId', '1']);
             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
             g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
         })();
@@ -65,7 +45,7 @@
 <body>
     <noscript>
         <!-- Matomo Image Tracker-->
-        <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+        <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=1&amp;rec=1" style="border:0" alt="" />
         <!-- End Matomo -->
     </noscript>
     {block name="header"}

app/index/view/pc/public/nas_footer.html

@@ -63,7 +63,7 @@
                 <div class="ftcopyright">
                     <span>{$basic_config.website_powerby.value}</span>
                     {if condition="!empty($basic_config.website_icp)"}
-                    <a href="https://beian.miit.gov.cn/">{$basic_config.website_icp.value|raw}</a>
+                    <a href="https://beian.miit.gov.cn/">（{$basic_config.website_icp.value}）</a>
                     {/if}
                 </div>
                 {/if}

app/index/view/pc/public/nas_header.html

@@ -1,10 +1,6 @@
 <header class="narsPage-head">
     <div class="headcenter">
-        {eq name=":cookie('think_lang')" value="zh-cn"}
-        <a href="{:url('/index/topic/nas/index')}">
-        {else/}
         <a>
-        {/eq}
             <img class="logico" style="cursor:pointer;" src="__IMAGES__/logo_nas_{:cookie('think_lang')}.png" />
         </a>
         {notempty name="header_navigation"}
@@ -21,10 +17,9 @@
 <script type="text/javascript">
     $(function() {
         $('.headnav .navitem').each(function(idx, item) {
-            var _item = $(item);
-            _item.removeClass('hover');
-            if (_item.attr('href') && compareUrls(location.href, _item.get(0).href)) {
-                _item.addClass('hover').siblings();
+            $(item).removeClass('hover');
+            if (compareUrls(location.href, item.href)) {
+                $(item).addClass('hover').siblings();
             }
         });
         

app/index/view/pc/topic_nas/help.html

@@ -8,7 +8,7 @@
     <div class="narshelpCenterPc">
         <!-- banner-搜索 -->
         <div class="pagetopbg">
-            <img src="__IMAGES__/nas_help_banner.webp" class="hpbgimg" />
+            <img src="__IMAGES__/nas_help_banner.jpg" class="hpbgimg" />
             <div class='nhlp-search'>
                 <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off" />
                 <img src="__IMAGES__/nas_help_search.png" class="searchimg" />
@@ -26,13 +26,13 @@
             <h1 class="helph1">{:lang_i18n('使用教程')}</h1>
             <div class="nhlp-row">
                 {volist name="article_categorys" id="vo" key="idx"}
-                <div class="nhlpit">
+                <div class="nhlpit {gt name='idx' value='6'}nhlpit-w{/gt}">
                     <div class="nhlptl">
                         <img src="{$vo.icon}" class="bhlpicoimg" />{$vo.name}
                     </div>
                     <div class="nhlp-tx-list">
                         {volist name="vo.article" id="va" key="index"}
-                        <a class="txrow" href="{:url('/index/topic/nas/help_detail', ['pid' => $va.category_id,'cid' => $vo.id, 'id' => $va.id])}">
+                        <a class="txrow" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => $va.id])}">
                             <div class="nhlp-point"></div>
                             <span class="nhlpsp">{$va.title}</span>
                             <span class="narhelpgoimg">
@@ -41,7 +41,7 @@
                         </a>
                         {/volist}
                         {if condition="count($vo.article) >= 3"}
-                        <a class="ckgdbt" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => isset($vo.article[0])?$vo.article[0]['id']:0,'pid' => isset($vo.article[0])?$vo.article[0]['category_id']:0])}">
+                        <a class="ckgdbt" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => isset($vo.article[0])?$vo.article[0]['id']:0])}">
                             {:lang_i18n('查看更多')} >
                         </a>
                         {/if}

app/index/view/pc/topic_nas/help_detail.html

@@ -1,17 +1,17 @@
 {extend name="public/nas_base" /}
 {block name="title"}
-{notempty name="article.seo_title"}<title>{$article.seo_title}</title>{else /}{__BLOCK__}{/notempty}
+    {notempty name="article.seo_title"}<title>{$article.seo_title}</title>{else /}{__BLOCK__}{/notempty}
 {/block}
 {block name="seo"}
-{notempty name="article.seo_keywords"}
-<meta name="keywords" content="{$article.seo_keywords}" />
-<meta name="description" content="{$article.seo_desc}" />
-{else /}
-{__BLOCK__}
-{/notempty}
+    {notempty name="article.seo_keywords"}
+    <meta name="keywords" content="{$article.seo_keywords}" />
+    <meta name="description" content="{$article.seo_desc}" />
+    {else /}
+    {__BLOCK__}
+    {/notempty}
 {/block}
 {block name="style"}
-<link rel="stylesheet" href="__CSS__/topic_nas_help-detail.css" />
+<link rel="stylesheet" href="__CSS__/topic_nas_help-detail.css"/>
 {/block}
 {block name="main"}
 <div class="orico_Page_index">
@@ -32,49 +32,33 @@
             <div class="nars-hlpdt-ml">
                 {notempty name="article_categorys"}
                 <div class="nav-tree">
-
-                    <!-- start 三级菜单   -->
                     {volist name="article_categorys" id="ac"}
                     <div class="category">
-                        <!-- 一级 -->
                         <div class="category-title">
-                            <div class="arrow  {if condition='$ac.id == $Request.get.cid'}rotate{/if}"><img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}" /></div>
+                            <div class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
+                                <img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}" />
+                            </div>
                             <span>{$ac.name}</span>
                         </div>
-                        <!-- 二级-->
-                        <ul class="sub-list"  {if condition='$ac.id == $Request.get.cid' }style="display: block;" {/if}>
-                            {volist name="ac.child" id="ad"}
-                            <li class="two-mues">
-                                <a href="#" class="two-a">
-                                    <div class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}"><img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}" /></div>
-                                    <span>{$ad.name}</span>
+                        <ul class="sub-list" {if condition='$ac.id == $Request.get.cid'}style="display: block;"{/if}>
+                            {volist name="ac.article" id="ar"}
+                            <li>
+                                <a 
+                                href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id, 'id' => $ar.id])}" 
+                                {eq name="ar.id" value="$Request.get.id"}class="active"{/eq}
+                                >
+                                    {$ar.title}
                                 </a>
-                                <ul class="thress-mues" {if condition='$ad.id == $Request.get.pid' }style="display: block;" {/if}>
-                                    {volist name="ad.article" id="ae"}
-                                    <li style="margin-left: 30px;"><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id,'pid' => $ad.id, 'id' => $ae.id])}" style="padding-top: 6px;" {eq
-                                           name="ae.id" value="$Request.get.id" }class="active" {/eq}>{$ae.title}</a></li>
-                                    {/volist}
-                                </ul>
-                                <!-- 三级-->
                             </li>
                             {/volist}
-                            {volist name="ac.article" id="ar"}
-                            <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id, 'id' => $ar.id])}" style="padding-top: 6px;" {eq
-                                   name="ar.id" value="$Request.get.id" }class="active" {/eq}>{$ar.title}</a></li>
-                            {/volist}
-
                         </ul>
                     </div>
                     {/volist}
-                    <!-- end 三级菜单   -->
-
                 </div>
                 {/notempty}
             </div>
             <!--文章详情 -->
-            <div class="ql-container ">
-                <div class="nars-hlpdt-mm ql-editor" id="rendered-content">{$article.content|raw|default=''}</div>
-            </div>
+            <div class="nars-hlpdt-mm" id="rendered-content">{$article.content|raw|default=''}</div>
             <!--锚点定位 -->
             <div class="nars-hlpdt-mr">
                 <div id="title-list">
@@ -89,22 +73,10 @@
 {block name="script"}
 <script type="text/javascript">
     $(document).ready(function () {
-        // 一级菜单点击事件
         $('.category-title').click(function () {
             $(this).next('.sub-list').slideToggle();
             $(this).find('.arrow').toggleClass('rotate');
         });
-        // 二级菜单点击事件
-		$('.two-a').click(function(e) {
-			e.preventDefault();
-			e.stopPropagation(); // 阻止事件冒泡
-			
-			// 切换当前二级菜单的箭头方向
-			$(this).find('.arrow').toggleClass('rotate');
-			
-			// 切换对应的三级菜单显示/隐藏
-			$(this).siblings('.thress-mues').slideToggle();
-		});
         // 搜索
         $(document).on('click', function (e) {
             var target = $(e.target);
@@ -135,7 +107,7 @@
                             html = '<ul>'
                             $.each(r.data, function (k, v) {
                                 html +=
-                                    '<li><a href="{:url(\'/index/topic/nas/help_detail\')}?cid=' + v.category_id + '&id=' + v.id + '&pid=' + v.pid + '">' + v.title + '</a></li>'
+                                    '<li><a href="{:url(\'/index/topic/nas/help_detail\')}?cid=' + v.category_id + '&id=' + v.id + '">' + v.title + '</a></li>'
                             })
                             html += '</ul>'
                         }
@@ -147,15 +119,11 @@
         // 内容
         // 清空标题列表
         $("#title-list ul").empty();
-        // 提取 h3 标题
+        // 提取 h1 标题
         var h1Titles = $("#rendered-content").find("h3");
-        // 只有当找到h3标题且内容不为空时才进行处理
-        if (h1Titles.length > 0) {
         h1Titles.each(function (index) {
             var title = $(this);
-                var titleText = title.text().trim(); // 使用trim()去除空白字符
-                // 只有当标题文本不为空时才添加到列表
-                if (titleText) {
+            var titleText = title.text();
             var titleId = "title-" + index;
             title.attr("id", titleId);
             var listItem = $("<li>");
@@ -165,9 +133,7 @@
             });
             listItem.append(link);
             $("#title-list ul").append(listItem);
-                }
         });
-        }
     });
 </script>
 {/block}

app/index/view/pc/topic_nas/index.html

@@ -113,7 +113,7 @@
 </div>
 {/block}
 {block name="script"}
-<!-- <script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script> -->
+<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script>
 <script type="text/javascript">
     $(document).ready(function () {
         // banner轮播

app/index/view/pc/topic_power_prodline/index.html

@@ -1,573 +0,0 @@
-{extend name="public/base" /}
-{block name="style"}
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/index.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/swiper.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/nav.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/advantage.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/mask.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product_list.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/product_card.css">
-<link rel="stylesheet" href="__CSS__/topic_power_prodline/footer.css">
-{/block}
-{block name="main"}
-<!-- 轮播核心容器 -->
-<div class="swiper-container auto-swiper-container">
-    {notempty name="data.focus_image"}
-    <div class="swiper-wrapper">
-        {volist name="data.focus_image" id="fo"}
-        <a class="swiper-slide auto-swiper-slide" href="{$fo.link}">
-            <img src="{$fo.image}" alt="{$fo.title}"  />
-        </a>
-        {/volist}
-    </div>
-    <div class="swiper-pagination"></div>
-    {/notempty}
-</div>
-<!-- 分类 -->
-{notempty name="data.category"}
-<div class="nav-box">
-    {volist name="data.category" id="ca"}
-    <a class="nav-item" href="{$ca.link}">
-        <img src="{$ca.image}" alt="{$ca.title}">
-        <p {:style(['color'=>$ca.title_txt_color])}>{$ca.title}</p>
-    </a>
-    {/volist}
-</div>
-{/notempty}
-<!-- 500万 -->
-{notempty name="data.why_choose"}
-<div class="advantage-section">
-    {assign name="why_choose_title" value=":array_shift($data.why_choose)" /}
-    <h2 class="advantage-section__title">{$why_choose_title.title|default=''|raw}</h2>
-    <div class="advantage-section__list">
-        {volist name="data.why_choose" id="ch"}
-        <div class="advantage-card-wrap">
-            <div class="advantage-card" data-target="design">
-                <img src="{$ch.image}" alt="{$ch.title}:{$ch.short_title}" class="advantage-card__img">
-                <div class="advantage-card__content">
-                    <!-- 标题+箭头容器：水平+垂直双居中，内部文字左、箭头右 -->
-                    <div class="advantage-card__heading-wrap">
-                        <div class="advantage-card__heading" {:style(['color'=>$ch.title_txt_color])}>{$ch.title}</div>
-                        <img src="__IMAGES__/jiant.png" alt="" class="card-arrow">
-                    </div>
-                    <div class="advantage-card__description" {:style(['color'=>$ch.short_title_txt_color])}>{$ch.short_title}</div>
-                    <div style="display:none;" class="mack-conten-text">{$ch.desc|raw}</div>
-                </div>
-            </div>
-         </div>
-        {/volist}
-    </div>
-</div>
-{/notempty}
-<!-- 产品差旅充 -->
-{notempty name="data.travel_charger"}
-<div class="product-box">
-    {assign name="tc_title" value=":array_shift($data.travel_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$tc_title.title|default=''}</h2>
-        <p class="product-title-p">{$tc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container" >
-        {assign name="tc_first_section_lf" value=":array_shift($data.travel_charger)" /}
-        {notempty name="tc_first_section_lf"}
-        <a class="product-left" href="{$tc_first_section_lf.link}">
-            <img src="{$tc_first_section_lf.image}" alt="{$tc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover product-img-1">
-                <img src="{$tc_first_section_lf.extra_image}" alt="{$tc_first_section_lf.short_title}">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="tc_first_section_lr" value=":array_shift($data.travel_charger)" /}
-        {notempty name="tc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$tc_first_section_lr.image}" alt="{$tc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$tc_first_section_lr.video}" class="right-content right-video" muted loop playsinline controls>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="tc_second_section" value=":array_splice($data.travel_charger, 0, 4)" /}
-    {notempty name="tc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container">
-            {volist name="tc_second_section" id="tss"}
-            <a class="product-card-wrap" href="{$tss.link}">
-                <div class="product-card" >
-                    <div class="product-card-img">
-                        <img src="{$tss.image}" alt="{$tss.title}">
-                    </div>
-                    <div class="product-card-text">
-                        <div class="product-card-title" {:style(['color'=>$tss.title_txt_color])}>{$tss.title}</div>
-                        <div class="product-card-desc" {:style(['color'=>$tss.short_title_txt_color])}>{$tss.short_title}</div>
-                    </div>
-                    <div class="product-card-link">
-                        <img src="__IMAGES__/ljgd.png" alt="查看更多">
-                    </div>
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-    {assign name="tc_three_section" value=":array_shift($data.travel_charger)" /}
-    {notempty name="tc_three_section"}
-    <a href="{$tc_three_section.link}" class="more">
-        <div class="more-img">
-            {$tc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-    {/notempty}
-</div>
-{/notempty}
-<!-- 产品 家居充-->
-{notempty name="data.home_charger"}
-<div class="product-box">
-    {assign name="hc_title" value=":array_shift($data.home_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$hc_title.title|default=''}</h2>
-        <p class="product-title-p">{$hc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="hc_first_section_lf" value=":array_shift($data.home_charger)" /}
-        {notempty name="hc_first_section_lf"}
-        <a class="product-left" href="{$hc_first_section_lf.link}">
-            <img src="{$hc_first_section_lf.image}" alt="{$hc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover product-img-1">
-                <img src="{$hc_first_section_lf.extra_image}" alt="{$hc_first_section_lf.short_title}">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="hc_first_section_lr" value=":array_shift($data.home_charger)" /}
-        {notempty name="hc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$hc_first_section_lr.image}" alt="{$hc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$hc_first_section_lr.video}" class="right-content right-video" muted loop playsinline controls>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="hc_second_section" value=":array_splice($data.home_charger, 0, 4)" /}
-    {notempty name="hc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container">
-            {volist name="hc_second_section" id="hcs"}
-            <a class="product-card-wrap" href="{$hcs.link}">
-                <div class="product-card" href="#">
-                    <div class="product-card-img">
-                        <img src="{$hcs.image}" alt="{$hcs.short_title}">
-                    </div>
-                    <div class="product-card-text">
-                        <div class="product-card-title">{$hcs.title}</div>
-                        <div class="product-card-desc">{$hcs.short_title}</div>
-                    </div>
-                    <div class="product-card-link">
-                        <img src="__IMAGES__/ljgd.png" alt="查看更多">
-                    </div>
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-    {/notempty}
-    {assign name="hc_three_section" value=":array_shift($data.home_charger)" /}
-    {notempty name="hc_three_section"}
-    <a href="{$hc_three_section.link}" class="more">
-        <div class="more-img">
-            {$hc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-<!-- 产品 桌面充（悬浮图上右超出）底部列表样式不一样(左文右图) -->
-<div class="product-box">
-    {assign name="dc_title" value=":array_shift($data.desktop_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$dc_title.title|default=''}</h2>
-        <p class="product-title-p">{$dc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="dc_first_section_lf" value=":array_shift($data.desktop_charger)" /}
-        {notempty name="dc_first_section_lf"}
-        <a class="product-left" href="{$dc_first_section_lf.link}">
-            <img src="{$dc_first_section_lf.image}" alt="{$dc_first_section_lf.short_title}" class="product-img">
-            <!-- 公共类+定位类：尺寸和第一个完全一致，仅定位不同 -->
-            <div class="product-img-hover product-img-2" >
-                <img src="{$dc_first_section_lf.extra_image}" alt="{$dc_first_section_lf.short_title}">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="dc_first_section_lr" value=":array_shift($data.desktop_charger)" /}
-        {notempty name="dc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$dc_first_section_lr.image}"
-                alt="使用场景" class="right-content right-img">
-                <!--muted loop playsinline controls-->
-            <video
-                src="{$dc_first_section_lr.video}"
-                class="right-content right-video"  muted loop playsinline controls>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-        </div>
-        {/notempty}
-     
-    </div>
-    {assign name="dc_second_section" value=":array_splice($data.desktop_charger, 0, 2)" /}
-    {notempty name="dc_second_section"}
-    <div class="product-card-box">
-        <div class="product-card-container2">
-            {volist name="dc_second_section" id="dcs"}
-            <a class="product-card2" href="{$dcs.link}">
-                <div class="product-text2">
-                    <!-- 新增内部容器，确保所有内容左对齐一致性 -->
-                    <div class="product-text-content2">
-                        <div class="product-card-title2">{$dcs.title}</div> <!-- 测试超出一行省略 -->
-                        <div class="product-card-desc2">{$dcs.short_title}</div> <!-- 测试超出2行省略 -->
-                        <div class="product-card-link2">
-                            <img src="__IMAGES__/ljgd.png" alt="了解更多">
-                        </div>
-                    </div>
-                </div>
-                <div class="product-card-img2">
-                    <img src="{$dcs.image}" alt="{$dcs.title}">
-                </div>
-            </a>
-            {/volist}
-        </div>
-    </div>
-    {/notempty}
-    {assign name="dc_three_section" value=":array_shift($data.desktop_charger)" /}
-    {notempty name="dc_three_section"}
-    <a href="{$dc_three_section.link}" class="more">
-        <div class="more-img">
-            {$dc_three_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-<!-- 墙插 -->
-{notempty name="data.wall_charger"}
-<div class="product-box">
-    {assign name="wc_title" value=":array_shift($data.wall_charger)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$wc_title.title|default=''}</h2>
-        <p class="product-title-p">{$wc_title.short_title|default=''}</p>
-    </div>
-    <div class="product-container">
-        {assign name="wc_first_section_lf" value=":array_shift($data.wall_charger)" /}
-        {notempty name="wc_first_section_lf"}
-        <a class="product-left" href="{$wc_first_section_lf.link}">
-            <img src="{$wc_first_section_lf.image}" alt="{$wc_first_section_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同 -->
-            <div class="product-img-hover product-img-1">
-                <img src="{$wc_first_section_lf.extra_image}" alt="{$wc_first_section_lf.title}">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="wc_first_section_lr" value=":array_shift($data.wall_charger)" /}
-        {notempty name="wc_first_section_lr"}
-        <div class="product-right">
-            <img src="{$wc_first_section_lr.image}" alt="{$wc_first_section_lr.title}" class="right-content right-img">
-            <video src="{$wc_first_section_lr.video}" class="right-content right-video" muted loop playsinline controls>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-        </div>
-        {/notempty}
-    </div>
-    {assign name="wc_more_section" value=":array_shift($data.wall_charger)" /}
-    {notempty name="wc_more_section"}
-    <a href="{$wc_more_section.link}" class="more">
-        <div class="more-img">
-            {$wc_more_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-{notempty name="data.converter"}
-<!-- 转换器 -->
-<div class="product-box">
-    {assign name="ct_title" value=":array_shift($data.converter)" /}
-    <div class="product-title">
-        <h2 class="product-title-h2">{$ct_title.title|default=''}</h2>
-        <p class="product-title-p">{$ct_title.short_title|default=''}</p>
-    </div>
-    {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"}
-    <div class="product-container">
-        {assign name="cts_lf" value=":array_shift($cts)" /}
-        {notempty name="cts_lf"}
-        <a class="product-left" href="{$cts_lf.link}">
-            <img src="{$cts_lf.image}" alt="{$cts_lf.title}" class="product-img">
-            <!-- 公共类+定位类：尺寸统一，定位不同  -->
-            <!--style="display:flex;justify-content: center;"-->
-            <div class="product-img-hover product-img-1" >
-                <!-- style="width:70%"-->
-                <img src="{$cts_lf.extra_image}" alt="{$cts_lf.title}">
-            </div>
-        </a>
-        {/notempty}
-        {assign name="cts_lr" value=":array_shift($cts)" /}
-        {notempty name="cts_lr"}
-        <div class="product-right">
-            <img src="{$cts_lr.image}" alt="{$cts_lr.title}" class="right-content right-img">
-            <video src="{$cts_lr.video}" class="right-content right-video" muted loop playsinline controls>
-                您的浏览器不支持HTML5视频播放，请升级浏览器
-            </video>
-        </div>
-        {/notempty}
-    </div>
-    {neq name="k" value="$ct_chunk_section_len"}
-    <div class="line"></div>
-    {/neq}
-    {/volist}
-    {notempty name="ct_more_section"}
-    <a href="{$ct_more_section.link}" class="more" style="padding: clamp(1.5rem, 3vw, 3rem) 0">
-        <div class="more-img">
-            {$ct_more_section.title}
-        </div>
-    </a>
-    {/notempty}
-</div>
-{/notempty}
-{notempty name="data.footer_info"}
-<!-- 底部 -->
-<div class="prodline-footer-box">
-    <div class="prodline-footer-box-img">
-        <img src="{$data.footer_info.0.image}" alt="">
-    </div>
-</div>
-{/notempty}
-<!-- 蒙版 -->
-<div class="mask" id="mask">
-    <div class="mask-content" >
-        <span class="close-btn">&times;</span>
-        <div class="mask-scroll-content"></div>
-    </div>
-</div> 
-{/block}
-{block name="script"}
-<script type="text/javascript">
-    let swiper=null;
-    const advantageItems = document.querySelectorAll('.advantage-card');
-    let scrollTop = 0; // 保存页面滚动位置
-    let closeBtnHtml = null; // 关闭按钮元素（全局变量，避免重复创建）
-    const mask = document.getElementById('mask');
-    const maskContent = document.querySelector('.mask-content');
-    const maskScrollContent = document.querySelector('.mask-scroll-content'); // 滚动容器（关键！）
-    const closeBtn = document.querySelector('.close-btn')
-    // 初始化：确保 maskScrollContent 存在于 maskContent 中（避免被清空）
-    if (!maskScrollContent) {
-        // 如果页面没有 mask-scroll-content，动态创建（确保结构稳定）
-        const scrollContent = document.createElement('div');
-        scrollContent.className = 'mask-scroll-content';
-        maskContent.appendChild(scrollContent);
-    }
-
-
-        function createCloseBtn() {
-        if (closeBtnHtml) {
-            closeBtnHtml.remove();
-        }
-    
-        closeBtnHtml = document.createElement('span');
-        closeBtnHtml.className = 'close-btn';
-        closeBtnHtml.innerHTML = '&times;';
-    
-        closeBtnHtml.addEventListener('click', hideMask);
-    
-        // 挂载到 maskContent（而非 scrollContent），避免被滚动影响位置
-        maskContent.prepend(closeBtnHtml);
-    }
-
-    function showMask(contentHtml) {
-        // 保存页面滚动位置
-        scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-        
-        // 关键：将内容填充到 scrollContent 中（而非直接替换 maskContent）
-        maskScrollContent.innerHTML = contentHtml; 
-        createCloseBtn();
-        
-        // 显示蒙版
-        mask.style.display = 'flex';
-        
-        // 禁止滚动（复用你的逻辑）
-        document.documentElement.classList.add('no-scroll');
-        document.body.classList.add('no-scroll');
-        document.body.style.top = `-${scrollTop}px`;
-        
-        // 额外：打开蒙版时就重置滚动位置（避免残留上次滚动状态）
-        maskScrollContent.scrollTop = 0;
-    }
-
-    function hideMask() {
-        // 关键步骤 1：先重置 scrollContent 的滚动位置（此时元素还未被销毁）
-        maskScrollContent.scrollTop = 0;
-        
-        // 关键步骤 2：清空 scrollContent 的内容（而非 maskContent）
-        maskScrollContent.innerHTML = ""; 
-        
-        // 隐藏蒙版
-        mask.style.display = 'none';
-        
-        // 恢复滚动（复用你的逻辑）
-        document.documentElement.classList.remove('no-scroll');
-        document.body.classList.remove('no-scroll');
-        document.body.style.top = '';
-        
-        // 还原页面滚动位置
-        window.scrollTo(0, scrollTop);
-        
-        // 移除关闭按钮（可选，避免残留）
-        if (closeBtnHtml) {
-            closeBtnHtml.remove();
-            closeBtnHtml = null;
-        }
-    }
-        // 点击卡片显示详情
-    advantageItems.forEach((item) => {
-        item.addEventListener('click', (e) => {
-            // 获取当前点击卡片内的.mack-conten-text元素
-            const currentMackContent = e.currentTarget.querySelector('.mack-conten-text');
-            if (currentMackContent) {
-                // 关键修改：获取该元素的子内容（innerHTML 本身就是内部HTML，不含当前元素标签）
-                // 若想更彻底，可遍历子节点拼接内容（兼容特殊场景）
-                let contentHtml = '';
-                Array.from(currentMackContent.childNodes).forEach(child => {
-                    // 只保留元素节点和文本节点（过滤空节点）
-                    if (child.nodeType === 1 || child.nodeType === 3) {
-                        contentHtml += child.outerHTML || child.textContent;
-                    }
-                });
-                // 显示蒙版并传入纯净的子内容
-                showMask(contentHtml);
-            } 
-         });
-    });
-    // 关闭按钮事件
-    closeBtn.addEventListener('click', hideMask);
-    // 点击蒙版背景关闭（可选）
-    mask.addEventListener('click', (e) => {
-    	if (e.target === mask) hideMask();
-    });
-
-    // ESC 键关闭（可选）
-    document.addEventListener('keydown', (e) => {
-    	if (e.key === 'Escape' && mask.style.display === 'flex') hideMask();
-    });
-    
-    // 关键：拦截蒙版的 touchmove 事件，阻止滚动穿透（移动端核心）
-    mask.addEventListener(
-    	'touchmove',
-    	(e) => {
-    		// 只有点击蒙版背景（不是内容区域）才阻止滚动
-    		if (e.target === mask) {
-    			e.preventDefault(); // 阻止默认触摸滚动行为
-    			e.stopPropagation(); // 阻止事件冒泡
-    		}
-    	},
-    	{ passive: false }
-    ); // passive: false 必须，否则 preventDefault 无效
-        
-    const allVideos = document.querySelectorAll('.right-video');
-    // 停止所有视频播放
-    function stopAllVideos() {
-     	allVideos.forEach((video) => {
-      		video.pause();
-      		video.style.display = 'none';
-      		// 显示对应图片
-      		const img = video.parentElement.querySelector('.right-img');
-      		if (img) img.style.display = 'block';
-     	});
-    }
-
-    // 滚动切换图片/视频（核心逻辑）
-    window.addEventListener('scroll', function () {
-     	const productRights = document.querySelectorAll('.product-right');
-     	let activeVideo = null;
-     	// 找出当前在视口中的视频容器
-     	productRights.forEach((rightContainer) => {
-      		const img = rightContainer.querySelector('.right-img');
-      		const video = rightContainer.querySelector('.right-video');
-      		const videoSrc = video.src.trim()
-      		if (!img || !video) return;
-            if(!videoSrc) return;
-      		const rect = rightContainer.getBoundingClientRect();
-      		// 视口判断：容器进入视口50%以上视为活跃
-      		const isInView =
-     			rect.top < window.innerHeight * 0.7 &&
-     			rect.bottom > window.innerHeight * 0.3;
-
-      		if (isInView) {
-     			activeVideo = video;
-      		}
-     	});
-
-     	// 处理活跃视频
-     	if (activeVideo) {
-      		stopAllVideos(); // 先停止其他视频
-      		const img = activeVideo.parentElement.querySelector('.right-img');
-      		img.style.display = 'none';
-      		activeVideo.style.display = 'block';
-
-      		// 自动播放（兼容原生控制栏，用户手动暂停后不会强制播放）
-      		if (activeVideo.paused) {
-     			activeVideo.play().catch((err) => {
-      				console.log('视频播放失败（浏览器限制）：', err);
-      				// 播放失败时回退到图片
-      				activeVideo.style.display = 'none';
-      				img.style.display = 'block';
-     			});
-      		}
-     	} else {
-      		stopAllVideos(); // 无活跃视频时停止所有播放
-     	}
-    });
-    
-   
-    window.onload = function () {
-    	if (typeof Swiper === 'undefined') {
-    		console.error('Swiper加载失败，请刷新页面重试');
-    		return;
-    	}
-    
-    	swiper = new Swiper('.auto-swiper-container', {
-            autoplay: {
-                delay: 3000, // 3秒切换
-                disableOnInteraction: false,
-            },
-            loop: false,
-            slidesPerView: 1,
-            spaceBetween: 0,
-            // 启用分页指示标（核心配置）
-            pagination: {
-                el: '.swiper-pagination', // 对应 HTML 中的指示标容器
-                clickable: true, // 允许点击指示标切换
-               // dynamicBullets: true, // 动态指示标（当前激活放大）
-                //dynamicMainBullets: 3, // 动态模式显示3个核心指示标
-            },
-            navigation: false,
-            scrollbar: false,
-            on: {
-                resize: function () {
-                    this.update();
-                },
-            },
-        });
-    
-    	window.addEventListener('resize', function () {
-    		swiper.update();
-    	});
-    
-    	// 初始化时触发滚动事件，确保状态正确
-    	window.dispatchEvent(new Event('scroll'));
-    };
-</script>
-{/block}

app/openapi/common.php

@@ -18,7 +18,7 @@ if (!function_exists('image_domain_concat')) {
             return $path;
         }
 
-        return url_join($domain, $path);
+        return rtrim($domain, '/') . '/' . ltrim($path, '/');
     }
 }
 
@@ -39,7 +39,7 @@ if (!function_exists('video_domain_concat')) {
             return $path;
         }
 
-        return url_join($domain, $path);
+        return rtrim($domain, '/') . '/' . ltrim($path, '/');
     }
 }
 

app/openapi/controller/v1/Article.php

@@ -66,8 +66,6 @@ class Article
             ])
             ->withoutField([
                 'language_id',
-                'author',
-                'source',
                 'seo_title',
                 'seo_keywords',
                 'seo_desc',

app/openapi/controller/v1/ArticleCategory.php

@@ -27,8 +27,6 @@ class ArticleCategory
         $categories = ArticleCategoryModel::withoutField([
                 'language_id',
                 'unique_label',
-                'short_name',
-                'desc',
                 'created_at',
                 'updated_at',
             ])

app/openapi/controller/v1/Authorize.php

@@ -25,10 +25,7 @@ class Authorize
             $server  = request()->server();
             $request = new Request([], $post, [], [], [], $server);
             $storage = new OAuthStorage;
-            $oauth   = new OAuth2($storage, [
-                'access_token_lifetime'  => intval(env('OPENAPI.ACCESS_TOKEN_LIFETIME', 3600)),
-                'refresh_token_lifetime' => intval(env('OPENAPI.REFRESH_TOKEN_LIFETIME', 1209600)),
-            ]);
+            $oauth   = new OAuth2($storage);
             $token   = $oauth->grantAccessToken($request);
             return success('success', json_decode($token->getContent(), true));
         } catch (OAuth2ServerException $e) {