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

app/index/controller/TopicNas.php

@@ -21,7 +21,7 @@ class TopicNas extends Common
         // 获取国家/语言列表
         $languages = $this->getLanguages();
         // 输出国家/语言列表
-        if (request()->isMobile()) {
+        if (get_platform() == 'mobile') {
             View::assign('header_languages', $languages);
         }
 

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

@@ -45,45 +45,6 @@
         {/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() {

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

@@ -14,6 +14,18 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/orico_footer.css" />
     {block name="style"}{/block}
     <script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+    <script>
+        $(window).ready(function () {
+			if ($(window).width() < 1024) {
+				var locationURL = new URL(window.location.href);
+				var mtpl = locationURL.searchParams.get("mtpl");
+				if (mtpl == null) {
+					locationURL.searchParams.set("mtpl", "1");
+					window.location.href = locationURL.href;
+				}
+			}
+		})
+    </script>
     <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];