From 34703e5f002724fa3a9e6182ddfc7cc02407f20d Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 29 May 2025 10:45:29 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20mobile=20=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E6=88=91=E4=BB=AC=E7=95=99=E8=A8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/common.php                          |  30 +++-
 app/index/controller/ContactUs.php            |   5 +-
 app/index/lang/en-us/mobile.php               |  12 ++
 app/index/view/mobile/contact_us/message.html | 102 ++++++++++++
 .../index/mobile/css/contactus_message.css    | 156 ++++++++++++++++++
 5 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 app/index/view/mobile/contact_us/message.html
 create mode 100755 public/static/index/mobile/css/contactus_message.css

diff --git a/app/index/common.php b/app/index/common.php
index 0610181f..26d0c87f 100644
--- a/app/index/common.php
+++ b/app/index/common.php
@@ -1,6 +1,8 @@
 <?php
 // 这是系统自动生成的公共文件
 
+use think\facade\Lang;
+
 if (!function_exists('str_contains')) {
     /**
      * 检查字符串是否包含子字符串
@@ -99,8 +101,7 @@ if (!function_exists('thumb')) {
     }
 }
 
-if (!function_exists('get_path_from_img_tag'))
-{
+if (!function_exists('get_path_from_img_tag')) {
     /**
      * 从img标签中获取图片路径
      * @param string $img
@@ -115,4 +116,27 @@ if (!function_exists('get_path_from_img_tag'))
 
         return '';
     }
-}
\ No newline at end of file
+}
+
+if (!function_exists('lang_i18n')) {
+    /**
+     * 获取国际化语言包
+     * 根据请求页面path获取分组语言对应值
+     * 
+     * @param string $name 语言包名称
+     * @param array $vars 替换变量
+     * @param string $lang 语言标识
+     * @return string
+     */
+    function lang_i18n(string $name, array $vars = [], string $lang = '') {
+        if (is_null($name)) {
+            return '';
+        }
+        $path      = strtolower(request()->controller() . '/' . request()->action());
+        $lang_key  = "{$path}.{$name}";
+        if (!Lang::has($lang_key, $lang)) {
+            return $name;
+        }
+        return Lang::get($lang_key, $vars, $lang);
+    }
+}
diff --git a/app/index/controller/ContactUs.php b/app/index/controller/ContactUs.php
index 4da9e34a..d61da2b1 100644
--- a/app/index/controller/ContactUs.php
+++ b/app/index/controller/ContactUs.php
@@ -89,10 +89,10 @@ class ContactUs extends Common
                 'user_agent'  => request()->header('user-agent'),
             ]);
             if ($msg->isEmpty()) {
-                return error(lang('contact_message.send_fail'));
+                return error(lang('信息提交失败！'));
             }
 
-            return success(lang('contact_message.send_success'));
+            return success(lang('信息已成功提交！'));
         }
 
         $focus_image     = [];
@@ -103,6 +103,7 @@ class ContactUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_6801be1e7d686',
                 'BANNER_6801c053ce12e',
diff --git a/app/index/lang/en-us/mobile.php b/app/index/lang/en-us/mobile.php
index 9caf1bbc..4ea52811 100644
--- a/app/index/lang/en-us/mobile.php
+++ b/app/index/lang/en-us/mobile.php
@@ -71,4 +71,16 @@ return [
     '电话号码' => 'Phone Number',
     '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
     '当前选定语言的采购可选品类配置出错' => 'The procurement category configuration for the currently selected language is incorrect',
+    
+    // 联系我们留言页
+    'contactus/message' => [
+        '我们的信息' => 'Our Information',
+        '姓名' => 'Your name',
+        '电子邮箱' => 'Your email',
+        '您的问题' => 'Your message',
+        '提交您的问题' => 'Send Us Your Question',
+        '请输入内容...' => 'This is your placeholder text',
+        '发送' => 'SEND',
+        '成为经销商' => 'Become a Distributor',
+    ],
 ];
