Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev

app/index/middleware/ConfirmRequestFrom.php

@@ -16,7 +16,7 @@ class ConfirmRequestFrom
     {
         // 确认请求来源
         $request->from = 'pc';
-        if ($request->isMobile()) {
+        if ($request->isMobile() || $request->get('mtpl') == 1) {
             $request->from = 'mobile';
         }
         

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

@@ -56,20 +56,22 @@
                         {notempty name="ps.attr_values"}
                         <ul class="hd clearfix">
                             {volist name="ps.attr_values" id="pv" key="pk"}
-                            {assign name="attr_value_type" value=":rgb_or_image($pv.attr_value)" /}
-                            {between name="ps.attr_id" value="1,2"}
-                            <li class="attr_value tip1 attr_item" data-index="{$pk}">
-                            {else/}
-                            <li class="attr_value tip1 attr_item_defalut" data-index="{$pk}">
-                            {/between}
-                                {eq name="attr_value_type" value="IMAGE"}
-                                <span class="co-bg"><img src="{$pv.attr_value}" /></span>
-                                {elseif condition="$attr_value_type == 'RGB'" /}
-                                <span class="co-bg" {:style(['background-color'=>$pv.attr_value])}></span>
-                                {else/}
-                                <span>{$pv.attr_value}</span>
-                                {/eq}
-                            </li>
+                                {notempty name="pv.attr_value"}
+                                    {assign name="attr_value_type" value=":rgb_or_image($pv.attr_value)" /}
+                                    {between name="ps.attr_id" value="1,2"}
+                                    <li class="attr_value tip1 attr_item" data-index="{$pk}">
+                                    {else/}
+                                    <li class="attr_value tip1 attr_item_defalut" data-index="{$pk}">
+                                    {/between}
+                                        {eq name="attr_value_type" value="IMAGE"}
+                                        <span class="co-bg"><img src="{$pv.attr_value}" /></span>
+                                        {elseif condition="$attr_value_type == 'RGB'" /}
+                                        <span class="co-bg" {:style(['background-color'=>$pv.attr_value])}></span>
+                                        {else/}
+                                        <span>{$pv.attr_value}</span>
+                                        {/eq}
+                                    </li>
+                                {/notempty}
                             {/volist}
                         </ul>
                         {/notempty}

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

@@ -1,6 +1,6 @@
 <header class="oircoEgapp-head">
     <div class="headtop">
-        <a><img src="__IMAGES__/logo.png" class="headerlogimg" /></a>
+        <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>

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

@@ -0,0 +1,167 @@
+<header class="oircoEgapp-head">
+    <div class="headtop">
+        {eq name=":cookie('think_lang')" value="zh-cn"}
+        <a href="{:url('/index/topic/nas/index')}">
+        {else/}
+        <a>
+        {/eq}
+            <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>
+    <!-- 顶部菜单-->
+    <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">
+            <div class="it-1">
+                {empty name="nav.children"}
+                <a href="{$nav.link}">{$nav.name}</a>
+                {else/}
+                <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>
+        </div>
+        {/volist}
+        {/notempty}
+    </div>
+    <!-- 顶部搜索-->
+    <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>
+        </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>
+</header>
+<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');
+        });
+        //点击搜索
+        $('.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');
+        });
+        
+        // 回显搜索历史记录
+        history();
+    })
+
+    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 {
+            history_keywords = JSON.parse(history_keywords);
+        }
+
+        // 记录搜索关键词
+        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));
+        }
+
+        // 回显搜索历史
+        history_keywords.forEach(function(item) {
+            $('#history').append(
+                $('<a>')
+                .css({
+                    'margin-right': '10px'
+                })
+                .attr('href', '{:url("product/search")}?keywords=' + item)
+                .text(item)
+            );
+        });
+
+        return history_keywords;
+    }
+</script>

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

@@ -2,6 +2,9 @@
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/topic_nas_download.css" />
 {/block}
+{block name="header"}
+    {include file="public/nas_header" /}
+{/block}
 {block name="main"}
 <div class="oricoEGapp">
     <div class="narsDowloadPc">

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

@@ -9,7 +9,11 @@
 <div class="oricoEGapp">
     <div class="narshelpCenterPc-app">
         <div class="headtop">
+            {eq name=":cookie('think_lang')" value="zh-cn"}
+            <a href="{:url('/index/topic/nas/index')}">
+            {else/}
             <a>
+            {/eq}
                 <img src="__IMAGES__/logo.png" class="logoicoimg">
             </a>
             <img src="__IMAGES__/ssapp.png" class="ssicoimg">

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

@@ -20,7 +20,11 @@
 <div class="oricoEGapp">
     <div class="narshelpCenterdetail-app">
         <div class="headtop">
+            {eq name=":cookie('think_lang')" value="zh-cn"}
+            <a href="{:url('/index/topic/nas/index')}">
+            {else/}
             <a>
+            {/eq}
                 <img src="__IMAGES__/logo.png" class="logoicoimg">
             </a>
             <div style="display: flex;">

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

@@ -2,6 +2,9 @@
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__CSS__/topic_nas_product.css" />
 {/block}
+{block name="header"}
+    {include file="public/nas_header" /}
+{/block}
 {block name="main"}
 <div class="narsZTPC">
     <div class="nZTtopCtMian narssbshow">

app/openapi/controller/v1/Article.php

@@ -15,8 +15,8 @@ class Article
         $params = request()->get([
             'category_id',
             'language' => 'zh-cn',
-            'page/d'     => 1,
-            'size/d'     => 50
+            'page/d'   => 1,
+            'size/d'   => 50
         ]);
 
         if ($params['size'] > 200) {

app/openapi/controller/v1/Product.php

@@ -15,8 +15,8 @@ class Product
         $params = request()->get([
             'category_id',
             'language' => 'zh-cn',
-            'page/d'     => 1,
-            'size/d'     => 50
+            'page/d'   => 1,
+            'size/d'   => 50
         ]);
 
         if ($params['size'] > 200) {