删除注释

.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

LICENSE

@@ -0,0 +1,208 @@
+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/index/controller/TopicLaptop.php

@@ -1,20 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\controller;
-
-use think\facade\View;
-use think\Request;
-
-class TopicLaptop extends Common
-{
-    /**
-     * 专题 - 笔记本电脑首页
-     */
-    public function index()
-    {
-        
-
-        return View::fetch('index');
-    }
-}

app/index/controller/TopicPowerProdline.php

@@ -12,6 +12,43 @@ use think\Request;
  */
 class TopicPowerProdline extends Common
 {
+    /**
+     * 重写控制器初始化
+     */
+    public function initialize()
+    {
+        // 获取国家/语言列表
+        $languages = $this->getLanguages();
+        // 输出国家/语言列表
+        if (get_platform() == 'mobile') {
+            View::assign('header_languages', $languages);
+        }
+
+        // 获取当前语言
+        $current_language = $this->getCurrentLanguage($languages);
+        if (!empty($current_language)) {
+            $this->lang_id = $current_language['id'];
+        }
+
+        // 获取产品分类
+        $categorys = $this->getProductCategory($this->lang_id);
+        // 输出产品分类
+        View::assign('header_categorys', $categorys);
+
+        // 获取系统配置
+        $configs = $this->getSysConfig($this->lang_id, ['basic', 'contact', 'media']);
+        $this->basic_config = $configs['basic'];
+        // 输出系统配置
+        View::assign('basic_config', $configs['basic']);
+        View::assign('contact_config', $configs['contact']);
+        View::assign('media_config', $configs['media']);
+
+        // 获取底部导航
+        $footer_navigation = $this->getNavigation('NAV_67f60be43df8d', $this->lang_id);
+        // 输出底部导航
+        View::assign('footer_navigation', $footer_navigation);
+    }
+
     /**
      * 专题 - 电力品线首页
      */

app/index/route/route.php

@@ -107,16 +107,10 @@ Route::group('topic', function () {
     });
 
     // 专题 - 电力品线
-    Route::group('power_prodline', function() {
+    Route::group("power_prodline", function() {
        // 专题 - 电力品线首页
        Route::get('index', 'TopicPowerProdline/index');
     });
-
-    // 专题 - 笔记本电脑
-    Route::group('laptop', function() {
-        // 专题 - 笔记本电脑首页
-        Route::get('index', 'TopicLaptop/index');
-    });
 });
 
 // 数据迁移

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

@@ -125,43 +125,6 @@
 		</div>
 	</div>
 </header>
-<script type="text/javascript">
-    $(function() {
-        $('.header-PC #header .navItem>a').each(function(idx, item) {
-            var _item = $(item);
-            _item.removeClass('active');
-            if (_item.attr('href') && compareUrls(location.href, _item.get(0).href)) {
-                _item.addClass('active').siblings();
-            }
-        });
-        
-        // 比较两个URL是否相等（支持只有path的情况，并处理有无.html后缀的情况）
-        function compareUrls(url1, url2) {
-            // 如果输入的是相对路径，添加当前域名
-            if (!url1.startsWith('http')) {
-                url1 = window.location.origin + (url1.startsWith('/') ? '' : '/') + url1;
-            }
-            if (!url2.startsWith('http')) {
-                url2 = window.location.origin + (url2.startsWith('/') ? '' : '/') + url2;
-            }
-
-            // 将两个URL转换为URL对象
-            const urlObj1 = new URL(url1);
-            const urlObj2 = new URL(url2);
-
-            // 获取路径名并移除末尾的斜杠
-            let path1 = urlObj1.pathname.replace(/\/$/, '');
-            let path2 = urlObj2.pathname.replace(/\/$/, '');
-
-            // 移除.html后缀
-            path1 = path1.replace(/\.html$/, '');
-            path2 = path2.replace(/\.html$/, '');
-
-            // 比较处理后的路径
-            return path1 === path2;
-        }
-    })
-</script>
 <script>
 	$(document).ready(function () {
 		// 搜索历史记录处理

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

@@ -1,4 +1,4 @@
-{extend name="public/base" /}
+{extend name="public/nas_base" /}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/topic_power_prodline/index.css">
 <link rel="stylesheet" href="__CSS__/topic_power_prodline/swiper.css">
@@ -10,7 +10,15 @@
 <link rel="stylesheet" href="__CSS__/topic_power_prodline/product_card.css">
 <link rel="stylesheet" href="__CSS__/topic_power_prodline/footer.css">
 {/block}
+{block name="header"}
+<!-- 重置header头为空 -->
+{/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"}

public/static/index/pc/css/orico_header.css

@@ -177,7 +177,6 @@
   padding-left: 0;
   white-space: nowrap;
 }
-.header-PC #header .nav2 .navItem > a.active,
 .header-PC #header .nav2 .navItem .navItemConten1 li a:hover {
   color: #004bfa;
 }