\ No newline at end of file
diff --git a/app/index/view/mobile/contact_us/message.html b/app/index/view/mobile/contact_us/message.html
new file mode 100644
index 00000000..87343d90
--- /dev/null
+++ b/app/index/view/mobile/contact_us/message.html
@@ -0,0 +1,102 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/contactus_message.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-Contact">
+        <!-- banner -->
+        {notempty name="focus_image"}
+        <div class="banner img-responsives margin-top-90">
+            <a {notempty name="focus_image.link"} href="{$focus_image.link}" {/notempty}>
+                <img src="{$focus_image.image}" />
+            </a>
+        </div>
+        {/notempty}
+        <!-- 我们的信息 -->
+        <div class="content">
+            <div class="title">{:lang_i18n('我们的信息')}</div>
+            {notempty name="our_information"}
+            {assign name="first_info" value="$our_information|array_shift"/}
+            <div class="info">
+                {notempty name="first_info.image"}
+                <div class="left"><img src="{$first_info.image}" /></div>
+                {/notempty}
+                <div class="right">
+                    <div class="des">{$first_info.desc|raw}</div>
+                </div>
+            </div>
+            {assign name="chunk_info" value="$our_information|array_chunk=2"}
+            {volist name="chunk_info" id="chunk"}
+            <div class="line"></div>
+            <div class="info">
+                {notempty name="chunk.0.image"}
+                <div class="left"><img src="{$chunk.0.image}" /></div>
+                {/notempty}
+                <div class="right">
+                    {volist name="chunk" id="info" key="k"}
+                    <div class="info_title {neq name='k' value='1'}m-t-20{/neq}">{$info.title}:</div>
+                    <div class="des"> {$info.desc|raw}</div>
+                    {/volist}
+                </div>
+            </div>
+            {/volist}
+            {/notempty}
+        </div>
+        <!-- question -->
+        <div class="content">
+            <div class="title">{:lang_i18n('提交您的问题')}</div>
+            <form action="" method="post" autocomplete="off">
+                <div class="question">
+                    <div class="title">{:lang_i18n('姓名')} <span class="red">*</span></div>
+                    <div class="des">
+                        <input type="text" name="name" id="name" placeholder="{:lang_i18n('请输入内容...')}" class="form-control itinp">
+                    </div>
+                </div>
+                <div class="question">
+                    <div class="title">{:lang_i18n('电子邮箱')} <span class="red">*</span></div>
+                    <div class="des">
+                        <input type="text" name="email" id="email" placeholder="{:lang_i18n('请输入内容...')}" class="form-control itinp">
+                    </div>
+                </div>
+                <div class="question">
+                    <div class="title">{:lang_i18n('您的问题')} <span class="red">*</span></div>
+                    <div class="des">
+                        <textarea rows="6" name="message" id="message" class="ittextarea message" placeholder="{:lang_i18n('请输入内容...')}"></textarea>
+                    </div>
+                </div>
+                <div class="question">
+                    <span class="send" id="send">{:lang_i18n('发送')}</span>
+                </div>
+            </form>
+        </div>
+        <!-- Become a Distributor -->
+        <div class="contact_b"><a href="{:url('contactus/distributor')}">{:lang_i18n('成为经销商')}</a></div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(function () {
+        $("#send").click(function () {
+            var form = $(this).parents("form");
+            $.ajax({
+                url: "{:url('contactus/message')}",
+                type: "post",
+                data: form.serialize(),
+                dataType: "json",
+                success: function (r) {
+                    if (r.code == 0) {
+                        form.get(0).reset();
+                    }
+                    alert(r.msg);
+                },
+                error: function (e) {
+                    console.error(e.msg);
+                }
+            })
+        })
+    })
+</script>
+{/block}
\ No newline at end of file
diff --git a/public/static/index/mobile/css/contactus_message.css b/public/static/index/mobile/css/contactus_message.css
new file mode 100755
index 00000000..d8297815
--- /dev/null
+++ b/public/static/index/mobile/css/contactus_message.css
@@ -0,0 +1,156 @@
+@charset "UTF-8";
+.oricoEGapp-Contact {
+  /*新增*/
+}
+.oricoEGapp-Contact .banner {
+  position: relative;
+  margin-top: 3.3rem;
+}
+.oricoEGapp-Contact .banner_title {
+  font-family: "Montserrat-Bold";
+  font-size: 1.5rem;
+  position: absolute;
+  top: 50%;
+  margin-top: -0.75rem;
+  color: #fff;
+  z-index: 9;
+  text-align: center;
+  width: 100%;
+}
+.oricoEGapp-Contact .content {
+  background-color: #fff;
+  margin-top: 0.75rem;
+  padding: 2rem 1.25rem;
+  color: #000;
+}
+.oricoEGapp-Contact .title {
+  font-family: "Montserrat-Bold";
+  font-size: 1rem;
+}
+.oricoEGapp-Contact .info {
+  padding-top: 2.125rem;
+  padding-bottom: 2rem;
+  display: flex;
+  justify-content: flex-start;
+}
+.oricoEGapp-Contact .info .left {
+  width: 3rem;
+  height: 3rem;
+  margin-right: 1rem;
+}
+.oricoEGapp-Contact .info .left img {
+  width: 3rem;
+  height: 3rem;
+}
+.oricoEGapp-Contact .info .right .des {
+  font-family: "Montserrat-Regular";
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+.oricoEGapp-Contact .info_title {
+  font-family: "Montserrat-Bold";
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  margin-bottom: 0.22rem;
+}
+.oricoEGapp-Contact .m-t-20 {
+  margin-top: 1.11rem;
+}
+.oricoEGapp-Contact .question {
+  margin-top: 1.11rem;
+}
+.oricoEGapp-Contact .question .title {
+  margin-top: 0.5rem;
+  font-family: "Montserrat-Bold";
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+.oricoEGapp-Contact .question .des {
+  margin-top: 0.5rem;
+}
+.oricoEGapp-Contact .question .des input {
+  background-color: #f2f2f2;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  width: calc(100% - 2rem);
+  width: -webkit-calc(100% - 2rem);
+  width: -moz-calc(100% - 2rem);
+}
+.oricoEGapp-Contact .question .des textarea {
+  background-color: #f2f2f2;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  width: calc(100% - 2rem);
+  border: 1px solid transparent;
+}
+.oricoEGapp-Contact .send {
+  display: inline-block;
+  background-color: #004bfa;
+  font-family: "Montserrat-Bold";
+  font-size: 0.875rem;
+  padding: 0.75rem 1.5rem;
+  color: #fff;
+  border-radius: 1.25rem;
+}
+.oricoEGapp-Contact .red {
+  color: #ee2f53;
+}
+.oricoEGapp-Contact .contact_b {
+  font-family: "Montserrat-SemiBold";
+  font-size: 1rem;
+  padding-top: 1.125rem;
+  padding-bottom: 1.125rem;
+  color: #004bfa;
+  width: 100%;
+  text-align: center;
+  background-color: #fff;
+  margin-top: 0.67rem;
+}
+.oricoEGapp-Contact .contact_b a {
+  color: #004bfa;
+}
+.oricoEGapp-Contact .line {
+  width: 100%;
+  height: 1px;
+  background-color: #f1f1f1;
+}
+.oricoEGapp-Contact input::-webkit-input-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact input:-moz-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact input::-moz-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact input:-ms-input-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact textarea::-webkit-input-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact textarea:-moz-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact textarea::-moz-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}
+.oricoEGapp-Contact textarea:-ms-input-placeholder {
+  color: #9e9e9f;
+  font-size: 0.875rem;
+  font-family: "Montserrat-Regular";
+}

From 7699c4ee1a57e5bb95a6b0b776b1dc505fafb214 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 09:16:14 +0800
Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/view/mobile/product/__CSS__/product_detail.css | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/index/view/mobile/product/__CSS__/product_detail.css

diff --git a/app/index/view/mobile/product/__CSS__/product_detail.css b/app/index/view/mobile/product/__CSS__/product_detail.css
deleted file mode 100644
index e69de29b..00000000

From c1ec132a924028345fffa912b39d6fe61b305b35 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 09:56:48 +0800
Subject: [PATCH 3/7] =?UTF-8?q?refactor:=20=20=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/view/mobile/attachment/index.html          | 12 ++++++------
 .../css/{download.css => attachment_index.css}       |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename public/static/index/mobile/css/{download.css => attachment_index.css} (100%)

diff --git a/app/index/view/mobile/attachment/index.html b/app/index/view/mobile/attachment/index.html
index e6b4df30..f314815b 100644
--- a/app/index/view/mobile/attachment/index.html
+++ b/app/index/view/mobile/attachment/index.html
@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="style"}
-<link rel="stylesheet" type="text/css" href="__CSS__/download.css" />
+<link rel="stylesheet" type="text/css" href="__CSS__/attachment_index.css" />
 {/block}
 {block name="main"}
 <div class="oricoEGapp">
@@ -14,25 +14,25 @@
                     <button class="updown_search_btn" type="sumbit">
                         <span class="icon-search-svg"></span>
                     </button>
-                    <input class="form-control" name="keyword" placeholder="{:lang('全站搜索')}" value="" type="text" />
+                    <input class="form-control" name="keyword" placeholder="{:lang_i18n('全站搜索')}" value="" type="text" />
                 </div>
             </form>
         </div>
     </div>
     <!--软件下载-->
-    <div class="download-title">{:lang('软件下载')}</div>
+    <div class="download-title">{:lang_i18n('软件下载')}</div>
     <!--循环产品列表-->
     {notempty name="attachements"}
     {volist name="attachements" id="att"}
     <div class="download-bg clearfix">
         <div class="download-left">
-            <img src="{$att.image}" alt="{$att.name}">
+            <img src="{:thumb($att.image)}" alt="{$att.name}">
         </div>
         <div class="download-right">
             <div class="font-48">{$att.name}</div>
             <div class="down-gray">
-                <p>{:lang('支持型号')}: {$att.applicable_to}</p>
-                <p>{:lang('支持系统')}: {$att.support_platform}</p>
+                <p>{:lang_i18n('支持型号')}: {$att.applicable_to}</p>
+                <p>{:lang_i18n('支持系统')}: {$att.support_platform}</p>
             </div>
             {notempty name="att.attach"}
             {volist name="att.attach" id="ch"}
diff --git a/public/static/index/mobile/css/download.css b/public/static/index/mobile/css/attachment_index.css
similarity index 100%
rename from public/static/index/mobile/css/download.css
rename to public/static/index/mobile/css/attachment_index.css

From 4008feadfac32f9bff468d82c29da504b1c1117e Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 09:57:11 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20mobile=E8=A7=86=E9=A2=91=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/lang/en-us/mobile.php               |  18 +++--
 app/index/view/mobile/attachment/video.html   |  41 ++++++++++
 .../index/mobile/css/attachment_video.css     |  76 ++++++++++++++++++
 .../index/mobile/images/video-banner.webp     | Bin 0 -> 12314 bytes
 4 files changed, 129 insertions(+), 6 deletions(-)
 create mode 100644 app/index/view/mobile/attachment/video.html
 create mode 100644 public/static/index/mobile/css/attachment_video.css
 create mode 100644 public/static/index/mobile/images/video-banner.webp

diff --git a/app/index/lang/en-us/mobile.php b/app/index/lang/en-us/mobile.php
index 4ea52811..716aa15d 100644
--- a/app/index/lang/en-us/mobile.php
+++ b/app/index/lang/en-us/mobile.php
@@ -36,12 +36,18 @@ return [
     '信息提交失败！' => 'Add Fail！',
 
     // 附件下载
-    '软件下载' => 'Software download',
-    '支持型号' => 'Supported Models',
-    '支持系统' => 'Supported Systems',
-    '全站搜索' => 'Search',
-    '搜索' => 'Search',
-    '请搜索' => 'Please search...',
+    'attachment/index' => [
+        '软件下载' => 'Software download',
+        '支持型号' => 'Supported Models',
+        '支持系统' => 'Supported Systems',
+        '全站搜索' => 'Search',
+        '搜索' => 'Search',
+        '请搜索' => 'Please search...',
+    ],
+    'attachment/video' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '您的浏览器不支持 video 标签。' => 'Your browser does not support HTML5 video.', 
+    ],
 
     // 成为分销商页面
     '成为经销商' => 'Become a Distributor',
