Merge branch 'dev'

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/admin/controller/v1/System.php

@@ -366,18 +366,6 @@ class System
                         'url'  => (string)url('/index/topic/laptop/index')
                     ],
                 ]
-            ],
-            [
-                'id'       => 9,
-                'name'     => '闪存（SSD）专题',
-                'url'      => '',
-                'children' => [
-                    [
-                        'id'   => 101,
-                        'name' => '首页',
-                        'url'  => (string)url('/index/topic/ssd/index')
-                    ],
-                ]
             ]
         ];
     }

app/index/controller/TopicSsd.php

@@ -1,52 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\index\controller;
-
-use app\index\model\SysBannerModel;
-use think\facade\View;
-
-/**
- * 专题 - SSD
- */
-class TopicSsd extends Common
-{
-    /**
-     * 专题 - SSD首页
-     */
-    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_69faaf8582967', // 专题 - 闪存（SSD）首页 - 焦点图
-                'BANNER_69fab1bed8f71', // 专题 - 闪存（SSD）首页 - 产品
-            ])
-            ->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_69faaf8582967')?->items->toArray();
-            // 产品
-            $data['products'] = data_get($banners_map, 'BANNER_69fab1bed8f71')?->items->toArray();
-        }
-        View::assign('data', $data);
-
-        return View::fetch('index');
-    }
-}

app/index/route/route.php

@@ -119,12 +119,6 @@ Route::group('topic', function () {
         // 专题 - 笔记本电脑首页
         Route::get('index', 'TopicLaptop/index');
     });
-
-    // 专题 - SSD
-    Route::group('ssd', function() {
-        // 专题 - SSD首页
-        Route::get('index', 'TopicSsd/index');
-    });
 });
 
 // 数据迁移

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

@@ -1,43 +0,0 @@
-{extend name="public/base" /}
-{block name="style"}
-<link rel="stylesheet" href="__CSS__/topic_laptop/header.css">
-<link rel="stylesheet" href="__CSS__/topic_laptop/footer.css">
-<link rel="stylesheet" href="__CSS__/topic_ssd/index.css">
-<!-- 将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;
-            // 直接修改内联样式，优先级最高
-            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="m-sc-main" style="margin-top:42px;">
-    {volist name="data.top_focus_images" id="item"}
-    <a href="{$item.link}" target="_blank" class="m-sc-mt20">
-        <img src="{$item.image}" alt="" class="m-sc-main-img" loading="lazy">
-    </a>
-    {/volist}
-    <div class="m-sc-main-imgs m-sc-mt20 m-sc-mb34">
-        {volist name="data.products" id="item"}
-        <a href="{$item.link}" target="_blank" class="">
-            <img src="{$item.image}" alt="" class="m-sc-main-img1" loading="lazy">
-        </a>
-        {/volist}
-    </div>
-</div>
-{/block}

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

@@ -1,44 +0,0 @@
-{extend name="public/base" /}
-{block name="style"}
-<link rel="stylesheet" href="__CSS__/topic_laptop/header.css">
-<link rel="stylesheet" href="__CSS__/topic_laptop/footer.css">
-<link rel="stylesheet" href="__CSS__/topic_ssd/index.css">
-<script type="text/javascript">
-    (function (doc, win)
-    {
-        var docEl = doc.documentElement;
-        var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize';
-        var designWidth = 2560;
-        var designRemPx = 100;
-        function setRootFontSize ()
-        {
-            var clientWidth = docEl.clientWidth;
-            if (!clientWidth) return;
-            var fontSize = (clientWidth / designWidth) * designRemPx;
-            fontSize = Math.max(fontSize, 20);
-            fontSize = Math.min(fontSize, designRemPx);
-            docEl.style.fontSize = fontSize + 'px';
-        }
-
-        setRootFontSize();
-        win.addEventListener(resizeEvt, setRootFontSize);
-        doc.addEventListener('DOMContentLoaded', setRootFontSize);
-    })(document, window);
-</script>
-{/block}
-{block name="main"}
-<div class="sc-main">
-    {volist name="data.top_focus_images" id="item"}
-    <a href="{$item.link}" target="_blank" class="sc-mt20">
-        <img src="{$item.image}" alt="" class="sc-main-img" loading="lazy">
-    </a>
-    {/volist}
-    <div class="sc-main-imgs sc-mt20 sc-mb-78">
-        {volist name="data.products" id="item"}
-        <a href="{$item.link}" target="_blank" class="">
-            <img src="{$item.image}" alt="" class="sc-main-img1" loading="lazy">
-        </a>
-        {/volist}
-    </div>
-</div>
-{/block}

public/static/index/mobile/css/topic_ssd/index.css

@@ -1,65 +0,0 @@
-* {
-	margin: 0;
-	padding: 0;
-}
-html {
-	width: 100% !important;
-	overflow-x: hidden;
-    margin: 0 !important;
-    padding: 0 !important;
-    max-width: 100vw !important;
-}
-body {
-	width: 100%;
-	background: #fff;
-	overflow-x: hidden;
-    margin: 0 !important;
-    padding: 0 !important;
-    max-width: 100vw !important;
-}
-.m-sc-main {
-    width: 100%;
-    height: 100%;
-}
-
-a {
-    text-decoration: none;
-    display: block;
-}
-
-img {
-    display: block;
-}
-
-.m-sc-main-img {
-    width: 100%;
-    /* max-width: 2560px; */
-}
-
-.m-sc-mt20 {
-    margin-top: 0.1rem;
-}
-.m-sc-mt20:first-child {
-    margin-top: 0 !important;
-}
-.m-sc-mb34 {
-    margin-bottom: 0.34rem;
-}
-.m-sc-main-imgs {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 0.1rem;
-    list-style: none;
-    /* 去除列表样式（如果有） */
-}
-
-.m-sc-main-imgs a {
-    display: block;
-}
-
-.m-sc-main-img1 {
-    width: 100%;
-    height: auto;
-    /* 保持比例 */
-    display: block;
-}

public/static/index/pc/css/topic_ssd/index.css

@@ -1,68 +0,0 @@
-
-html {
-    width: 100%;
-}
-body {
-	/* width: 100vw;
-	height: 100vh; */
-	background: #fff;
-	overflow-x: hidden;
-    scroll-behavior: smooth !important;
-    -webkit-overflow-scrolling: touch !important;
-}
-/* 当视口宽度大于1920px时生效 */
-@media screen and (min-width: 1920px) {
-    /* 这里写你的样式 */
-    body {
-        max-width:100% !important;
-        width: 100vw !important;
-    }
-   
-}
-.sc-main {
-    width: 100%;
-    height: 100%;
-    max-width: 2560px;
-    margin: 0 auto;
-}
-
-a {
-    text-decoration: none;
-    display: block;
-}
-
-img {
-    display: block;
-}
-
-.sc-main-img {
-    width: 100%;
-    max-width: 2560px;
-}
-.sc-mt20:first-child {
-    margin-top: 0 !important;
-}
-.sc-mt20 {
-    margin-top: 0.2rem;
-}
-.sc-mb-78 {
-    margin-bottom: 0.78rem;
-}
-.sc-main-imgs {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 0.2rem;
-    list-style: none;
-    /* 去除列表样式（如果有） */
-}
-
-.sc-main-imgs a {
-    display: block;
-}
-
-.sc-main-img1 {
-    width: 100%;
-    height: auto;
-    /* 保持比例 */
-    display: block;
-}