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

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
@@ -116,3 +117,26 @@ if (!function_exists('get_path_from_img_tag'))
         return '';
     }
 }
+
+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 Lang::get($name, $vars, $lang);
+        }
+        return Lang::get($lang_key, $vars, $lang);
+    }
+}

app/index/config/lang.php

@@ -22,7 +22,6 @@ return [
             app()->getAppPath() . '/lang/en-us/' . (request()->isMobile() ? 'mobile' : 'pc') . '.php',
             app()->getAppPath() . '/lang/en-us/validate.php',
         ],
-        'zh-cn' => app()->getAppPath() . '/lang/zh-cn/' . (request()->isMobile() ? 'mobile' : 'pc') . '.php',
     ],
     // Accept-Language转义为对应语言包名称
     'accept_language' => [

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',

app/index/controller/Product.php

@@ -452,9 +452,9 @@ class Product extends Common
             'message'      => $post['message'],
         ]);
         if ($ret->isEmpty()) {
-            return error(lang('product_detail.send_fail'));
+            return error(lang('提交成功'));
         }
-        return success(lang('product_detail.send_success'));
+        return success(lang('提交失败'));
     }
 
     /**

app/index/controller/TopicNas.php

@@ -226,7 +226,7 @@ class TopicNas extends Common
         View::assign('article', $article);
 
         // 获取文章分类及文章数据
-        $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->value('id');
+        $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
         $article_categorys = ArticleCategoryModel::with(['article' => function ($query) {
                 $query->field(['id', 'title', 'category_id']);
             }])

app/index/lang/en-us/mobile.php

@@ -1,74 +1,124 @@
 <?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',
+
+    // 返回文本
+    '提交成功' => 'success',
+    '提交失败' => 'fail',
     '信息已成功提交！' => 'Add Success！',
     '信息提交失败！' => 'Add Fail！',
+    '当前选定语言的采购可选品类配置出错' => 'Current language configuration of purchase optional categories is incorrect',
+
+    // 首页
+    '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',
+    ],
 
     // 附件下载
-    '软件下载' => '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',
-    '准备好加入我们了吗?<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',
+        '姓名' => 'Your name',
+        '电子邮箱' => 'Your email',
+        '您的问题' => 'Your message',
+        '提交您的问题' => 'Send Us Your Question',
+        '请输入内容...' => 'This is your placeholder text',
+        '发送' => 'SEND',
+        '成为经销商' => 'Become a Distributor',
+    ],
 ];

app/index/lang/en-us/pc.php

@@ -1,226 +1,213 @@
 <?php
 
 return [
-    'header_navigation' => [
-        'product_categorys' => 'Products',
-        'store'             => 'Store'
+    '产品列表' => 'Products',
+    '店铺' => 'Store',
+    '搜索记录' => 'Search History',
+    '热销产品' => 'Popular Products',
+    '产品' => 'Product',
+    '联系我们' => 'Contact',
+
+    // 返回文本
+    '提交成功' => 'success',
+    '提交失败' => 'fail',
+    '信息已成功提交！' => 'Add Success！',
+    '信息提交失败！' => 'Add Fail！',
+    '当前选定语言的采购可选品类配置出错' => 'Current language configuration of purchase optional categories is incorrect',
+
+    // 首页
+    '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 Manday to Friday 9am600pmAverage arswer time 24h',
     ],
-    'header_search'  => [
-        'history'     => 'Search History',
-        'hot_product' => 'Popular Products',
+
+    // 文章详情页
+    'article/detail' => [
+        '分享' => 'SHARE',
+        '留言' => 'Leave a Reply',
+        '名称' => 'Name',
+        '电子邮箱' => 'Email',
+        '您的电子邮件地址不会被公开' => 'Your email address will not be pulished.',
+        '留言内容' => 'Comment',
+        '提交留言' => 'POST COMMENT',
+        '你可能还喜欢' => 'Recommended for you',
+        '链接复制成功' => 'Link copied successfully',
     ],
-    'footer_navigation' => [
-        'product_categorys' => 'Product'
+
+    // 附件页 - 软件下载
+    'attachment/index' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '视频' => 'Videos',
+        '支持型号' => 'Supported Models',
+        '支持系统' => 'Supported Systems',
+        '搜索型号' => 'Search model',
+        '查询无结果！' => 'No Result！',
     ],
-    'footer_contact' => 'Contact',
-    'index'          => [
-        'featured_products'     => 'Featured Products',
-        'view_all'              => 'View All',
-        'learn_more'            => 'Learn More',
-        'orico_technology'      => 'ORICO Technology',
-        'orico_technology_desc' => 'Designed to be just as easy to learn as iPhone.Chatting with friends.',
-        'faq'                   => 'FAQ',
-        'faq_short_desc'        => 'What are you most concerned about',
-        'faq_desc'              => 'Our customer support is available Manday to Friday 9am600pmAverage arswer time 24h',
+
+    // 附件页 - 视频
+    'attachment/video' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '搜索型号' => 'Search model',
+        '视频' => 'Videos',
+        '查询无此视频！' => 'No Video！',
     ],
-    'article' => [
-        'detail_share'                 => 'SHARE',
-        'detail_leave_reply'           => 'Leave a Reply',
-        'detail_leave_reply_name'      => 'Name',
-        'detail_leave_reply_email'     => 'Email',
-        'detail_leave_reply_email_tip' => 'Your email address will not be pulished.',
-        'detail_leave_reply_comment'   => 'Comment',
-        'detail_leave_reply_submit'    => 'POST COMMENT',
-        'detail_recommend'             => 'Recommended for you',
+
+    // 关于我们 - 品牌介绍
+    'aboutus/introduction' => [
+        '品牌介绍' => 'Introduction of the Brand',
+        '选择我们的理由' => 'Why Choose Us',
+        '为您提供专属定制服务' => 'How We Can Help with Customization',
+        '对于不同的情况' => 'For Different Situation',
     ],
-    'attachment' => [
-        'software_drives'    => 'Software and Drivers',
-        'video'              => 'Videos',
-        'support_model'      => 'Supported Models',
-        'support_platform'   => 'Supported Systems',
-        'search_placeholder' => 'Search model',
-        'no_data'            => 'No Result！',
-        'no_video'           => 'No Video！',
+
+    // 关于我们 - 品牌历程
+    'aboutus/mileage' => [
+        'ORICO荣耀' => 'Our Achievement',
+        '品牌里程' => 'Brand Events',
+        '品牌活动' => 'Tech Development',
     ],
-    'aboutus_introduction' => [
-        'title'                    => 'Introduction of the Brand',
-        'section_why_title'        => 'Why Choose Us',
-        'section_service_title'    => 'How We Can Help with Customization',
-        'section_difference_title' => 'For Different Situation',
+
+    // 关于我们 - 售后政策
+    'aboutus/policy' => [
+        '售后政策_注意事项' => 'After-Sales Policy',
+        '售后政策' => 'After-sale Policy',
+        'ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺' => 'ORICO commits to provide 7-day Refund, 15-day Exchange, 1-year Quality Warranty. ',
+        '为了保障您的合法权益，敬请关注以下信息' => 'For your own benefits, please mind the following information',
+        '为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：' => 'For a smooth return and refund, quality warranty, please follow these steps:',
+        '特别说明' => 'ORICO is not liable for:'
     ],
-    'aboutus_mileage' => [
-        'achievement' => 'Our Achievement',
-        'events'      => 'Brand Events',
-        'development' => 'Tech Development',
+
+    // 关于我们 - 文化介绍
+    'aboutus/culture' => [
+        '文化介绍' => 'Culture Introduction',
     ],
-    'aboutus_policy' => [
-        'title'          => 'After-Sales Policy',
-        'banner_1_title' => 'After-sale Policy',
-        'banner_1_desc'  => 'ORICO commits to provide 7-day Refund, 15-day Exchange, 1-year Quality Warranty. ',
-        'banner_3_title' => 'For your own benefits, please mind the following information',
-        'banner_3_desc'  => 'For a smooth return and refund, quality warranty, please follow these steps:',
-        'banner_5_title' => 'ORICO is not liable for:'
+
+    // 联系我们
+    'contactus/index' => [
+        '客户服务' => 'contact us',
     ],
-    'contact_index' => [
-        'title'                     => 'contact us',
+
+    // 联系我们 - 留言
+    'contactus/message' => [
+        '联系我们' => 'contact us',
+        '我们的信息' => 'Our Information',
+        '提交您的问题' => 'Send Us Your Question',
+        '姓名' => 'Yuor Name',
+        '请输入你的姓名' => 'This is your placeholder text',
+        '电子邮箱' => 'Your Email',
+        '请输入你的邮箱' => 'This is your placeholder text',
+        '您的问题' => 'Your Message',
+        '请输入你的问题' => 'This is your placeholder text',
+        '发送' => 'SEND',
+        '成为经销商' => 'Become a Distributor',
     ],
-    'contact_message' => [
-        'title'                     => 'contact us',
-        'our_information'           => 'Our Information',
-        'send_question'             => 'Send Us Your Question',
-        'form_name'                 => 'Yuor Name',
-        'form_name_placeholder'     => 'This is your placeholder text',
-        'form_email'                => 'Your Email',
-        'form_email_placeholder'    => 'This is your placeholder text',
-        'form_question'             => 'Your Message',
-        'form_question_placeholder' => 'This is your placeholder text',
-        'form_submit'               => 'SEND',
-        'become_a_distributor'      => 'Become a Distributor',
-        // 验证器中文本
-        'validate_name_required'    => 'Name is required',
-        'validate_name_max'         => 'Name cannot exceed 64 characters',
-        'validate_email_required'   => 'Email is required',
-        'validate_email_email'      => 'Email format is incorrect',
-        'validate_email_max'        => 'Email cannot exceed 128 characters',
-        'validate_content_required' => 'Message is required',
-        'validate_content_max'      => 'Message cannot exceed 1024 characters',
-        // 返回文本  
-        'send_success' => 'success',
-        'send_fail'    => 'fail',
+
+    // 联系我们 - 成为经销商
+    'contactus/distributor' => [
+        '成为经销商' => 'To Be Our Distributor',
+        '准备好加入我们了吗?' => 'Ready to join us?',
+        '在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。' => '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',
+        '请输入电话号码' => 'This is your placeholder text',
+        '业务类型' => 'Type of Business',
+        '在线商店网址' => 'Online Shop URL',
+        '请输入网址' => 'This is your placeholder URL',
+        '企业规模' => 'Enterprise size',
+        '公司地址' => 'Company Address',
+        '请输入地址' => 'Enter Address',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
     ],
-    'contact_distributor' => [
-        'title'                            => 'Become a Distributor',
-        'section_title'                    => 'To Be Our Distributor',
-        'section_desc_1'                   => 'Ready to join us?',
-        'section_desc_2'                   => 'Enter your details below and our Sales team will get back to you within 2 business days.',
-        'form_corp_name'                   => 'Company Name',
-        'form_corp_name_placeholder'       => 'Enter your Company Name',
-        'form_email'                       => 'Contact Email',
-        'form_email_placeholder'           => 'Enter your Email',
-        'form_phone'                       => 'Phone Number',
-        'form_phone_placeholder'           => 'This is your placeholder text',
-        'form_business_type'               => 'Type of Business',
-        'form_online_shop_url'             => 'Online Shop URL',
-        'form_online_shop_url_placeholder' => 'This is your placeholder URL',
-        'form_enterprise_size'             => 'Enterprise size',
-        'form_corp_address'                => 'Company Address',
-        'form_corp_address_placeholder'    => 'Enter Address',
-        'form_message'                     => 'Message',
-        'form_message_placeholder'         => 'Enter your message',
-        'form_submit'                      => 'SUBMIT',
-        // 验证器中文本
-        'validate_name_required'            => 'Company Name is required',
-        'validate_name_max'                 => 'Company Name cannot exceed 64 characters',
-        'validate_email_required'           => 'Email is required',
-        'validate_email_email'              => 'Email format is incorrect',
-        'validate_email_max'                => 'Email cannot exceed 128 characters',
-        'validate_phone_required'           => 'Phone Number is required',
-        'validate_phone_max'                => 'Phone Number cannot exceed 64 characters',
-        'validate_business_type_required'   => 'Type of Business is required',
-        'validate_business_type_max'        => 'Type of Business cannot exceed 128 characters',
-        'validate_enterprise_size_required' => 'Enterprise size is required',
-        'validate_enterprise_size_max'      => 'Enterprise size cannot exceed 128 characters',
-        'validate_address_required'         => 'Company Address is required',
-        'validate_address_max'              => 'Company Address cannot exceed 255 characters',
-        'validate_message_required'         => 'Message is required',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
+
+    // 联系我们 - 批量购买
+    'contactus/bulkbuy' => [
+        '商务订单' => 'Bulk Buy',
+        '批量购买' => 'Bulk Buy',
+        '公司名称' => 'Company Name',
+        '法定营业名称' => 'Legal business name',
+        '官方网站' => 'Official website',
+        '请粘贴网址' => 'Please paste the URL',
+        '姓名' => 'Your Name',
+        '名' => 'First name',
+        '姓' => 'Last name',
+        '电子邮箱' => 'Email',
+        '请输入邮箱' => 'Please enter your email',
+        '电话号码' => 'Phone Numbe',
+        '请输入电话号码'  => 'Please enter your phone number',
+        '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
+        '留言' => 'Message',
+        '请输入留言' => 'Methods used',
+        '提交' => 'SUBMIT',
     ],
-    'contact_bulkbuy' => [
-        'title'                        => '',
-        'form_title'                   => 'Bulk Buy',
-        'form_corp_name_label'         => 'Company Name',
-        'form_corp_name_placeholder'   => 'Legal business name',
-        'form_website_url_label'       => 'Official website',
-        'form_website_url_placeholder' => 'Please paste the URL',
-        'form_username_label'          => 'Your Name',
-        'form_firstname_placeholder'   => 'First name',
-        'form_lastname_placeholder'    => 'Last name',
-        'form_email_label'             => 'Email',
-        'form_email_placeholder'       => 'Please enter your email',
-        'form_phone_label'             => 'Phone Numbe',
-        'form_phone_placeholder'       => 'Please enter your phone number',
-        'form_checkbox_label'          => 'Products you are interested in?',
-        'form_message_label'           => 'Message',
-        'form_message_placeholder'     => 'Methods used',
-        'form_submit'                  => 'SUBMIT',
-        // 验证器中文本
-        'validate_corp_name_require'  => 'Company Name is required',
-        'validate_corp_name_max'      => 'Company Name cannot exceed 128 characters',
-        'validate_url_max'            => 'URL cannot exceed 255 characters',
-        'validate_first_name_require' => 'First Name is required',
-        'validate_first_name_max'     => 'First Name cannot exceed 64 characters',
-        'validate_last_name_require'  => 'Last Name is required',
-        'validate_last_name_max'      => 'Last Name cannot exceed 64 characters',
-        'validate_email_require'      => 'Email is required',
-        'validate_email_email'        => 'Email format is incorrect',
-        'validate_email_max'          => 'Email cannot exceed 128 characters',
-        'validate_phone_max'          => 'Phone Number cannot exceed 32 characters',
-        'validate_interested_max'     => 'Interested in cannot exceed 255 characters',
-        'validate_message_require'    => 'Message is required',
-        'validate_message_max'        => 'Message cannot exceed 1024 characters',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
+
+    // 产品 - 产品详情页
+    'product/detail' => [
+        '产品详情' => 'Product Description',
+        '相关产品' => 'Related Products',
+        '发送查询' => 'Send Inquiry',
+        '姓名' => 'Name',
+        '请输入您的姓' => 'First name',
+        '请输入您的名' => 'Last name',
+        '公司/组织' => 'Company/Organization',
+        '电子邮箱' => 'Email Address',
+        '电话号码' => 'Phone Number',
+        '国家' => 'Country',
+        '请选择所属国家' => '--- Select your country ---',
+        '行业' => 'Industry',
+        '询问内容' => 'Inquiry',
+        '提交' => 'SUBMIT',
     ],
-    'product_newpro' => [
-        'view_all' => 'View all'
+
+    // 产品 - 分类
+    'product/category' => [
+        '查看全部' => 'View All',
     ],
-    'product_detail' => [
-        'detail_section_title'        => 'Product Description',
-        'related_products'            => 'Related Products',
-        'display_form'                => 'Send Inquiry',
-        'form_name'                   => 'Name',
-        'form_first_name_placeholder' => 'First name',
-        'form_last_name_placeholder'  => 'Last name',
-        'form_corp'                   => 'Company/Organization',
-        'form_email'                  => 'Email Address',
-        'form_phone'                  => 'Phone Number',
-        'form_country'                => 'Country',
-        'form_country_placeholder'    => '--- Select your country ---',
-        'form_industry'               => 'Industry',
-        'form_inquiry'                => 'Inquiry',
-        'form_submit'                 => 'SUBMIT',
-        // 验证器中文本
-        'validate_first_name_require'   => 'First Name is required',
-        'validate_first_name_max'       => 'First Name cannot exceed 64 characters',
-        'validate_last_name_require'    => 'Last Name is required',
-        'validate_last_name_max'        => 'Last Name cannot exceed 64 characters',
-        'validate_email_require'        => 'Email is required',
-        'validate_email_email'          => 'Email format is incorrect',
-        'validate_email_max'            => 'Email cannot exceed 128 characters',
-        'validate_phone_max'            => 'Phone Number cannot exceed 32 characters',
-        'validate_country_name_require' => 'Country is required',
-        'validate_country_name_max'     => 'Country cannot exceed 128 characters',
-        'validate_corp_name_require'    => 'Company/Organization is required',
-        'validate_corp_name_max'        => 'Company/Organization cannot exceed 128 characters',
-        'validate_industry_require'     => 'Industry is required',
-        'validate_industry_max'         => 'Industry cannot exceed 64 characters',
-        'validate_message_require'      => 'Message is required',
-        'validate_message_max'          => 'Message cannot exceed 1024 characters',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
+
+    // nas主题 - 首页
+    'topicnas/index' => [
+        '网络存储解决方案' => 'Network Storage Solutions',
+        '配套软件' => 'Software',
     ],
-    'topic_nas_index' => [
-        'solution_section_title' => '<span style="color:#004BFA;">ORICO</span>网络存储解决方案',
-        'software_section_title' => '<span style="color:#004BFA">NAS</span>配套软件',
+
+    // nas主题 - 客户合作页
+    'topicnas/cooperation' => [
+        '合作优势' => 'Cooperation advantages',
+        '期待与您的合作' => 'Looking forward to working with you'
     ],
-    'topic_nas_cooperation' => [
-        'advantages_section_title' => 'Cooperation advantages',
-        'contacts_section_title'   => 'Looking forward to working with you'
+
+    // nas主题 - 下载页
+    'topicnas/download' => [
+        'CyberData赛博云空间'  => 'CyberData',
+        'Weline微链接' => 'Weline'
     ],
-    'topic_nas_download' => [
-        'cyber_tab_title'  => 'CyberData',
-        'weline_tab_title' => 'Weline'
+
+    // nas主题 - 帮助页
+    'topicnas/help' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '使用教程' => 'User\' s Guide',
+        '查看更多' => 'Click to view more',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
+    ],
+
+    // nas主题 - 帮助详情页
+    'topicnas/helpdetail' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '使用教程' => 'User\' s Guide',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
     ],
-    'topic_nas_help' => [
-        'module_title'             => 'Quick Start Guide',
-        'search_input_placeholder' => 'What are you looking for?',
-        'article_section_title'    => 'User\' s Guide',
-        'contact_section_title'    => 'Contact US',
-        'view_more'                => 'Click to view more',
-        'content'                  => 'Content'
-    ]
 ];

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',
 ];

app/index/lang/zh-cn/pc.php

@@ -1,226 +0,0 @@
-<?php
-
-return [
-    'header_navigation' => [
-        'product_categorys' => '产品列表',
-        'store'             => '店铺'
-    ],
-    'header_search'  => [
-        'hot_product' => '热销产品',
-        'history'     => '搜索记录',
-    ],
-    'footer_navigation' => [
-        'product_categorys' => '产品'
-    ],
-    'footer_contact' => '联系我们',
-    'index'          => [
-        'featured_products'     => '明星产品/热点产品',
-        'view_all'              => '查看所有',
-        'learn_more'            => '了解更多',
-        'orico_technology'      => 'ORICO 技术',
-        'orico_technology_desc' => '强大功能、简单使用',
-        'faq'                   => '常见问题',
-        'faq_short_desc'        => '回答您最关心的问题',
-        'faq_desc'              => '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内',
-    ],
-    'article' => [
-        'detail_share'                 => '分享',
-        'detail_leave_reply'           => '留言',
-        'detail_leave_reply_name'      => '名称',
-        'detail_leave_reply_email'     => '电子邮箱',
-        'detail_leave_reply_email_tip' => '您的电子邮件地址不会被公开',
-        'detail_leave_reply_comment'   => '留言',
-        'detail_leave_reply_submit'    => '提交留言',
-        'detail_recommend'             => '你可能还喜欢',
-    ],
-    'attachment' => [
-        'software_drives'    => '软件和驱动程序',
-        'video'              => '视频',
-        'support_model'      => '支持型号',
-        'support_platform'   => '支持系统',
-        'search_placeholder' => '搜索型号',
-        'no_data'            => '查询无结果！',
-        'no_video'           => '查询无此视频！',
-    ],
-    'aboutus_introduction' => [
-        'title'                    => '品牌介绍',
-        'section_why_title'        => '选择我们的理由',
-        'section_service_title'    => '为您提供专属定制服务',
-        'section_difference_title' => '对于不同的情况',
-    ],
-    'aboutus_mileage' => [
-        'achievement' => 'ORICO荣耀',
-        'events'      => '品牌里程',
-        'development' => '品牌活动',
-    ],
-    'aboutus_policy' => [
-        'title'          => '售后政策_注意事项',
-        'banner_1_title' => '售后政策',
-        'banner_1_desc'  => 'ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺',
-        'banner_3_title' => '为了保障您的合法权益，敬请关注以下信息',
-        'banner_3_desc'  => '为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：',
-        'banner_5_title' => '特别说明'
-    ],
-    'contact_index' => [
-        'title'                     => '客户服务',
-    ],
-    'contact_message' => [
-        'title'                     => '联系我们',
-        'our_information'           => '我们的信息',
-        'send_question'             => '提交您的问题',
-        'form_name'                 => '姓名',
-        'form_name_placeholder'     => '请输入你的姓名',
-        'form_email'                => '电子邮箱',
-        'form_email_placeholder'    => '请输入你的邮箱',
-        'form_question'             => '您的问题',
-        'form_question_placeholder' => '请输入你的问题',
-        'form_submit'               => '发送',
-        'become_a_distributor'      => '成为经销商',
-        // 验证器中文本
-        'validate_name_required'    => '姓名不能为空',
-        'validate_name_max'         => '姓名不能超过64个字符',
-        'validate_email_required'   => '邮箱不能为空',
-        'validate_email_email'      => '邮箱格式不正确',
-        'validate_email_max'        => '邮箱不能超过128个字符',
-        'validate_content_required' => '问题不能为空',
-        'validate_content_max'      => '问题不能超过1024个字符',
-        // 返回文本
-        'send_success' => '提交成功',
-        'send_fail'    => '提交失败',
-    ],
-    'contact_distributor' => [
-        'title'                            => '成为经销商',
-        'section_title'                    => '成为经销商',
-        'section_desc_1'                   => '准备好加入我们了吗?',
-        'section_desc_2'                   => '在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。',
-        'form_corp_name'                   => '公司名称',
-        'form_corp_name_placeholder'       => '请输入公司名称',
-        'form_email'                       => '电子邮箱',
-        'form_email_placeholder'           => '请输入邮箱',
-        'form_phone'                       => '电话号码',
-        'form_phone_placeholder'           => '请输入电话号码',
-        'form_business_type'               => '业务类型',
-        'form_online_shop_url'             => '在线商店网址',
-        'form_online_shop_url_placeholder' => '请输入网址',
-        'form_enterprise_size'             => '企业规模',
-        'form_corp_address'                => '公司地址',
-        'form_corp_address_placeholder'    => '请输入地址',
-        'form_message'                     => '留言',
-        'form_message_placeholder'         => '请输入留言',
-        'form_submit'                      => '提交',
-        // 验证器中文本
-        'validate_name_required'            => '公司名称不能为空',
-        'validate_name_max'                 => '公司名称不能超过64个字符',
-        'validate_email_required'           => '邮箱不能为空',
-        'validate_email_email'              => '邮箱格式不正确',
-        'validate_email_max'                => '邮箱不能超过128个字符',
-        'validate_phone_required'           => '电话号码不能为空',
-        'validate_phone_max'                => '电话号码不能超过64个字符',
-        'validate_business_type_required'   => '业务类型不能为空',
-        'validate_business_type_max'        => '业务类型不能超过128个字符',
-        'validate_enterprise_size_required' => '企业规模不能为空',
-        'validate_enterprise_size_max'      => '企业规模不能超过128个字符',
-        'validate_address_required'         => '公司地址不能为空',
-        'validate_address_max'              => '公司地址不能超过255个字符',
-        'validate_message_required'         => '留言内容不能为空',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'contact_bulkbuy' => [
-        'title'                        => '商务订单',
-        'form_title'                   => '批量购买',
-        'form_corp_name_label'         => '公司名称',
-        'form_corp_name_placeholder'   => '法定营业名称',
-        'form_website_url_label'       => '官方网站',
-        'form_website_url_placeholder' => '请粘贴网址',
-        'form_username_label'          => '姓名',
-        'form_firstname_placeholder'   => '名',
-        'form_lastname_placeholder'    => '姓',
-        'form_email_label'             => '电子邮箱',
-        'form_email_placeholder'       => '请输入邮箱',
-        'form_phone_label'             => '电话号码',
-        'form_phone_placeholder'       => '请输入电话号码',
-        'form_checkbox_label'          => '您对哪个产品品类感兴趣？',
-        'form_message_label'           => '留言',
-        'form_message_placeholder'     => '请输入留言',
-        'form_submit'                  => '提交',
-        // 验证器中文本
-        'validate_corp_name_require'  => '公司名称不能为空',
-        'validate_corp_name_max'      => '公司名称不能超过128个字符',
-        'validate_url_max'            => '网址不能超过255个字符',
-        'validate_first_name_require' => '名不能为空',
-        'validate_first_name_max'     => '名不能超过64个字符',
-        'validate_last_name_require'  => '姓不能为空',
-        'validate_last_name_max'      => '姓不能超过64个字符',
-        'validate_email_require'      => '邮箱不能为空',
-        'validate_email_email'        => '邮箱格式不正确',
-        'validate_email_max'          => '邮箱不能超过128个字符',
-        'validate_phone_max'          => '电话号码不能超过32个字符',
-        'validate_interested_max'     => '感兴趣的产品种类不能超过255个字符',
-        'validate_message_require'    => '留言内容不能为空',
-        'validate_message_max'        => '留言内容不能超过1024个字符',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'product_newpro' => [
-        'view_all' => '查看全部'
-    ],
-    'product_detail' => [
-        'detail_section_title'        => '产品详情',
-        'related_products'            => '相关产品',
-        'display_form'                => '发送查询',
-        'form_name'                   => '姓名',
-        'form_first_name_placeholder' => '请输入您的姓',
-        'form_last_name_placeholder'  => '请输入您的名',
-        'form_corp'                   => '公司/组织',
-        'form_email'                  => '电子邮箱',
-        'form_phone'                  => '电话号码',
-        'form_country'                => '国家',
-        'form_country_placeholder'    => '请选择所属国家',
-        'form_industry'               => '行业',
-        'form_inquiry'                => '询问内容',
-        'form_submit'                 => '提交',
-        // 验证器中文本
-        'validate_first_name_require'   => '名不能为空',
-        'validate_first_name_max'       => '名不能超过64个字符',
-        'validate_last_name_require'    => '姓不能为空',
-        'validate_last_name_max'        => '姓不能超过64个字符',
-        'validate_email_require'        => '邮箱不能为空',
-        'validate_email_email'          => '邮箱格式不正确',
-        'validate_email_max'            => '邮箱不能超过128个字符',
-        'validate_phone_max'            => '电话号码不能超过32个字符',
-        'validate_country_name_require' => '国家不能为空',
-        'validate_country_name_max'     => '国家不能超过128个字符',
-        'validate_corp_name_require'    => '公司/组织不能为空',
-        'validate_corp_name_max'        => '公司/组织不能超过128个字符',
-        'validate_industry_require'     => '行业不能为空',
-        'validate_industry_max'         => '行业不能超过64个字符',
-        'validate_message_require'      => '询问内容不能为空',
-        'validate_message_max'          => '询问内容不能超过1024个字符',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'topic_nas_index' => [
-        'solution_section_title' => '<span style="color:#004BFA;">ORICO</span>网络存储解决方案',
-        'software_section_title' => '<span style="color:#004BFA">NAS</span>配套软件',
-    ],
-    'topic_nas_cooperation' => [
-        'advantages_section_title' => '合作优势',
-        'contacts_section_title'   => '期待与您的合作'
-    ],
-    'topic_nas_download' => [
-        'cyber_tab_title'  => 'CyberData赛博云空间',
-        'weline_tab_title' => 'Weline微链接'
-    ],
-    'topic_nas_help' => [
-        'module_title'             => '帮助中心',
-        'search_input_placeholder' => '请输入搜索关键字,如安装赛博云空间,影视库',
-        'article_section_title'    => '使用教程',
-        'contact_section_title'    => '联系我们',
-        'view_more'                => '查看更多',
-        'content'                  => '目录'
-    ]
-];

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个字符',
     ];
 }

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'         => '留言不能为空',
     ];
 }

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个字符'
     ];
 }

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个字符'
     ];
 }

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"}

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}

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>

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>

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}

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>

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">

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>
@@ -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>
@@ -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('请输入您的名称')}"
-                                    name="firstname" id="firstname" style="margin-right:0.5rem;">
-                                <input type="text" class="first detail-w02" placeholder="{:lang('请输入您的姓氏')}"
-                                    name="lastname" id="lastname">
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的名称')}"
+                                    name="first_name" id="firstname" style="margin-right:0.5rem;">
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的姓氏')}"
+                                    name="last_name" 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">
+                                <input type="text" class="first detail-w01" id="companyName" name="company_name">
                             </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>
+                                <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>
                                     {/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>
+                                <textarea rows="3" cols="20" class="first detail-w01" id="message" name="message"></textarea>
                             </div>
                         </div>
-                        <div class="submit_btn" id="send">{:lang('提交')}</div>
+                        <div class="submit_btn" id="send">{:lang_i18n('提交')}</div>
                     </div>
                 </form>
             </div>

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">

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}

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>

app/index/view/pc/about_us/culture.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-{notempty name=":lang('aboutus_culture.title')"}<title>{:lang('aboutus_culture.title')}</title>
+{notempty name=":lang_i18n('文化介绍')"}<title>{:lang_i18n('文化介绍')}</title>
 {else/}{__BLOCK__}{/notempty}
 {/block}
 {block name="style"}

app/index/view/pc/about_us/introduction.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-{notempty name=":lang('aboutus_introduction.title')"}<title>{:lang('aboutus_introduction.title')}</title>{else/}{__BLOCK__}{/notempty}
+{notempty name=":lang_i18n('品牌介绍')"}<title>{:lang_i18n('品牌介绍')}</title>{else/}{__BLOCK__}{/notempty}
 {/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/aboutus_introduction.css" />
@@ -14,7 +14,7 @@
             <img src="{$focus_image.image}" alt="" class="bdimg1">
             {/notempty}
             <div class="iotb_bgw">
-                <h1 class="iotbt1">{:lang('aboutus_introduction.section_why_title')}</h1>
+                <h1 class="iotbt1">{:lang_i18n('选择我们的理由')}</h1>
                 <div class="iotb_part1">
                     {notempty name="why"}
                     {volist name="why" id="wh"}
@@ -28,7 +28,7 @@
                 </div>
             </div>
             <div class="iotb_part2" style="background: #fff;">
-                <h1 class="iotbt1">{:lang('aboutus_introduction.section_service_title')}</h1>
+                <h1 class="iotbt1">{:lang_i18n('为您提供专属定制服务')}</h1>
                 {notempty name="service"}
                 {volist name="service" id="se"}
                 <div class="fdimgs">
@@ -45,7 +45,7 @@
             </div>
         </div>
         <div class="iotb_part2" style="padding-bottom:0;background: #f2f2f2;">
-            <h1 class="iotbt1">{:lang('aboutus_introduction.section_difference_title')}</h1>
+            <h1 class="iotbt1">{:lang_i18n('对于不同的情况')}</h1>
             {notempty name="difference"}
             {volist name="difference" id="diff"}
             <div class="fdimgs fdimgs1">

app/index/view/pc/about_us/mileage.html

@@ -7,7 +7,7 @@
     <div class="achievementMain">
         <img src="__IMAGES__/Achievement.png" class="acvImg" />
         <div class="achInfo">
-            <div class="title">{:lang('aboutus_mileage.achievement')}</div>
+            <div class="title">{:lang_i18n('ORICO荣耀')}</div>
             {notempty name="achievement"}
             <div class="achNums">
                 {volist name="achievement" id="ac"}
@@ -22,7 +22,7 @@
         <div class="achTimes">
             {notempty name="events"}
             <div class="timecontent">
-                <div class="title">{:lang('aboutus_mileage.events')}</div>
+                <div class="title">{:lang_i18n('品牌里程')}</div>
                 <div class="timelist">
                     <div class="timeline-time">
                         <ul class="event_year">
@@ -58,7 +58,7 @@
         <div class="tech">
             {notempty name="development"}
             <div class="techcontent">
-                <div class="title">{:lang('aboutus_mileage.development')}</div>
+                <div class="title">{:lang_i18n('品牌活动')}</div>
                 {volist name="development" id="de"}
                 <div class="techcon ">
                     <div class="text">

app/index/view/pc/about_us/policy.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-<title>{:lang('aboutus_policy.title')}</title>
+<title>{:lang_i18n('售后政策_注意事项')}</title>
 {/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/aboutus_policy.css">
@@ -18,8 +18,8 @@
             {/notempty}
         </div>
         {/notempty}
-        <div class="lj_sale_policy">{:lang('aboutus_policy.banner_1_title')}</div>
-        <div class="lj_sale_t">{:lang('aboutus_policy.banner_1_desc')}</div>
+        <div class="lj_sale_policy">{:lang_i18n('售后政策')}</div>
+        <div class="lj_sale_t">{:lang_i18n('ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺')}</div>
         <div class="swt-Container">
             <div class="lj_icon_l clearfix">
                 {notempty name="policy.banner_1"}
@@ -47,8 +47,8 @@
             </div>
             {/volist}
             {/notempty}
-            <div class="lj_three_policy">{:lang('aboutus_policy.banner_3_title')}</div>
-            <div class="lj_t_small">{:lang('aboutus_policy.banner_3_desc')}</div>
+            <div class="lj_three_policy">{:lang_i18n('为了保障您的合法权益，敬请关注以下信息')}</div>
+            <div class="lj_t_small">{:lang_i18n('为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：')}</div>
             <div class="lj_policy_icon clearfix">
                 {notempty name="policy.banner_3"}
                 <ul>
@@ -72,7 +72,7 @@
             </div>
             {/volist}
             {/notempty}
-            <div class="lj_three_policy">{:lang('aboutus_policy.banner_5_title')}</div>
+            <div class="lj_three_policy">{:lang_i18n('特别说明')}</div>
             <div class="lj_policy_four clearfix">
                 {notempty name="policy.banner_5"}
                 <ul>

app/index/view/pc/article/detail.html

@@ -28,7 +28,7 @@
         <div class="atmright">
             {notempty name="share_config"}
             <div class="blog_share">
-                <h3>{:lang('article.detail_share')}</h3>
+                <h3>{:lang_i18n('分享')}</h3>
                 <div class="share_list">
                     {volist name="share_config" id="sc"}
                     <a class="atdit" {if condition="!empty($sc.is_blank) && $sc.is_blank.value == 1"}target="_blank"{/if} {notempty name="sc.url.value"}href="{$sc.url.value}"{/notempty}>
@@ -44,16 +44,16 @@
             </div>
             {/notempty}
             <div class="repply">
-                <h3>{:lang('article.detail_leave_reply')}</h3>
+                <h3>{:lang_i18n('留言')}</h3>
                 <form action="{:url('article/comment', ['id' => $detail.id])}" method="POST" autocomplete="off">
-                    <span>{:lang('article.detail_leave_reply_name')}</span>
+                    <span>{:lang_i18n('名称')}</span>
                     <input class="form-control itinp new_name" type="text" name="name" style="text-indent: 10px;">
-                    <span>{:lang('article.detail_leave_reply_email')}</span>
+                    <span>{:lang_i18n('电子邮箱')}</span>
                     <input class="form-control itinp new_email" type="email" name="email" style="text-indent: 10px; margin-bottom:0;">
-                    <p style="color: #C6C7C9; font-size: 0.75rem; margin-bottom: 0.625rem;">{:lang('article.detail_leave_reply_email_tip')}</p>
-                    <span>{:lang('article.detail_leave_reply_comment')}</span>
+                    <p style="color: #C6C7C9; font-size: 0.75rem; margin-bottom: 0.625rem;">{:lang_i18n('您的电子邮件地址不会被公开')}</p>
+                    <span>{:lang_i18n('留言内容')}</span>
                     <textarea class="form-control itinp new_comment" name="content" rows="3" style="text-indent: 10px;width: 98%; margin-top: 0.625rem;margin-bottom: 0.625rem;border: 1px solid #DBDBDB;"></textarea>
-                    <div class="comment_btn" style="color:#ffffff;">{:lang('article.detail_leave_reply_submit')}</div>
+                    <div class="comment_btn" style="color:#ffffff;">{:lang_i18n('提交留言')}</div>
                 </form>
             </div>
         </div>
@@ -63,7 +63,7 @@
         <!-- 猜您喜欢 -->
         <div class="love">
             <div class="love1">
-                <p class="tt">{:lang('article.detail_recommend')}</p>
+                <p class="tt">{:lang_i18n('你可能还喜欢')}</p>
                 <p><img src="__IMAGES__/1line.png" height="7"></p>
             </div>
             <ul class="love2">
@@ -131,7 +131,7 @@
         input.select()
         if (document.execCommand('copy')) {
             document.execCommand('copy')
-            alert('链接复制成功')
+            alert("{:lang_i18n('链接复制成功')}")
         }
         document.body.removeChild(input)
     } 

app/index/view/pc/attachment/index.html

@@ -8,14 +8,14 @@
     <div class="downloadMain">
         <div class="topimg">
             <img src="__IMAGES__/banner_01.png" />
-            <div class="banner_title">{:lang('attachment.software_drives')}</div>
+            <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/index')}" method="get">
                 <div class="search_all">
                     <input type="hidden" name="id" value="{$Request.get.id}" />
-                    <input type="text" name="keyword" placeholder="{:lang('attachment.search_placeholder')}" />
+                    <input type="text" name="keyword" placeholder="{:lang_i18n('搜索型号')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>
             </form>
@@ -34,7 +34,7 @@
                 </a>
                 {/volist}
                 {/notempty}
-                <a href="{:url('attachment/video')}"><div class="tabit">{:lang('attachment.video')}</div></a>
+                <a href="{:url('attachment/video')}"><div class="tabit">{:lang_i18n('视频')}</div></a>
             </div>
             <!-- 切换的内容 -->
             <div class="softlist">
@@ -46,9 +46,9 @@
                     </div>
                     <div>
                         <p class="title">{$att.name}</p>
-                        <p class="sub_title">{:lang('attachment.support_model')}: </p>
+                        <p class="sub_title">{:lang_i18n('支持型号')}: </p>
                         <p class="des">{$att.applicable_to}</p>
-                        <p class="sub_title">{:lang('attachment.support_platform')}: </p>
+                        <p class="sub_title">{:lang_i18n('支持系统')}: </p>
                         <p class="des">{$att.support_platform}</p>
                         <p>
                             {notempty name="att.attach"}
@@ -64,7 +64,7 @@
                 {/volist}
                 <div class="page-box">{$page|raw}</div>
                 {else/}
-                <div class="softit">{:lang('attachment.no_data')}</div>
+                <div class="softit">{:lang_i18n('查询无结果！')}</div>
                 {/notempty}
             </div>
         </div>

app/index/view/pc/attachment/video.html

@@ -8,13 +8,13 @@
     <div class="downloadMain">
         <div class="topimg">
             <img src="__IMAGES__/banner_01.png" />
-            <div class="banner_title">{:lang('attachment.software_drives')}</div>
+            <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/video')}" method="get">
                 <div class="search_all">
-                    <input type="text" name="keyword" placeholder="{:lang('attachment.search_placeholder')}" />
+                    <input type="text" name="keyword" placeholder="{:lang_i18n('搜索型号')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>
             </form>
@@ -29,7 +29,7 @@
                 </a>
                 {/volist}
                 {/notempty}
-                <div class="tabit on">{:lang('attachment.video')}</div>
+                <div class="tabit on">{:lang_i18n('视频')}</div>
             </div>
             <!-- VIDEO 切换 -->
             <div class="vidotabs">
@@ -69,7 +69,7 @@
                     {/volist}
                     <div class="page-box">{$page|raw}</div>
                     {else/}
-                    <ul><dl class="video-empty">{:lang('attachment.no_video')}</dl></ul>
+                    <ul><dl class="video-empty">{:lang_i18n('查询无此视频！')}</dl></ul>
                     {/notempty}
                 </div>
             </div>

app/index/view/pc/contact_us/bulkbuy.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-{notempty name=":lang('contact_bulkbuy.title')"}<title>{:lang('contact_bulkbuy.title')}</title>{else /}{__BLOCK__}{/notempty}
+{notempty name=":lang_i18n('商务订单')"}<title>{:lang_i18n('商务订单')}</title>{else /}{__BLOCK__}{/notempty}
 {/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/contactus_bulkbuy.css">
@@ -10,47 +10,47 @@
     <!--首内容 -->
     <div class="bussinessMain">
         <form class="bd_main" action="" method="post">
-            <h1 class="sfbt1">{:lang('contact_bulkbuy.form_title')}</h1>
+            <h1 class="sfbt1">{:lang_i18n('批量购买')}</h1>
             <!--内容-->
             <div class="bd_ct ">
                 <div class="bd_from" style="padding: 0 300px;">
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_corp_name_label')}<span class="redtag">*</span></label>
-                            <input type="text" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_corp_name_placeholder')}" name="corp_name" />
+                            <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                            <input type="text" class="form-control itinp" placeholder="{:lang_i18n('法定营业名称')}" name="corp_name" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_website_url_label')}</label>
-                            <input type="text" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_website_url_placeholder')}" name="url" />
+                            <label class="itlable">{:lang_i18n('官方网站')}</label>
+                            <input type="text" class="form-control itinp" placeholder="{:lang_i18n('请粘贴网址')}" name="url" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_username_label')}<span class="redtag">*</span></label>
-                            <input type="text" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_firstname_placeholder')}" name="first_name" />
+                            <label class="itlable">{:lang_i18n('姓名')}<span class="redtag">*</span></label>
+                            <input type="text" class="form-control itinp" placeholder="{:lang_i18n('名')}" name="first_name" />
                         </div>
                         <div class="bditem">
                             <label class="itlable">&nbsp;</label>
-                            <input type="text" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_lastname_placeholder')}" name="last_name" />
+                            <input type="text" class="form-control itinp" placeholder="{:lang_i18n('姓')}" name="last_name" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_email_label')}<span class="redtag">*</span></label>
-                            <input type="email" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_email_placeholder')}" name="email" />
+                            <label class="itlable">{:lang_i18n('电子邮箱')}<span class="redtag">*</span></label>
+                            <input type="email" class="form-control itinp" placeholder="{:lang_i18n('请输入邮箱')}" name="email" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_phone_label')}</label>
-                            <input type="text" class="form-control itinp" placeholder="{:lang('contact_bulkbuy.form_phone_placeholder')}" name="phone" />
+                            <label class="itlable">{:lang_i18n('电话号码')}</label>
+                            <input type="text" class="form-control itinp" placeholder="{:lang_i18n('请输入电话号码')}" name="phone" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_checkbox_label')}</label>
+                            <label class="itlable">{:lang_i18n('您对哪个产品品类感兴趣？')}</label>
                             <div class="sfbchecks">
                                 <div class="sfbcheckboxlist">
                                     {notempty name="interested"}
@@ -66,14 +66,14 @@
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_bulkbuy.form_message_label')}<span class="redtag">*</span></label>
-                            <textarea class="ittextarea ittextarea2" placeholder="{:lang('contact_bulkbuy.form_message_placeholder')}" name="message"></textarea>
+                            <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                            <textarea class="ittextarea ittextarea2" placeholder="{:lang_i18n('请输入留言')}" name="message"></textarea>
                         </div>
                     </div>
                 </div>
             </div>
             <!-- 提交-->
-            <div class="bttj" id="send">{:lang('contact_bulkbuy.form_submit')}</div>
+            <div class="bttj" id="send">{:lang_i18n('提交')}</div>
         </form>
     </div>
 </div>

app/index/view/pc/contact_us/distributor.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-<title>{:lang('contact_distributor.title')}</title>
+<title>{:lang_i18n('成为经销商')}</title>
 {/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/contactus_distributor.css" />
@@ -9,9 +9,9 @@
 <div class="orico_Page_distributor">
     <!--内容 -->
     <div class="distributorMain">
-        <h1 class="t1">{:lang('contact_distributor.section_title')}</h1>
-        <p class="s1" style="padding-bottom:5px">{:lang('contact_distributor.section_desc_1')}</p>
-        <p class="s1 s2">{:lang('contact_distributor.section_desc_2')}</p>
+        <h1 class="t1">{:lang_i18n('成为经销商')}</h1>
+        <p class="s1" style="padding-bottom:5px">{:lang_i18n('准备好加入我们了吗?')}</p>
+        <p class="s1 s2">{:lang_i18n('在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。')}</p>
         <!--内容-->
         <form action="" method="post">
             <div class="bd_ct">
@@ -21,23 +21,23 @@
                 <div class="bd_from">
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_distributor.form_corp_name')}<span class="redtag">*</span></label>
-                            <input type="text" class="form-control itinp" name="corp_name" placeholder="{:lang('contact_distributor.form_corp_name_placeholder')}" />
+                            <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                            <input type="text" class="form-control itinp" name="corp_name" placeholder="{:lang_i18n('请输入公司名称')}" />
                         </div>
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_distributor.form_email')}<span class="redtag">*</span></label>
-                            <input type="email" class="form-control itinp" name="email" placeholder="{:lang('contact_distributor.form_email_placeholder')}" />
+                            <label class="itlable">{:lang_i18n('电子邮箱')}<span class="redtag">*</span></label>
+                            <input type="email" class="form-control itinp" name="email" placeholder="{:lang_i18n('请输入邮箱')}" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_distributor.form_phone')}<span class="redtag">*</span></label>
-                            <input type="text" class="form-control itinp" name="phone" placeholder="{:lang('contact_distributor.form_phone_placeholder')}" />
+                            <label class="itlable">{:lang_i18n('电话号码')}<span class="redtag">*</span></label>
+                            <input type="text" class="form-control itinp" name="phone" placeholder="{:lang_i18n('请输入电话号码')}" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_distributor.form_business_type')}<span class="redtag">*</span></label>
+                            <label class="itlable">{:lang_i18n('业务类型')}<span class="redtag">*</span></label>
                             <select name="business_type" class="form-control itinp">
                                 {volist name="types" id="ty"}
                                 <option value="{$ty.value}">{$ty.name}</option>
@@ -45,13 +45,13 @@
                             </select>
                         </div>
                         <div class="bditem">
-                            <label class="itlable">{:lang('contact_distributor.form_online_shop_url')}</label>
-                            <input type="text" class="form-control itinp" name="url" placeholder="{:lang('contact_distributor.form_online_shop_url_placeholder')}" />
+                            <label class="itlable">{:lang_i18n('在线商店网址')}</label>
+                            <input type="text" class="form-control itinp" name="url" placeholder="{:lang_i18n('请输入网址')}" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_distributor.form_enterprise_size')}<span class="redtag">*</span></label>
+                            <label class="itlable">{:lang_i18n('企业规模')}<span class="redtag">*</span></label>
                             <select name="enterprise_size" class="form-control itinp">
                                 {volist name="sizes" id="si"}
                                 <option value="{$si.value}">{$si.name}</option>
@@ -61,20 +61,20 @@
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_distributor.form_corp_address')}<span class="redtag">*</span></label>
-                            <input class="form-control itinp" name="address" placeholder="{:lang('contact_distributor.form_corp_address_placeholder')}" />
+                            <label class="itlable">{:lang_i18n('c公司地址')}<span class="redtag">*</span></label>
+                            <input class="form-control itinp" name="address" placeholder="{:lang_i18n('请输入地址')}" />
                         </div>
                     </div>
                     <div class="theit">
                         <div class="bditem bditem1">
-                            <label class="itlable">{:lang('contact_distributor.form_message')}<span class="redtag">*</span></label>
-                            <textarea class="ittextarea" name="message" placeholder="{:lang('contact_distributor.form_message_placeholder')}"></textarea>
+                            <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                            <textarea class="ittextarea" name="message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
                         </div>
                     </div>
                 </div>
             </div>
             <!-- 提交-->
-            <div class="bttj" id="send">{:lang('contact_distributor.form_submit')}</div>
+            <div class="bttj" id="send">{:lang_i18n('提交')}</div>
         </form>
     </div>
 </div>

app/index/view/pc/contact_us/index.html

@@ -1,6 +1,6 @@
 {extend name="public/base" /}
 {block name="title"}
-<title>{:lang('contact_index.title')}</title>
+<title>{:lang_i18n('客户服务')}</title>
 {/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/contactus_index.css" />

app/index/view/pc/contact_us/message.html

@@ -1,5 +1,5 @@
 {extend name="public/base" /}
-{block name="title"}<title>{:lang('contact_message.title')}</title>{/block}
+{block name="title"}<title>{:lang_i18n('联系我们')}</title>{/block}
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/contactus_message.css" />
 {/block}
@@ -15,7 +15,7 @@
         <div class="contact_c">
             <div class="all_contact">
                 <div class="info">
-                    <div class="title"> {:lang('contact_message.our_information')} </div>
+                    <div class="title"> {:lang_i18n('我们的信息')} </div>
                     {notempty name="our_information[0]"}
                     <div class="info_all">
                         {assign name="first_info" value="$our_information|array_shift" /}
@@ -47,36 +47,36 @@
                     {/notempty}
                 </div>
                 <div class="question">
-                    <div class="title">{:lang('contact_message.send_question')}</div>
+                    <div class="title">{:lang_i18n('提交您的问题')}</div>
                     <div class="question_form">
                         <form action="" method="post" autocomplete="off">
                             <div class="list">
-                                <div class="title">{:lang('contact_message.form_name')}<span class="f_red">*</span></div>
+                                <div class="title">{:lang_i18n('姓名')}<span class="f_red">*</span></div>
                                 <div class="form_input">
-                                    <input name="name" class="form-control itinp" placeholder="{:lang('contact_message.form_name_placeholder')}" />
+                                    <input name="name" class="form-control itinp" placeholder="{:lang_i18n('请输入你的姓名')}" />
                                 </div>
                             </div>
                             <div class="list">
-                                <div class="title">{:lang('contact_message.form_email')} <span class="f_red">*</span></div>
+                                <div class="title">{:lang_i18n('电子邮箱')} <span class="f_red">*</span></div>
                                 <div class="form_input">
-                                    <input name="email" class="form-control itinp" placeholder="{:lang('contact_message.form_email_placeholder')}" />
+                                    <input name="email" class="form-control itinp" placeholder="{:lang_i18n('请输入你的邮箱')}" />
                                 </div>
                             </div>
                             <div class="list">
-                                <div class="title">{:lang('contact_message.form_question')} <span class="f_red">*</span></div>
+                                <div class="title">{:lang_i18n('您的问题')} <span class="f_red">*</span></div>
                                 <div class="form_input">
-                                    <textarea rows="6" name="content" class="ittextarea" placeholder="{:lang('contact_message.form_question_placeholder')}"></textarea>
+                                    <textarea rows="6" name="content" class="ittextarea" placeholder="{:lang_i18n('请输入你的问题')}"></textarea>
                                 </div>
                             </div>
                             <div class="list">
-                                <div class="contact_button" id="send">{:lang('contact_message.form_submit')}</div>
+                                <div class="contact_button" id="send">{:lang_i18n('发送')}</div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
             <div class="become_dis">
-                <a href="{:url('contactus/distributor')}" class="text_blue">{:lang('contact_message.become_a_distributor')}</a>
+                <a href="{:url('contactus/distributor')}" class="text_blue">{:lang_i18n('成为经销商')}</a>
             </div>
         </div>
     </div>

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

@@ -49,7 +49,7 @@
           <div class="ftItme_left">
             <p>{$topic.title}</p>
             <div class="subtitle">
-              <span>{:lang('index.view_all')}</span>
+              <span>{:lang_i18n('查看所有')}</span>
               <div class="tpicture"></div>
             </div>
           </div>
@@ -57,7 +57,7 @@
           <div class="ftItme_left">
             <p>{$topic.title}</p>
             <div class="subtitle">
-              <span>{:lang('index.view_all')}</span>
+              <span>{:lang_i18n('查看所有')}</span>
               <div class="tpicture"></div>
             </div>
           </div>
@@ -73,7 +73,7 @@
     <!-- 明星产品/热点产品 -->
     {notempty name="featured_products"}
     <div class="featuredProducts">
-      <p class="biaoti">{:lang('index.featured_products')}</p>
+      <p class="biaoti">{:lang_i18n('明星产品/热点产品')}</p>
       <div class="swiper fpSwiper">
         <div class="swiper-wrapper">
           {volist name="featured_products" id="product"}
@@ -83,7 +83,7 @@
             </a>
             <div class="fpptitle">{$product.name}</div>
             <div class="subtitle">{$product.short_name}</div>
-            <a class="more">{:lang('index.learn_more')} ></a>
+            <a class="more">{:lang_i18n('了解更多')} ></a>
           </div>
           {/volist}
         </div>
@@ -124,7 +124,7 @@
             {/notempty}>{$scene.title}</p>
           <p class="subtitle" {notempty name="scene.desc_txt_color" }style="color:{$scene.desc_txt_color};" {/notempty}>
             {$scene.desc|raw}</p>
-          <a class="sceneMore" href="{$scene.link}">{:lang('index.learn_more')} ></a>
+          <a class="sceneMore" href="{$scene.link}">{:lang_i18n('了解更多')} ></a>
         </div>
         <div style="background-image: url('{$scene.image}');" class="sceneimg"></div>
       </div>
@@ -133,8 +133,8 @@
     {/notempty}
     <!-- orico科技 -->
     <div class="oricoTechnology">
-      <p class="ottitle">{:lang('index.orico_technology')}</p>
-      <span class="otsbtitle">{:lang('index.orico_technology_desc')}</span>
+      <p class="ottitle">{:lang_i18n('ORICO 技术')}</p>
+      <span class="otsbtitle">{:lang_i18n('强大功能、简单使用')}</span>
       <div class="beforeafter ba-slider">
         <!-- 对比前的图片 -->
         <img src="__IMAGES__/indeximg1.jpg">
@@ -161,7 +161,7 @@
                 {/notempty}>{$story.title}</div>
               <div class="bssubtitle" {notempty name="story.desc_txt_color" }style="color:{$story.desc_txt_color};"
                 {/notempty}>{$story.desc|raw}</div>
-              <a class="bsmore" href="{$story.link}">{:lang('index.learn_more')} ></a>
+              <a class="bsmore" href="{$story.link}">{:lang_i18n('了解更多')} ></a>
             </div>
           </div>
           {/volist}
@@ -224,9 +224,9 @@
     {notempty name="recommend_faq"}
     <div class="oricoFQA">
       <div class="fqaleft">
-        <h1 class="title">{:lang('index.faq')}</h1>
-        <p class="dec">{:lang('index.faq_short_desc')}</p>
-        <p class="sudec">{:lang('index.faq_desc')}</p>
+        <h1 class="title">{:lang_i18n('常见问题')}</h1>
+        <p class="dec">{:lang_i18n('回答您最关心的问题')}</p>
+        <p class="sudec">{:lang_i18n('客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内')}</p>
       </div>
       <div class="fqaright">
         <ul class="accordion">

app/index/view/pc/product/category.html

@@ -21,7 +21,7 @@
 			<div class="ori-pd-title">
 				<div class="catname">{$vo.name}</div>
 				<a class="catmore" href="{:url('product/subcategory', ['id' => $vo.id])}">
-					<span class="tmore">{:lang('product_newpro.view_all')}</span>
+					<span class="tmore">{:lang_i18n('查看全部')}</span>
 					<img src="__IMAGES__/more.png" class="catmoreImg" />
 				</a>
 			</div>

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

@@ -108,17 +108,17 @@
                     {volist name="product_purchase_links" id="ppp" key="k"}
                     <a class="thebt bttype{$k}" href="{$ppp.link}">{$ppp.platform_name}</a>
                     {/volist}
-                    <a class="thebt bttype3" id="open_form_modal">{:lang('product_detail.display_form')}</a>
+                    <a class="thebt bttype3" id="open_form_modal">{:lang_i18n('发送查询')}</a>
                 </div>
             </div>
         </div>
         <!-- 产品介绍详情-->
         <div class="oriprInfo">
             <div class="titleprinfo">
-                <a href="#detail" class="checkshow">{:lang('product_detail.detail_section_title')}</a>
+                <a href="#detail" class="checkshow">{:lang_i18n('产品详情')}</a>
                 {notempty name="product_related"}
                 <span>|</span>
-                <a href="#related">{:lang('product_detail.related_products')}</a>
+                <a href="#related">{:lang_i18n('相关产品')}</a>
                 {/notempty}
             </div>
             <!-- 富文本渲染-->
@@ -129,7 +129,7 @@
         <!-- 关联产品 -->
         {notempty name="product_related"}
         <div class="glcpmain" id="related">
-            <div class="glcptitle">{:lang('product_detail.related_products')}</div>
+            <div class="glcptitle">{:lang_i18n('相关产品')}</div>
             <div class="swiper-container glcpswiper">
                 <div class="swiper-wrapper">
                     {volist name="product_related" id="rel"}
@@ -152,21 +152,21 @@
         <div id="form_modal" class="XJmodal">
             <div class="XJmodal-content">
                 <span class="close">&times;</span>
-                <h2>{:lang('product_detail.display_form')}</h2>
+                <h2>{:lang_i18n('发送查询')}</h2>
                 <form action="" method="post" autocomplete="off">
                     <div class="tkitem">
                         <div class="form-group">
                             <label for="firstName">
-                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong> {:lang('product_detail.form_name')}</label>
+                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong> {:lang_i18n('姓名')}</label>
                             <div>
-                                <input type="text" name="first_name" id="firstName" placeholder="{:lang('product_detail.form_first_name_placeholder')}" class="detail-w">
-                                <input type="text" name="last_name" id="lastName" placeholder="{:lang('product_detail.form_last_name_placeholder')}" class="detail-w">
+                                <input type="text" name="first_name" id="firstName" placeholder="{:lang_i18n('请输入您的名')}" class="detail-w">
+                                <input type="text" name="last_name" id="lastName" placeholder="{:lang_i18n('请输入您的姓')}" class="detail-w">
                             </div>
                         </div>
                         <div class="form-group">
                             <label for="corp">
                                 <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
-                                {:lang('product_detail.form_corp')}
+                                {:lang_i18n('公司/组织')}
                             </label>
                             <input type="text" name="corp_name" id="corp" class="detail-w01">
                         </div>
@@ -174,15 +174,15 @@
                     <div class="tkitem">
                         <div class="form-group">
                             <label for="email">
-                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong> Email
-                                {:lang('product_detail.form_email')}
+                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
+                                {:lang_i18n('电子邮箱')}
                             </label>
                             <input type="text" name="email" id="email" class="detail-w01">
                         </div>
                         <div class="form-group">
                             <label for="phone">
-                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong> Phone
-                                {:lang('product_detail.form_phone')}
+                                <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
+                                {:lang_i18n('电话号码')}
                             </label>
                             <input type="text" name="phone" id="phone" class="detail-w01">
                         </div>
@@ -191,10 +191,10 @@
                         <div class="form-group">
                             <label for="country">
                                 <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
-                                {:lang('product_detail.form_country')}
+                                {:lang_i18n('国家')}
                             </label>
                             <select name="country_name" id="country">
-                                <option value="">{:lang('product_detail.form_country_placeholder')}</option>
+                                <option value="">{:lang_i18n('请选择所属国家')}</option>
                                 {volist name="country_list" id="country"}
                                 <option value="{$country}">{$country}</option>
                                 {/volist}
@@ -203,7 +203,7 @@
                         <div class="form-group">
                             <label for="industry">
                                 <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
-                                {:lang('product_detail.form_industry')}
+                                {:lang_i18n('行业')}
                             </label>
                             <input type="text" name="industry" id="industry" class="detail-w01">
                         </div>
@@ -212,12 +212,12 @@
                         <div class="form-group" style="width: 100%;margin-right: 0px;">
                             <label for="message">
                                 <strong style="color: red; margin-right: 0.3125rem;"> * </strong>
-                                {:lang('product_detail.form_inquiry')}
+                                {:lang_i18n('询问内容')}
                             </label>
                             <textarea name="message" id="message"></textarea>
                         </div>
                     </div>
-                    <button type="button" id="send" class="submit-btn">{:lang('product_detail.form_submit')}</button>
+                    <button type="button" id="send" class="submit-btn">{:lang_i18n('提交')}</button>
                 </form>
             </div>
         </div>

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

@@ -24,7 +24,7 @@
           <img src="__IMAGES__/bottomlogo.png" class="footerico" />
         </a>
         <div class="foootCt">
-          <p class="ftitle">{:lang('footer_navigation.product_categorys')}</p>
+          <p class="ftitle">{:lang_i18n('产品')}</p>
           <ul>
             {volist name="header_categorys" id="vo"}
             <li><a href="{:url('product/category', ['id' => $vo.id])}" class="fline">{$vo.name}</a></li>
@@ -46,7 +46,7 @@
         {/volist}
         {/if}
         <div class="foootCt">
-          <p class="ftitle">{:lang('footer_contact')}</p>
+          <p class="ftitle">{:lang_i18n('联系我们')}</p>
           {if condition="!empty($contact_config)"}
           <ul>
             {volist name="contact_config" id="vo"}

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

@@ -12,7 +12,7 @@
         <ul>
           {if condition="!empty($header_categorys)"}
           <li class="navItem">
-            <a href="javascript:void(0);">{:lang('header_navigation.product_categorys')}</a>
+            <a href="javascript:void(0);">{:lang_i18n('产品列表')}</a>
             <img src="__IMAGES__/black-down.png" class="downimg" />
             <ol class="navItemConten">
               <!-- 左边子菜单-->
@@ -88,7 +88,7 @@
       </div>
       {notempty name="basic_config['navigation_store_url']['value']"}
       <a class="storetopbt" href="{$basic_config['navigation_store_url']['value']}">
-        <img src="__IMAGES__/shopico.png" class="storeImgico" />{:lang('header_navigation.store')} 
+        <img src="__IMAGES__/shopico.png" class="storeImgico" />{:lang_i18n('店铺')} 
       </a>
       {/notempty}
     </div>
@@ -101,11 +101,11 @@
       <input type="text" name="keywords" id="serrchinput" autocomplete="off" />
       <!-- 历史记录 -->
       <div class="searchhistory">
-        <p class="h_title">{:lang('header_search.history')}</p>
+        <p class="h_title">{:lang_i18n('搜索记录')}</p>
         <ul></ul>
       </div>
       <div class="popProduct">
-        <p class="h_title">{:lang('header_search.hot_product')}</p>
+        <p class="h_title">{:lang_i18n('热销产品')}</p>
         <div class="popmain">
           {volist name="header_hot_products" id="vo"}
           <div class="popitem">

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

@@ -9,7 +9,7 @@
                     <img src="__IMAGES__/bottomlogo.png" class="footerico" />
                 </a>
                 <div class="foootCt">
-                    <p class="ftitle">{:lang('footer_navigation.product_categorys')}</p>
+                    <p class="ftitle">{:lang_i18n('产品')}</p>
                     <ul>
                         {volist name="header_categorys" id="vo"}
                         <li><a href="{:url('product/category', ['id' => $vo.id])}" class="fline">{$vo.name}</a></li>
@@ -31,7 +31,7 @@
                 {/volist}
                 {/if}
                 <div class="foootCt">
-                    <p class="ftitle">{:lang('footer_contact')}</p>
+                    <p class="ftitle">{:lang_i18n('联系我们')}</p>
                     {if condition="!empty($contact_config)"}
                     <ul>
                         {volist name="contact_config" id="vo"}

app/index/view/pc/topic_nas/cooperation.html

@@ -47,7 +47,7 @@
         <!-- 合作优势 -->
         {notempty name="cooperation_advantages"}
         <div class="narshzhb-hzys">
-            <h2 class="hzys-title">{:lang('topic_nas_cooperation.advantages_section_title')}</h2>
+            <h2 class="hzys-title">{:lang_i18n('合作优势')}</h2>
             <div class="narshzhb-hzys-main">
                 {volist name="cooperation_advantages" id="adv"}
                 <div class="narshzhb-hzys-it">
@@ -62,7 +62,7 @@
         <!-- 期待与您的合作 -->
         {notempty name="cooperation_cotacts"}
         <div class="narshzhb-qdhz">
-            <h2 class="hzys-title">{:lang('topic_nas_cooperation.contacts_section_title')}</h2>
+            <h2 class="hzys-title">{:lang_i18n('期待与您的合作')}</h2>
             {volist name="cooperation_cotacts" id="contacts" key="idx"}
             <div class="nars-qdhz-part">
                 {volist name="contacts" id="co"}

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

@@ -10,10 +10,10 @@
         <div class="narsDtabs">
             {egt name=":count($data)" value="2"}
             {notempty name="data.cyber"}
-            <div class="narsDtabIt narsDtabIt_active">{:lang('topic_nas_download.cyber_tab_title')}</div>
+            <div class="narsDtabIt narsDtabIt_active">{:lang_i18n('CyberData赛博云空间')}</div>
             {/notempty}
             {notempty name="data.weline"}
-            <div class="narsDtabIt">{:lang('topic_nas_download.weline_tab_title')}</div>
+            <div class="narsDtabIt">{:lang_i18n('Weline微链接')}</div>
             {/notempty}
             {/egt}
         </div>

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

@@ -10,7 +10,7 @@
         <div class="pagetopbg">
             <img src="__IMAGES__/nas_help_banner.jpg" class="hpbgimg" />
             <div class='nhlp-search'>
-                <input class="nhlp-ipt" id="search-input" placeholder="{:lang('topic_nas_help.search_input_placeholder')}" autocomplete="off" />
+                <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off" />
                 <img src="__IMAGES__/nas_help_search.png" class="searchimg" />
             </div>
             <!-- 下拉搜索框 -->
@@ -23,7 +23,7 @@
         <!-- 使用教程 -->
         {notempty name="article_categorys"}
         <div class="nhlppart1">
-            <h1 class="helph1">{:lang('topic_nas_help.article_section_title')}</h1>
+            <h1 class="helph1">{:lang_i18n('使用教程')}</h1>
             <div class="nhlp-row">
                 {volist name="article_categorys" id="vo" key="idx"}
                 <div class="nhlpit {gt name='idx' value='6'}nhlpit-w{/gt}">
@@ -40,7 +40,7 @@
                             </span>
                         </a>
                         {egt name="index" value="3"}
-                        <div class="ckgdbt">{:lang('topic_nas_help.view_more')} ></div>
+                        <a class="ckgdbt" href="{:url('/index/topic/nas/help_detail', ['id' => isset($vo.article[0])?$vo.article[0]['id']:0])}">{:lang_i18n('查看更多')} ></a>
                         {/egt}
                         {/volist}
                     </div>
@@ -52,7 +52,7 @@
         <!-- 联系我们 -->
         {notempty name="contacts"}
         <div class="nhlp-lxwm">
-            <h1 class="lxwmtitle">{:lang('topic_nas_help.contact_section_title')}</h1>
+            <h1 class="lxwmtitle">{:lang_i18n('联系我们')}</h1>
             <div class="nhlp-row">
               <div class="nhlp-row-content">
                 {volist name="contacts" id="co" key="idx" offset="0" length="3"}

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

@@ -18,9 +18,9 @@
     <div class="narshelpdetailPc">
         <!-- top 搜索-->
         <div class="narsssmain">
-            <div class="ml">{:lang('topic_nas_help.module_title')}/{:lang('topic_nas_help.article_section_title')}</div>
+            <div class="ml">{:lang_i18n('帮助中心')}/{:lang_i18n('使用教程')}</div>
             <div class="nars-hlp-search">
-                <input id="search-input" placeholder="{:lang('topic_nas_help.search_input_placeholder')}" autocomplete="off" />
+                <input id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off" />
                 <img src="__IMAGES__/nas_help_detail_search.png" class="ssimg">
             </div>
             <!-- 下拉搜索框 -->
@@ -53,7 +53,7 @@
             <!--锚点定位 -->
             <div class="nars-hlpdt-mr">
                 <div id="title-list">
-                    <h2 class="tt">{:lang('topic_nas_help.content')}</h2>
+                    <h2 class="tt">{:lang_i18n('目录')}</h2>
                     <ul></ul>
                 </div>
             </div>

app/index/view/pc/topic_nas/index.html

@@ -65,7 +65,7 @@
         <!--解決方案-->
         {notempty name="nas_solution"}
         <div class="nars-jjfa">
-            <span class="jjfa-title">{:lang('topic_nas_index.solution_section_title')}</span>
+            <span class="jjfa-title"><span style="color:#004BFA;">ORICO</span> {:lang_i18n('网络存储解决方案')}</span>
             <div class="swiper jjfaSwiper">
                 <div class="swiper-wrapper">
                     {volist name="nas_solution" id="so"}
@@ -88,7 +88,7 @@
         <!--微链接 -->
         {notempty name="nas_software"}
         <div class="nars-wlj">
-            <span class="wlj-title">{:lang('topic_nas_index.software_section_title')}</span>
+            <span class="wlj-title"><span style="color:#004BFA">NAS</span> {:lang_i18n('配套软件')}</span>
             {volist name="nas_software" id="soft" offset="0" length="3"}
             <a class="wltitem" {notempty name="soft.link"}href="{$soft.link}"{/notempty}>
                 <div class="wljcp">

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",

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;
+}

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";
+}

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

@@ -15,6 +15,7 @@
   width: 100%;
   height: auto;
   position: relative;
+  margin-top: 60px;
 }
 .orico_Page_index .pageMain .bannerswiper .swiper-slide img {
   width: 100%;
@@ -789,7 +790,8 @@
   align-items: center;
   flex-direction: row;
   display: flex;
-  margin: 0 auto;
+  margin: 0 10%;
+  justify-content: space-between;
 }
 .orico_Page_index .pageMain .oricoDataStatistics .odsmain .odsItem {
   color: #fff;

public/static/index/pc/css/product_subcategory.css

@@ -77,6 +77,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
+  text-align: center;
   width: 80%;
 }
 .orico_Page_subcategory .pageMain .ori-pd-list .oripditem .prddec {