diff --git a/app/index/view/mobile/attachment/video.html b/app/index/view/mobile/attachment/video.html
new file mode 100644
index 00000000..19d18ea6
--- /dev/null
+++ b/app/index/view/mobile/attachment/video.html
@@ -0,0 +1,41 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/attachment_video.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 主体内容-->
+    <div class="oricoEGapp-softDrviersVideo">
+        <div class="topbanner">
+            <img src="__IMAGES__/video-banner.webp" class="bannerimg" />
+            <span class="bannertitle">{:lang_i18n('软件和驱动程序')}</span>
+        </div>
+        <!-- 分类切换-->
+        <div class="tabs">
+            {notempty name="video_categorys"}
+            {volist name="video_categorys" id="va"}
+            <a href="{:url('attachment/index', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
+            {/volist}
+            {/notempty}
+        </div>
+        <div class="infolist">
+            {notempty name="videos"}
+            {assign name="flat_videos" value=":\think\helper\Arr::flatMap(fn($item) => $item->toArray(), $videos->items())" /}
+            {volist name="flat_videos" id="vo"}
+            <div class="vd-item">
+                <video controls="" poster="{$vo.image|default=''}">
+                    <source src="{$vo.video}" type="video/mp4">
+                    {:lang_i18n('您的浏览器不支持 video 标签。')}
+                </video>
+                <div class="texts">
+                    <span class="t1">{$vo.name}</span>
+                    <span class="t2">{$vo.desc}</span>
+                </div>
+            </div>
+            {/volist}
+            <div>{$page|raw}</div>
+            {/notempty}
+        </div>
+    </div>
+</div>
+{/block}
\ No newline at end of file
diff --git a/public/static/index/mobile/css/attachment_video.css b/public/static/index/mobile/css/attachment_video.css
new file mode 100644
index 00000000..536a2c91
--- /dev/null
+++ b/public/static/index/mobile/css/attachment_video.css
@@ -0,0 +1,76 @@
+.oricoEGapp-softDrviersVideo {
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+.oricoEGapp-softDrviersVideo .topbanner {
+  margin-top: 3.125rem;
+  display: flex;
+  justify-content: center;
+  position: relative;
+}
+.oricoEGapp-softDrviersVideo .topbanner .bannerimg {
+  width: 100%;
+}
+.oricoEGapp-softDrviersVideo .topbanner .bannertitle {
+  font-size: 1.5rem;
+  position: absolute;
+  top: 50%;
+  margin-top: -0.75rem;
+  color: #fff;
+  z-index: 9;
+  text-align: center;
+  width: 100%;
+}
+.oricoEGapp-softDrviersVideo .tabs {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 1rem 1.25rem 0;
+}
+.oricoEGapp-softDrviersVideo .tabs .tabit {
+  padding: 0.5rem 0.75rem;
+  border-radius: 1rem;
+  background-color: #fff;
+  color: #6b6c6e;
+  font-family: "Montserrat-Medium";
+  font-size: 0.875rem;
+  display: inline-block;
+  margin-bottom: 0.5rem;
+  margin-right: 0.5rem;
+}
+.oricoEGapp-softDrviersVideo .tabs .tabit.active {
+  background-color: #004bfa;
+  color: #ffffff;
+}
+.oricoEGapp-softDrviersVideo .infolist {
+  display: flex;
+  flex-direction: column;
+  margin: 0 1rem;
+}
+.oricoEGapp-softDrviersVideo .infolist .vd-item {
+  display: flex;
+  flex-direction: column;
+  border-radius: 0.5rem;
+  background-color: #fff;
+  overflow: hidden;
+  margin-bottom: 0.75rem;
+}
+.oricoEGapp-softDrviersVideo .infolist .vd-item .texts {
+  padding: 1.5rem;
+  word-wrap: break-word;
+  word-break: normal;
+  display: flex;
+  flex-direction: column;
+}
+.oricoEGapp-softDrviersVideo .infolist .vd-item .texts .t1 {
+  font-size: 0.875rem;
+  color: #000;
+  line-height: 1.25rem;
+}
+.oricoEGapp-softDrviersVideo .infolist .vd-item .texts .t2 {
+  font-size: 0.75rem;
+  line-height: 1.125rem;
+  color: #9E9E9F;
+  margin-top: 0.75rem;
+}
diff --git a/public/static/index/mobile/images/video-banner.webp b/public/static/index/mobile/images/video-banner.webp
new file mode 100644
index 0000000000000000000000000000000000000000..080d6a38690bcfa615b1b5487786d79e169ae23f
GIT binary patch
literal 12314
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
AIRF3v

literal 0
HcmV?d00001


From 76d0b19f879f58961d70cc12d25ea5ebdc0616c7 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 10:30:34 +0800
Subject: [PATCH 5/7] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/common.php                          |   2 +-
 app/index/lang/en-us/mobile.php               | 139 +++++++++++-------
 app/index/view/mobile/contact_us/bulkbuy.html |  32 ++--
 .../view/mobile/contact_us/distributor.html   |  34 ++---
 app/index/view/mobile/index/index.html        |  20 +--
 app/index/view/mobile/product/category.html   |   2 +-
 app/index/view/mobile/product/detail.html     |  34 ++---
 app/index/view/mobile/product/search.html     |   4 +-
 app/index/view/mobile/public/footer.html      |   4 +-
 app/index/view/mobile/public/header.html      |  12 +-
 10 files changed, 156 insertions(+), 127 deletions(-)

diff --git a/app/index/common.php b/app/index/common.php
index 26d0c87f..35395eec 100644
--- a/app/index/common.php
+++ b/app/index/common.php
@@ -135,7 +135,7 @@ if (!function_exists('lang_i18n')) {
         $path      = strtolower(request()->controller() . '/' . request()->action());
         $lang_key  = "{$path}.{$name}";
         if (!Lang::has($lang_key, $lang)) {
-            return $name;
+            return Lang::get($name, $vars, $lang);
         }
         return Lang::get($lang_key, $vars, $lang);
     }
diff --git a/app/index/lang/en-us/mobile.php b/app/index/lang/en-us/mobile.php
index 716aa15d..a4f83ffd 100644
--- a/app/index/lang/en-us/mobile.php
+++ b/app/index/lang/en-us/mobile.php
@@ -1,40 +1,60 @@
 <?php
 
 return [
+    // 公共header/footer
+    '首页' => 'Home',
+    '产品列表' => 'Products',
     '搜索' => 'Search',
     '搜索历史' => 'Search History',
     '请择地区' => 'SELECT A REGION',
-    '首页' => 'Home',
-    '产品列表' => 'Products',
     '产品' => 'Product',
     '联系方式' => 'Contact',
-    '查看所有' => 'View All',
-    '查看全部' => 'View All',
-    '明星产品/热点产品' => 'Featured Products',
-    '了解更多' => 'Learn More',
-    'Orico 技术' => 'ORICO Technology',
-    '强大功能、简单使用' => 'designed to be just as easy to learn as iPhone. chatting with friends.',
-    '常见问题' => 'FAQ',
-    '回答您最关心的问题' => 'What are you most concerned about',
-    '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内' => 'Our customer support is available Monday to Friday: 9am-6:00pm. Average answer time: 24h',
-    '发送查询' => 'Send Inquiry',
-    '型号' => 'Model',
-    '产品描述' => 'Product Description',
-    '关联产品' => 'Related Products',
-    '姓名' => 'Name',
-    '请输入您的名称' => 'First name',
-    '请输入您的姓氏' => 'Last name',
-    '公司/组织' => 'Company/Organization',
-    '电子邮箱' => 'Email',
-    '电话号码' => 'Phone Number',
-    '国家' => 'Country',
-    '请选择所属国家' => 'Select your country',
-    '行业' => 'Industry',
-    '询问内容' => 'Inquiry',
-    '提交' => 'SUBMIT',
+
+    // 返回文本
     '信息已成功提交！' => 'Add Success！',
     '信息提交失败！' => 'Add Fail！',
 
+    // 首页
+    'index/index' => [
+        '查看所有' => 'View All',
+        '明星产品/热点产品' => 'Featured Products',
+        '了解更多' => 'Learn More',
+        'Orico 技术' => 'ORICO Technology',
+        '强大功能、简单使用' => 'designed to be just as easy to learn as iPhone. chatting with friends.',
+        '常见问题' => 'FAQ',
+        '回答您最关心的问题' => 'What are you most concerned about',
+        '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内' => 'Our customer support is available Monday to Friday: 9am-6:00pm. Average answer time: 24h',
+    ],
+
+    // 产品分类
+    'product/category' => [
+        '查看全部' => 'View All',
+    ],
+    // 产品搜索
+    'product/search' => [
+        '搜索' => 'Search',
+        '请搜索' => 'Please search...',
+    ],
+    // 产品详情
+    'product/detail' => [
+        '首页' => 'Home',
+        '型号' => 'Model',
+        '发送查询' => 'Send Inquiry',
+        '产品描述' => 'Product Description',
+        '关联产品' => 'Related Products',
+        '姓名' => 'Name',
+        '请输入您的名称' => 'First name',
+        '请输入您的姓氏' => 'Last name',
+        '公司/组织' => 'Company/Organization',
+        '邮箱' => 'Email',
+        '电话号码' => 'Phone Number',
+        '国家' => 'Country',
+        '请选择所属国家' => 'Select your country',
+        '行业' => 'Industry',
+        '询问内容' => 'Inquiry',
+        '提交' => 'SUBMIT',
+    ],
+
     // 附件下载
     'attachment/index' => [
         '软件下载' => 'Software download',
@@ -48,36 +68,45 @@ return [
         '软件和驱动程序' => 'Software and Drivers',
         '您的浏览器不支持 video 标签。' => 'Your browser does not support HTML5 video.', 
     ],
-
-    // 成为分销商页面
-    '成为经销商' => 'Become a Distributor',
-    '准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。' => 'Ready to join us?<br/>Enter your details below and our Sales team will get back to you within 2 business days.',
-    '公司名称' => 'Company Name',
-    '请输入公司名称' => 'Enter your Company Name',
-    '电子邮件' => 'Contact Email',
-    '请输入邮箱' => 'Enter your Email',
-    '电话号码' => 'Phone Number',
-    '请输入电话号码' => 'Enter your Phone Number',
-    '业务类型' => 'Type of Business',
-    '在线商店网址' => 'Online Store URL',
-    '企业规模' => 'Enterprise Size',
-    '公司地址' => 'Company Address',
-    '请输入地址' => 'Enter Address',
-    '留言' => 'Message',
-    '请输入留言' => 'Enter your message',
-    // 批量购买页面
-    '批量购买' => 'Bulk Buy',
-    '法定营业名称' => 'Legal business name',
-    '官方网站' => 'Official website',
-    '请粘贴网址' => 'Please paste the URL',
-    '姓名' => 'Your Name',
-    '姓' => 'Last name',
-    '名' => 'First name',
-    '邮箱' => 'Email',
-    '电话号码' => 'Phone Number',
-    '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
-    '当前选定语言的采购可选品类配置出错' => 'The procurement category configuration for the currently selected language is incorrect',
     
+    // 联系我们批量购买页面
+    'contactus/bulkbuy' => [
+        '批量购买' => 'Bulk Buy',
+        '公司名称' => 'Company Name',
+        '法定营业名称' => 'Legal business name',
+        '官方网站' => 'Official website',
+        '请粘贴网址' => 'Please paste the URL',
+        '姓名' => 'Your Name',
+        '姓' => 'Last name',
+        '名' => 'First name',
+        '邮箱' => 'Email',
+        '请输入邮箱' => 'Enter your Email',
+        '电话号码' => 'Phone Number',
+        '请输入电话号码' => 'Enter your Phone Number',
+        '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
+    ],
+    // 联系我们成为分销商页面
+    'contactus/distributor' => [
+        '成为经销商' => 'Become a Distributor',
+        '准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。' => 'Ready to join us?<br/>Enter your details below and our Sales team will get back to you within 2 business days.',
+        '公司名称' => 'Company Name',
+        '请输入公司名称' => 'Enter your Company Name',
+        '电子邮件' => 'Contact Email',
+        '请输入邮箱' => 'Enter your Email',
+        '电话号码' => 'Phone Number',
+        '请输入电话号码' => 'Enter your Phone Number',
+        '业务类型' => 'Type of Business',
+        '在线商店网址' => 'Online Store URL',
+        '企业规模' => 'Enterprise Size',
+        '公司地址' => 'Company Address',
+        '请输入地址' => 'Enter Address',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
+    ],
     // 联系我们留言页
     'contactus/message' => [
         '我们的信息' => 'Our Information',
diff --git a/app/index/view/mobile/contact_us/bulkbuy.html b/app/index/view/mobile/contact_us/bulkbuy.html
index 8cefd10b..c1b4bea5 100644
--- a/app/index/view/mobile/contact_us/bulkbuy.html
+++ b/app/index/view/mobile/contact_us/bulkbuy.html
@@ -6,45 +6,45 @@
 <div class="oricoEGapp">
     <div class="bdpage" style="background: #fff;border-radius: 8px;padding-top: 50px;">
         <div class="bd_main bd_main1 bd_main2">
-            <h1 class="t1 sfbt1">{:lang('批量购买')}</h1>
+            <h1 class="t1 sfbt1">{:lang_i18n('批量购买')}</h1>
             <form action="" method="post" autocomplete="off">
                 <!--内容-->
                 <div class="bd_ct ">
                     <div class="bd_from" style="padding: 0 16px;">
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('公司名称')}<span class="redtag">*</span></label>
-                                <input type="text" name="corp_name" class="form-control itinp companyName" placeholder="{:lang('法定营业名称')}">
+                                <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                                <input type="text" name="corp_name" class="form-control itinp companyName" placeholder="{:lang_i18n('法定营业名称')}">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('官方网站')}</label>
-                                <input type="text" name="url" class="form-control itinp url" placeholder="{:lang('请粘贴网址')}">
+                                <label class="itlable">{:lang_i18n('官方网站')}</label>
+                                <input type="text" name="url" class="form-control itinp url" placeholder="{:lang_i18n('请粘贴网址')}">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('姓名')}<span class="redtag">*</span></label>
-                                <input type="text" name="first_name" class="form-control itinp firstname" placeholder="{:lang('名')}">
-                                <input type="text" name="last_name" class="form-control itinp lastname" placeholder="{:lang('姓')}" style="margin-top: 8px;">
+                                <label class="itlable">{:lang_i18n('姓名')}<span class="redtag">*</span></label>
+                                <input type="text" name="first_name" class="form-control itinp firstname" placeholder="{:lang_i18n('名')}">
+                                <input type="text" name="last_name" class="form-control itinp lastname" placeholder="{:lang_i18n('姓')}" style="margin-top: 8px;">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('邮箱')}<span class="redtag">*</span></label>
-                                <input type="text" name="email" class="form-control itinp email" placeholder="{:lang('请输入邮箱')}">
+                                <label class="itlable">{:lang_i18n('邮箱')}<span class="redtag">*</span></label>
+                                <input type="text" name="email" class="form-control itinp email" placeholder="{:lang_i18n('请输入邮箱')}">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('电话号码')}</label>
-                                <input type="text" name="phone" class="form-control itinp phone" placeholder="{:lang('请输入电话号码')}">
+                                <label class="itlable">{:lang_i18n('电话号码')}</label>
+                                <input type="text" name="phone" class="form-control itinp phone" placeholder="{:lang_i18n('请输入电话号码')}">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('您对哪个产品品类感兴趣？')}</label>
+                                <label class="itlable">{:lang_i18n('您对哪个产品品类感兴趣？')}</label>
                                 <div class="sfbchecks">
                                     {notempty name="interested"}
                                     {volist name="interested" id="it"}
@@ -58,14 +58,14 @@
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('留言')}<span class="redtag">*</span></label>
-                                <textarea name="message" class="ittextarea ittextarea2 message" placeholder="{:lang('请输入留言')}"></textarea>
+                                <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                                <textarea name="message" class="ittextarea ittextarea2 message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
                             </div>
                         </div>
                     </div>
                 </div>
                 <!-- 提交-->
-                <div class="bttj" id="send">{:lang('提交')}</div>
+                <div class="bttj" id="send">{:lang_i18n('提交')}</div>
             </form>
         </div>
     </div>
diff --git a/app/index/view/mobile/contact_us/distributor.html b/app/index/view/mobile/contact_us/distributor.html
index 2ea4c494..7a04540c 100644
--- a/app/index/view/mobile/contact_us/distributor.html
+++ b/app/index/view/mobile/contact_us/distributor.html
@@ -8,8 +8,8 @@
     <div class="cooperapp_bdpage" style="background:#F2F2F2;">
         <div class="cooperapp_bd_main" style="margin-top: 60px;">
             <form action="" method="post">
-                <h1 class="cooperapp_t1">{:lang('成为经销商')}</h1>
-                <p class="cooperapp_s1">{:lang('准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。')}</p>
+                <h1 class="cooperapp_t1">{:lang_i18n('成为经销商')}</h1>
+                <p class="cooperapp_s1">{:lang_i18n('准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。')}</p>
                 <!--内容-->
                 <div class="bd_ct cooperapp_bd_ct">
                     <div class="thimg">
@@ -18,25 +18,25 @@
                     <div class="bd_from">
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('公司名称')}<span class="redtag">*</span></label>
-                                <input type="text" class="form-control itinp companyName" placeholder="{:lang('请输入公司名称')}" />
+                                <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                                <input type="text" class="form-control itinp companyName" placeholder="{:lang_i18n('请输入公司名称')}" />
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('电子邮件')}<span class="redtag">*</span></label>
-                                <input type="text" class="form-control itinp email" placeholder="{:lang('请输入邮箱')}" />
+                                <label class="itlable">{:lang_i18n('电子邮件')}<span class="redtag">*</span></label>
+                                <input type="text" class="form-control itinp email" placeholder="{:lang_i18n('请输入邮箱')}" />
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('电话号码')}<span class="redtag">*</span></label>
-                                <input type="text" class="form-control itinp mphone" placeholder="{:lang('请输入电话号码')}" />
+                                <label class="itlable">{:lang_i18n('电话号码')}<span class="redtag">*</span></label>
+                                <input type="text" class="form-control itinp mphone" placeholder="{:lang_i18n('请输入电话号码')}" />
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('业务类型')}<span class="redtag">*</span></label>
+                                <label class="itlable">{:lang_i18n('业务类型')}<span class="redtag">*</span></label>
                                 <select name="business_type" class="form-control itinp business_type">
                                     {volist name="types" id="ty"}
                                     <option value="{$ty.value}">{$ty.name}</option>
@@ -46,13 +46,13 @@
                         </div>
                         <div class="theit">
                             <div class="bditem">
-                                <label class="itlable">{:lang('在线商店网址')}</label>
-                                <input type="text" class="form-control itinp url" placeholder="{:lang('请输入网址')}" />
+                                <label class="itlable">{:lang_i18n('在线商店网址')}</label>
+                                <input type="text" class="form-control itinp url" placeholder="{:lang_i18n('请输入网址')}" />
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('企业规模')}<span class="redtag">*</span></label>
+                                <label class="itlable">{:lang_i18n('企业规模')}<span class="redtag">*</span></label>
                                 <select name="enterprise_size" data-pf-type="FormInput" class="form-control itinp enterprise_size">
                                     {volist name="sizes" id="si"}
                                     <option value="{$si.value}">{$si.name}</option>
@@ -62,20 +62,20 @@
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('公司地址')}<span class="redtag">*</span></label>
-                                <input type="text" class="form-control itinp address" placeholder="{:lang('请输入地址')}">
+                                <label class="itlable">{:lang_i18n('公司地址')}<span class="redtag">*</span></label>
+                                <input type="text" class="form-control itinp address" placeholder="{:lang_i18n('请输入地址')}">
                             </div>
                         </div>
                         <div class="theit">
                             <div class="bditem bditem1">
-                                <label class="itlable">{:lang('留言')}<span class="redtag">*</span></label>
-                                <textarea class="ittextarea message" placeholder="{:lang('请输入留言')}"></textarea>
+                                <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                                <textarea class="ittextarea message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
                             </div>
                         </div>
                     </div>
                 </div>
                 <!-- 提交-->
-                <div class="bttj" id="send">{:lang('提交')}</div>
+                <div class="bttj" id="send">{:lang_i18n('提交')}</div>
             </form>
         </div>
     </div>
diff --git a/app/index/view/mobile/index/index.html b/app/index/view/mobile/index/index.html
index e02d1297..4d95fdf9 100644
--- a/app/index/view/mobile/index/index.html
+++ b/app/index/view/mobile/index/index.html
@@ -45,7 +45,7 @@
                     <p class="title">{$ft.title}</p>
                     <div class="more">
                         <a href="{$ft.link}" target="_blank">
-                            {:lang('查看所有')} <i class="icon-right-svg"></i>
+                            {:lang_i18n('查看所有')} <i class="icon-right-svg"></i>
                         </a>
                     </div>
                 </div>
@@ -57,7 +57,7 @@
         {notempty name="featured_products"}
         <div class="oidx-FP">
             <div class="Inpro-text">
-                <p class="title">{:lang('明星产品/热点产品')}</p>
+                <p class="title">{:lang_i18n('明星产品/热点产品')}</p>
             </div>
             <div class="m_Container">
                 <div class="swiper-container FPswiper">
@@ -70,7 +70,7 @@
                                 <p class="t-f16"></p>
                                 <p class="timeblue">
                                     <a href="{:url('product/detail',['id'=>$fp.id])}">
-                                        {:lang('了解更多')} <img src="__IMAGES__/more-r.png">
+                                        {:lang_i18n('了解更多')} <img src="__IMAGES__/more-r.png">
                                     </a>
                                 </p>
                             </div>
@@ -103,7 +103,7 @@
                     <p class="f_weight_500 timetitle" {:style(['color'=>$sc['title_txt_color']])}>{$sc.title}</p>
                     <p class=" margin-top-14 f_weight_100 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc}</p>
                     <p class=" margin-top-20 f_weight_100">
-                        <a href="{$sc.link}" class="timeblue"> {:lang('了解更多')} <img src="__IMAGES__/more-r.png"></a>
+                        <a href="{$sc.link}" class="timeblue"> {:lang_i18n('了解更多')} <img src="__IMAGES__/more-r.png"></a>
                     </p>
                 </div>
             </div>
@@ -113,8 +113,8 @@
         <!-- orico技术 -->
         <div class="oidx-tcly">
             <div class="Tech-text">
-                <h3>{:lang('Orico 技术')}</h3>
-                <p>{:lang('强大功能、简单使用')}</p>
+                <h3>{:lang_i18n('Orico 技术')}</h3>
+                <p>{:lang_i18n('强大功能、简单使用')}</p>
             </div>
             <div class="section  section-blends section-full">
                 <div class="section-stack section-stack--center ">
@@ -144,7 +144,7 @@
                                 <p class=" margin-top-14 f_weight_100 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc}</p>
                                 <p class=" margin-top-20 f_weight_100">
                                     <span class="  timeblue">
-                                        <a href="{$bs.link}">{:lang('了解更多')}<img src="__IMAGES__/more-r.png"></a>
+                                        <a href="{$bs.link}">{:lang_i18n('了解更多')}<img src="__IMAGES__/more-r.png"></a>
                                     </span>
                                 </p>
                             </div>
@@ -208,9 +208,9 @@
         <div class="oidx-fqa">
             <div class="faq">
                 <div class="faq-title ">
-                    <h3>{:lang('常见问题')}</h3>
-                    <h5>{:lang('回答您最关心的问题')}</h5>
-                    <p>{:lang('客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内')}</p>
+                    <h3>{:lang_i18n('常见问题')}</h3>
+                    <h5>{:lang_i18n('回答您最关心的问题')}</h5>
+                    <p>{:lang_i18n('客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内')}</p>
                 </div>
                 {volist name="recommend_faq" id="rq"}
                 <dl>
diff --git a/app/index/view/mobile/product/category.html b/app/index/view/mobile/product/category.html
index 04702b45..5a836c6b 100644
--- a/app/index/view/mobile/product/category.html
+++ b/app/index/view/mobile/product/category.html
@@ -37,7 +37,7 @@
             <div class="product_list_title">
                 <div class="product_title">{$vo.name}</div>
                 <a href="{:url('product/subcategory', ['id' => $vo.id])}" class="view_all text_gray">
-                    {:lang('查看全部')}<span class="icon-Double-Arrow"></span>
+                    {:lang_i18n('查看全部')}<span class="icon-Double-Arrow"></span>
                 </a>
             </div>
             <div class="product_list">
diff --git a/app/index/view/mobile/product/detail.html b/app/index/view/mobile/product/detail.html
index 9d55ceb5..8dd0c949 100644
--- a/app/index/view/mobile/product/detail.html
+++ b/app/index/view/mobile/product/detail.html
@@ -19,7 +19,7 @@
     <div class="oricoEGapp-prdetail">
         <div class="m_Container margin-top-90">
             <div class="goods_address">
-                <a class="href_01">{:lang('首页')}</a>
+                <a class="href_01">{:lang_i18n('首页')}</a>
                 {volist name="product_categorys" id="ca"}
                 <span class="icon-arrow arrow_address"></span>
                 <a class="href_02" href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a>
@@ -81,7 +81,7 @@
             <div class="proTfg">
                 <ul class="msul swt-Table">
                     <li class="Table-Row">
-                        <div class="ms1 Table-Cell">{:lang('型号')}</div>
+                        <div class="ms1 Table-Cell">{:lang_i18n('型号')}</div>
                         <div class="ms2 Table-Cell"></div>
                         <div class="ms3 Table-Cell">{$product.spu}</div>
                     </li>
@@ -96,15 +96,15 @@
             </div>
             {/notempty}
             <div class="platform_buy">
-                <a class="btn-blue-detail business-button">{:lang('发送查询')}</a>
+                <a class="btn-blue-detail business-button">{:lang_i18n('发送查询')}</a>
             </div>
         </div>
         <!-- 产品描述 -->
         <div class="goods_details">
             <ul class="cpa des cursor_p">
-                <li class="active" id="one">{:lang('产品描述')}</li>
+                <li class="active" id="one">{:lang_i18n('产品描述')}</li>
                 {notempty name="product_related"}
-                <li>{:lang('关联产品')}</li>
+                <li>{:lang_i18n('关联产品')}</li>
                 {/notempty}
                 <div class="clear"></div>
             </ul>
@@ -122,42 +122,42 @@
         <!-- 弹窗-->
         <div class="marsk-container-detail">
             <div class="popup-quick">
-                <div class="title-text">{:lang('发送查询')}</div>
+                <div class="title-text">{:lang_i18n('发送查询')}</div>
                 <div class="business-close"><img src="__IMAGES__/close2.png"></div>
                 <form action="" method="post" autocomplete="off" class="apply_content">
                     <div class="detail_form">
                         <div>
-                            <p><strong class="redstr">*</strong>{:lang('姓名')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('姓名')}</p>
                             <div class="name clearfix">
-                                <input type="text" class="first detail-w02" placeholder="{:lang('请输入您的名称')}"
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的名称')}"
                                     name="firstname" id="firstname" style="margin-right:0.5rem;">
-                                <input type="text" class="first detail-w02" placeholder="{:lang('请输入您的姓氏')}"
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的姓氏')}"
                                     name="lastname" id="lastname">
                             </div>
                         </div>
                         <div class=" clearfix">
-                            <p><strong class="redstr">*</strong>{:lang('公司/组织')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('公司/组织')}</p>
                             <div class="redstr">
                                 <input type="text" class="first detail-w01" id="companyName" name="companyName">
                             </div>
                         </div>
                         <div class=" clearfix">
-                            <p><strong class="redstr">*</strong>{:lang('邮箱')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('邮箱')}</p>
                             <div class="redstr">
                                 <input type="text" class="first detail-w01" id="email" name="email">
                             </div>
                         </div>
                         <div class=" clearfix">
-                            <p><strong class="redstr">*</strong>{:lang('电话号码')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('电话号码')}</p>
                             <div class="redstr">
                                 <input type="text" class="first detail-w01" id="phone" name="phone">
                             </div>
                         </div>
                         <div class="clearfix">
-                            <p><strong class="redstr">*</strong>{:lang('国家')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('国家')}</p>
                             <div class="redstr">
                                 <select class=" detail-w01" id="country" name="country">
-                                    <option value="">--- {:lang('请选择所属国家')} ---</option>
+                                    <option value="">--- {:lang_i18n('请选择所属国家')} ---</option>
                                     {volist name="country_list" id="country"}
                                     <option value="{$country}">{$country}</option>
                                     {/volist}
@@ -165,18 +165,18 @@
                             </div>
                         </div>
                         <div class=" clearfix">
-                            <p><strong class="redstr">*</strong>{:lang('行业')}</p>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('行业')}</p>
                             <div class="redstr">
                                 <input type="text" class="first detail-w01" id="industry" name="industry">
                             </div>
                         </div>
                         <div class=" clearfix">
-                            <p><strong style="color: red;">*</strong>{:lang('询问内容')}</p>
+                            <p><strong style="color: red;">*</strong>{:lang_i18n('询问内容')}</p>
                             <div>
                                 <textarea rows="3" cols="20" class="first detail-w01" id="inquiry" name="inquiry"></textarea>
                             </div>
                         </div>
-                        <div class="submit_btn" id="send">{:lang('提交')}</div>
+                        <div class="submit_btn" id="send">{:lang_i18n('提交')}</div>
                     </div>
                 </form>
             </div>
diff --git a/app/index/view/mobile/product/search.html b/app/index/view/mobile/product/search.html
index 31f070e9..2fd24f87 100644
--- a/app/index/view/mobile/product/search.html
+++ b/app/index/view/mobile/product/search.html
@@ -9,9 +9,9 @@
         <form action="{:url('product/search')}" method="get" class="topsearch">
             <div class="sleft">
                 <img src="__IMAGES__/ssapp.png" class="icosearch"/>
-                <input class="topseach-ipt" name="keywords" placeholder="{:lang('请搜索')}"/>
+                <input class="topseach-ipt" name="keywords" placeholder="{:lang_i18n('请搜索')}"/>
             </div>
-            <button type="submit" class="searchbt">{:lang('搜索')}</button>
+            <button type="submit" class="searchbt">{:lang_i18n('搜索')}</button>
         </form>
         {notempty name="products"}
         <div class="prlist">
diff --git a/app/index/view/mobile/public/footer.html b/app/index/view/mobile/public/footer.html
index 314bd4ca..088c3b5e 100644
--- a/app/index/view/mobile/public/footer.html
+++ b/app/index/view/mobile/public/footer.html
@@ -5,7 +5,7 @@
             <ul class="clearfix">
                 {notempty name="header_categorys"}
                 <li>
-                    <h3>{:lang('产品')}</h3>
+                    <h3>{:lang_i18n('产品')}</h3>
                     {volist name="header_categorys" id="hc"}
                     <p><a href="{:url('product/category', ['id' => $hc.id])}">{$hc.name}</a></p>
                     {/volist}
@@ -26,7 +26,7 @@
                 {/volist}
                 {/notempty}
                 <li>
-                    <h3>{:lang('联系方式')}</h3>
+                    <h3>{:lang_i18n('联系方式')}</h3>
                     {notempty name="contact_config.website_email"}
                     <p>{$contact_config.website_email.title}： {$contact_config.website_email.value}</p>
                     {/notempty}
diff --git a/app/index/view/mobile/public/header.html b/app/index/view/mobile/public/header.html
index 94bcc25d..d8c30371 100644
--- a/app/index/view/mobile/public/header.html
+++ b/app/index/view/mobile/public/header.html
@@ -12,11 +12,11 @@
     <!-- 顶部菜单-->
     <div class="top-menu">
         <div class="it-ct">
-            <div class="it-1"><a href="/">{:lang('首页')}</a></div>
+            <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('产品列表')}<i class="icon-arrow"></i></div>
+                <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>
@@ -48,11 +48,11 @@
                 <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('产品')} USB 2.0...">
-                        <button type="submit" id="search-btnput" class="search-button">{:lang('搜索')}</button>
+                        <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('搜索历史')}</a></p>
+                        <p><a href="#">{:lang_i18n('搜索历史')}</a></p>
                     </div>
                 </div>
             </div>
@@ -63,7 +63,7 @@
         <div class="mask"></div>
         <div class="action-sheet">
             <div class="menu-title">
-                <div class="menu-name">{:lang('请择地区')}</div>
+                <div class="menu-name">{:lang_i18n('请择地区')}</div>
                 <div class="close-icon">
                     <img src="__IMAGES__/close.png">
                 </div>

From 352160d13c3e7357ada5d57c130553f191673ce0 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 13:36:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/lang/en-us/validate.php             | 56 +++++++++----------
 .../validate/ContactUsBulkBuyValidate.php     | 16 +++---
 .../validate/ContactUsDistributorValidate.php | 12 ++--
 .../validate/ContactUsMessageValidate.php     |  6 +-
 app/index/validate/ProductInquiryValidate.php | 16 +++---
 app/index/view/mobile/product/detail.html     | 12 ++--
 6 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/app/index/lang/en-us/validate.php b/app/index/lang/en-us/validate.php
index 2a47a3a4..fdd0ffca 100644
--- a/app/index/lang/en-us/validate.php
+++ b/app/index/lang/en-us/validate.php
@@ -1,39 +1,37 @@
 <?php
 
 return [
-    '公司名称不能为空' => 'Company Name is required',
-    '公司名称不能超过64个字符' => 'Company Name cannot exceed 64 characters',
+    '姓不能为空' => 'Last name is required',
+    '姓不能超过:rule个字符' => 'Last name cannot exceed :rule characters',
+    '名不能为空' => 'First Name is required',
+    '名不能超过:rule个字符' => 'First name cannot exceed :rule characters',
+    '姓名不能为空' => 'Name is required',
+    '姓名不能超过:rule个字符' => 'Name cannot exceed :rule characters',
+    '电话号码不能为空' => 'Phone Number is required',
+    '电话号码不能超过:rule个字符' => 'Phone number cannot exceed :rule characters',
+    '感兴趣的产品种类不能超过:rule个字符' => 'Interested product categories cannot exceed :rule characters',
     '邮箱不能为空' => 'Email is required',
     '邮箱格式不正确' => 'Email format is incorrect',
-    '邮箱不能超过128个字符' => 'Email cannot exceed 128 characters',
-    '电话号码不能为空' => 'Phone Number is required',
-    '电话号码不能超过64个字符' => 'Phone Number cannot exceed 64 characters',
-    '业务类型不能为空' => 'Type of Business is required',
-    '业务类型不能超过128个字符' => 'Type of Business cannot exceed 128 characters',
-    '企业规模不能为空' => 'Enterprise Size is required',
-    '企业规模不能超过128个字符' => 'Enterprise Size cannot exceed 128 characters',
-    '公司地址不能为空' => 'Company Address is required',
-    '公司地址不能超过255个字符' => 'Company Address cannot exceed 255 characters',
-    '留言不能为空' => 'Message is required',
-    '公司名称不能超过128个字符' => 'Company name cannot exceed 128 characters',
-    '网址不能超过255个字符' => 'URL cannot exceed 255 characters',
-    '名不能为空' => 'First Name is required',
-    '名不能超过64个字符' => 'First name cannot exceed 64 characters',
-    '姓不能为空' => 'Last name is required',
-    '姓不能超过64个字符' => 'Last name cannot exceed 64 characters',
-    '电话号码不能超过32个字符' => 'Phone number cannot exceed 32 characters',
-    '感兴趣的产品种类不能超过255个字符' => 'Interested product categories cannot exceed 255 characters',
-    '留言内容不能为空' => 'Message content is required',
-    '留言内容不能超过1024个字符' => 'Message content cannot exceed 1024 characters',
-    '姓名不能为空' => 'Name is required',
-    '问题不能为空' => 'Question is required',
-    '问题不能超过1024个字符' => 'Question cannot exceed 1024 characters',
+    '邮箱不能超过:rule个字符' => 'Email cannot exceed :rule characters',
     '国家不能为空' => 'Country is required',
-    '国家不能超过128个字符' => 'Country cannot exceed 128 characters',
+    '国家不能超过:rule个字符' => 'Country cannot exceed :rule characters',
+    '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters',
+    '公司名称不能为空' => 'Company Name is required',
+    '公司名称不能超过:rule个字符' => 'Company name cannot exceed :rule characters',
+    '公司地址不能为空' => 'Company Address is required',
+    '公司地址不能超过:rule个字符' => 'Company Address cannot exceed :rule characters',
+    '企业规模不能为空' => 'Enterprise Size is required',
+    '企业规模不能超过:rule个字符' => 'Enterprise Size cannot exceed :rule characters',
+    '业务类型不能为空' => 'Type of Business is required',
+    '业务类型不能超过:rule个字符' => 'Type of Business cannot exceed :rule characters',
     '公司/组织不能为空' => 'Company/Organization is required',
-    '公司/组织不能超过128个字符' => 'Company/Organization cannot exceed 128 characters',
+    '公司/组织不能超过:rule个字符' => 'Company/Organization cannot exceed :rule characters',
     '行业不能为空' => 'Industry is required',
-    '行业不能超过64个字符' => 'Industry cannot exceed 64 characters',
+    '行业不能超过:rule个字符' => 'Industry cannot exceed :rule characters',
     '询问内容不能为空' => 'Inquiry is required',
-    '询问内容不能超过1024个字符' => 'Inquiry cannot exceed 1024 characters',
+    '询问内容不能超过:rule个字符' => 'Inquiry cannot exceed :rule characters',
+    '留言内容不能为空' => 'Message content is required',
+    '留言内容不能超过:rule个字符' => 'Message content cannot exceed :rule characters',
+    '问题不能为空' => 'Question is required',
+    '问题不能超过:rule个字符' => 'Question cannot exceed :rule characters',
 ];
\ No newline at end of file
diff --git a/app/index/validate/ContactUsBulkBuyValidate.php b/app/index/validate/ContactUsBulkBuyValidate.php
index 00cb549b..e3517abc 100644
--- a/app/index/validate/ContactUsBulkBuyValidate.php
+++ b/app/index/validate/ContactUsBulkBuyValidate.php
@@ -32,18 +32,18 @@ class ContactUsBulkBuyValidate extends Validate
      */
     protected $message = [
         'corp_name.require'  => '公司名称不能为空',
-        'corp_name.max'      => '公司名称不能超过128个字符',
-        'url.max'            => '网址不能超过255个字符',
+        'corp_name.max'      => '公司名称不能超过:rule个字符',
+        'url.max'            => '网址不能超过:rule个字符',
         'first_name.require' => '名不能为空',
-        'first_name.max'     => '名不能超过64个字符',
+        'first_name.max'     => '名不能超过:rule个字符',
         'last_name.require'  => '姓不能为空',
-        'last_name.max'      => '姓不能超过64个字符',
+        'last_name.max'      => '姓不能超过:rule个字符',
         'email.require'      => '邮箱不能为空',
         'email.email'        => '邮箱格式不正确',
-        'email.max'          => '邮箱不能超过128个字符',
-        'phone.max'          => '电话号码不能超过32个字符',
-        'interested.max'     => '感兴趣的产品种类不能超过255个字符',
+        'email.max'          => '邮箱不能超过:rule个字符',
+        'phone.max'          => '电话号码不能超过:rule个字符',
+        'interested.max'     => '感兴趣的产品种类不能超过:rule个字符',
         'message.require'    => '留言内容不能为空',
-        'message.max'        => '留言内容不能超过1024个字符',
+        'message.max'        => '留言内容不能超过:rule个字符',
     ];
 }
diff --git a/app/index/validate/ContactUsDistributorValidate.php b/app/index/validate/ContactUsDistributorValidate.php
index 67ab1900..5ad6a68a 100644
--- a/app/index/validate/ContactUsDistributorValidate.php
+++ b/app/index/validate/ContactUsDistributorValidate.php
@@ -31,18 +31,18 @@ class ContactUsDistributorValidate extends Validate
      */
     protected $message = [
        'corp_name.require'       => '公司名称不能为空',
-       'corp_name.max'           => '公司名称不能超过64个字符',
+       'corp_name.max'           => '公司名称不能超过:rule个字符',
        'email.require'           => '邮箱不能为空',
        'email.email'             => '邮箱格式不正确',
-       'email.max'               => '邮箱不能超过128个字符',
+       'email.max'               => '邮箱不能超过:rule个字符',
        'phone.require'           => '电话号码不能为空',
-       'phone.max'               => '电话号码不能超过64个字符',
+       'phone.max'               => '电话号码不能超过:rule个字符',
        'business_type.require'   => '业务类型不能为空',
-       'business_type.max'       => '业务类型不能超过128个字符',
+       'business_type.max'       => '业务类型不能超过:rule个字符',
        'enterprise_size.require' => '企业规模不能为空',
-       'enterprise_size.max'     => '企业规模不能超过128个字符',
+       'enterprise_size.max'     => '企业规模不能超过:rule个字符',
        'address.require'         => '公司地址不能为空',
-       'address.max'             => '公司地址不能超过255个字符',
+       'address.max'             => '公司地址不能超过:rule个字符',
        'message.require'         => '留言不能为空',
     ];
 }
diff --git a/app/index/validate/ContactUsMessageValidate.php b/app/index/validate/ContactUsMessageValidate.php
index 738f6d8d..c1dc2414 100644
--- a/app/index/validate/ContactUsMessageValidate.php
+++ b/app/index/validate/ContactUsMessageValidate.php
@@ -27,11 +27,11 @@ class ContactUsMessageValidate extends Validate
      */
     protected $message = [
         'name.require'    => '姓名不能为空',
-        'name.max'        => '姓名不能超过64个字符',
+        'name.max'        => '姓名不能超过:rule个字符',
         'email.require'   => '邮箱不能为空',
         'email.email'     => '邮箱格式不正确',
-        'email.max'       => '邮箱不能超过128个字符',
+        'email.max'       => '邮箱不能超过:rule个字符',
         'content.require' => '问题不能为空',
-        'content.max'     => '问题不能超过1024个字符'
+        'content.max'     => '问题不能超过:rule个字符'
     ];
 }
diff --git a/app/index/validate/ProductInquiryValidate.php b/app/index/validate/ProductInquiryValidate.php
index c696fea9..a9629a96 100644
--- a/app/index/validate/ProductInquiryValidate.php
+++ b/app/index/validate/ProductInquiryValidate.php
@@ -32,20 +32,20 @@ class ProductInquiryValidate extends Validate
      */
     protected $message = [
         'first_name.require'   => '名不能为空',
-        'first_name.max'       => '名不能超过64个字符',
+        'first_name.max'       => '名不能超过:rule个字符',
         'last_name.require'    => '姓不能为空',
-        'last_name.max'        => '姓不能超过64个字符',
+        'last_name.max'        => '姓不能超过:rule个字符',
         'email.require'        => '邮箱不能为空',
         'email.email'          => '邮箱格式不正确',
-        'email.max'            => '邮箱不能超过128个字符',
-        'phone.max'            => '电话号码不能超过32个字符',
+        'email.max'            => '邮箱不能超过:rule个字符',
+        'phone.max'            => '电话号码不能超过:rule个字符',
         'country_name.require' => '国家不能为空',
-        'country_name.max'     => '国家不能超过128个字符',
+        'country_name.max'     => '国家不能超过:rule个字符',
         'corp_name.require'    => '公司/组织不能为空',
-        'corp_name.max'        => '公司/组织不能超过128个字符',
+        'corp_name.max'        => '公司/组织不能超过:rule个字符',
         'industry.require'     => '行业不能为空',
-        'industry.max'         => '行业不能超过64个字符',
+        'industry.max'         => '行业不能超过:rule个字符',
         'message.require'      => '询问内容不能为空',
-        'message.max'          => '询问内容不能超过1024个字符'
+        'message.max'          => '询问内容不能超过:rule个字符'
     ];
 }
diff --git a/app/index/view/mobile/product/detail.html b/app/index/view/mobile/product/detail.html
index 8dd0c949..049131d8 100644
--- a/app/index/view/mobile/product/detail.html
+++ b/app/index/view/mobile/product/detail.html
@@ -60,7 +60,7 @@
                             <li class="attr_value tip1 attr_item" data-index="{$pk}">
                                 {eq name="attr_value_type" value="IMAGE"}
                                 <span class="co-bg"><img src="{$pv.attr_value}" /></span>
-                                {elseif condition="attr_value_type == 'RGB'" /}
+                                {elseif condition="$attr_value_type == 'RGB'" /}
                                 <span class="co-bg" {:style(['background-color'=>$pv.attr_value])}></span>
                                 {else/}
                                 <span>{$pv.attr_value}</span>
@@ -130,15 +130,15 @@
                             <p><strong class="redstr">*</strong>{:lang_i18n('姓名')}</p>
                             <div class="name clearfix">
                                 <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的名称')}"
-                                    name="firstname" id="firstname" style="margin-right:0.5rem;">
+                                    name="first_name" id="firstname" style="margin-right:0.5rem;">
                                 <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的姓氏')}"
-                                    name="lastname" id="lastname">
+                                    name="last_name" id="lastname">
                             </div>
                         </div>
                         <div class=" clearfix">
                             <p><strong class="redstr">*</strong>{:lang_i18n('公司/组织')}</p>
                             <div class="redstr">
-                                <input type="text" class="first detail-w01" id="companyName" name="companyName">
+                                <input type="text" class="first detail-w01" id="companyName" name="company_name">
                             </div>
                         </div>
                         <div class=" clearfix">
@@ -156,7 +156,7 @@
                         <div class="clearfix">
                             <p><strong class="redstr">*</strong>{:lang_i18n('国家')}</p>
                             <div class="redstr">
-                                <select class=" detail-w01" id="country" name="country">
+                                <select class=" detail-w01" id="country" name="corp_name">
                                     <option value="">--- {:lang_i18n('请选择所属国家')} ---</option>
                                     {volist name="country_list" id="country"}
                                     <option value="{$country}">{$country}</option>
@@ -173,7 +173,7 @@
                         <div class=" clearfix">
                             <p><strong style="color: red;">*</strong>{:lang_i18n('询问内容')}</p>
                             <div>
-                                <textarea rows="3" cols="20" class="first detail-w01" id="inquiry" name="inquiry"></textarea>
+                                <textarea rows="3" cols="20" class="first detail-w01" id="message" name="message"></textarea>
                             </div>
                         </div>
                         <div class="submit_btn" id="send">{:lang_i18n('提交')}</div>

From d363191833742a6baea53b0666c5cd67f5e35b05 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 30 May 2025 13:37:23 +0800
Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20think-orm=E5=9B=9E=E9=80=80?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 049a9ea8..34b09ade 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": ">=8.0.0",
         "topthink/framework": "^8.0",
-        "topthink/think-orm": "^3.0|^4.0",
+        "topthink/think-orm": "v3.0.34",
         "topthink/think-filesystem": "^2.0",
         "topthink/think-multi-app": "^1.1",
         "topthink/think-migration": "^3.1",