From 352160d13c3e7357ada5d57c130553f191673ce0 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Fri, 30 May 2025 13:36:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/lang/en-us/validate.php | 56 +++++++++---------- .../validate/ContactUsBulkBuyValidate.php | 16 +++--- .../validate/ContactUsDistributorValidate.php | 12 ++-- .../validate/ContactUsMessageValidate.php | 6 +- app/index/validate/ProductInquiryValidate.php | 16 +++--- app/index/view/mobile/product/detail.html | 12 ++-- 6 files changed, 58 insertions(+), 60 deletions(-) diff --git a/app/index/lang/en-us/validate.php b/app/index/lang/en-us/validate.php index 2a47a3a4..fdd0ffca 100644 --- a/app/index/lang/en-us/validate.php +++ b/app/index/lang/en-us/validate.php @@ -1,39 +1,37 @@ 'Company Name is required', - '公司名称不能超过64个字符' => 'Company Name cannot exceed 64 characters', + '姓不能为空' => 'Last name is required', + '姓不能超过:rule个字符' => 'Last name cannot exceed :rule characters', + '名不能为空' => 'First Name is required', + '名不能超过:rule个字符' => 'First name cannot exceed :rule characters', + '姓名不能为空' => 'Name is required', + '姓名不能超过:rule个字符' => 'Name cannot exceed :rule characters', + '电话号码不能为空' => 'Phone Number is required', + '电话号码不能超过:rule个字符' => 'Phone number cannot exceed :rule characters', + '感兴趣的产品种类不能超过:rule个字符' => 'Interested product categories cannot exceed :rule characters', '邮箱不能为空' => 'Email is required', '邮箱格式不正确' => 'Email format is incorrect', - '邮箱不能超过128个字符' => 'Email cannot exceed 128 characters', - '电话号码不能为空' => 'Phone Number is required', - '电话号码不能超过64个字符' => 'Phone Number cannot exceed 64 characters', - '业务类型不能为空' => 'Type of Business is required', - '业务类型不能超过128个字符' => 'Type of Business cannot exceed 128 characters', - '企业规模不能为空' => 'Enterprise Size is required', - '企业规模不能超过128个字符' => 'Enterprise Size cannot exceed 128 characters', - '公司地址不能为空' => 'Company Address is required', - '公司地址不能超过255个字符' => 'Company Address cannot exceed 255 characters', - '留言不能为空' => 'Message is required', - '公司名称不能超过128个字符' => 'Company name cannot exceed 128 characters', - '网址不能超过255个字符' => 'URL cannot exceed 255 characters', - '名不能为空' => 'First Name is required', - '名不能超过64个字符' => 'First name cannot exceed 64 characters', - '姓不能为空' => 'Last name is required', - '姓不能超过64个字符' => 'Last name cannot exceed 64 characters', - '电话号码不能超过32个字符' => 'Phone number cannot exceed 32 characters', - '感兴趣的产品种类不能超过255个字符' => 'Interested product categories cannot exceed 255 characters', - '留言内容不能为空' => 'Message content is required', - '留言内容不能超过1024个字符' => 'Message content cannot exceed 1024 characters', - '姓名不能为空' => 'Name is required', - '问题不能为空' => 'Question is required', - '问题不能超过1024个字符' => 'Question cannot exceed 1024 characters', + '邮箱不能超过:rule个字符' => 'Email cannot exceed :rule characters', '国家不能为空' => 'Country is required', - '国家不能超过128个字符' => 'Country cannot exceed 128 characters', + '国家不能超过:rule个字符' => 'Country cannot exceed :rule characters', + '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters', + '公司名称不能为空' => 'Company Name is required', + '公司名称不能超过:rule个字符' => 'Company name cannot exceed :rule characters', + '公司地址不能为空' => 'Company Address is required', + '公司地址不能超过:rule个字符' => 'Company Address cannot exceed :rule characters', + '企业规模不能为空' => 'Enterprise Size is required', + '企业规模不能超过:rule个字符' => 'Enterprise Size cannot exceed :rule characters', + '业务类型不能为空' => 'Type of Business is required', + '业务类型不能超过:rule个字符' => 'Type of Business cannot exceed :rule characters', '公司/组织不能为空' => 'Company/Organization is required', - '公司/组织不能超过128个字符' => 'Company/Organization cannot exceed 128 characters', + '公司/组织不能超过:rule个字符' => 'Company/Organization cannot exceed :rule characters', '行业不能为空' => 'Industry is required', - '行业不能超过64个字符' => 'Industry cannot exceed 64 characters', + '行业不能超过:rule个字符' => 'Industry cannot exceed :rule characters', '询问内容不能为空' => 'Inquiry is required', - '询问内容不能超过1024个字符' => 'Inquiry cannot exceed 1024 characters', + '询问内容不能超过:rule个字符' => 'Inquiry cannot exceed :rule characters', + '留言内容不能为空' => 'Message content is required', + '留言内容不能超过:rule个字符' => 'Message content cannot exceed :rule characters', + '问题不能为空' => 'Question is required', + '问题不能超过:rule个字符' => 'Question cannot exceed :rule characters', ]; \ No newline at end of file diff --git a/app/index/validate/ContactUsBulkBuyValidate.php b/app/index/validate/ContactUsBulkBuyValidate.php index 00cb549b..e3517abc 100644 --- a/app/index/validate/ContactUsBulkBuyValidate.php +++ b/app/index/validate/ContactUsBulkBuyValidate.php @@ -32,18 +32,18 @@ class ContactUsBulkBuyValidate extends Validate */ protected $message = [ 'corp_name.require' => '公司名称不能为空', - 'corp_name.max' => '公司名称不能超过128个字符', - 'url.max' => '网址不能超过255个字符', + 'corp_name.max' => '公司名称不能超过:rule个字符', + 'url.max' => '网址不能超过:rule个字符', 'first_name.require' => '名不能为空', - 'first_name.max' => '名不能超过64个字符', + 'first_name.max' => '名不能超过:rule个字符', 'last_name.require' => '姓不能为空', - 'last_name.max' => '姓不能超过64个字符', + 'last_name.max' => '姓不能超过:rule个字符', 'email.require' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', - 'email.max' => '邮箱不能超过128个字符', - 'phone.max' => '电话号码不能超过32个字符', - 'interested.max' => '感兴趣的产品种类不能超过255个字符', + 'email.max' => '邮箱不能超过:rule个字符', + 'phone.max' => '电话号码不能超过:rule个字符', + 'interested.max' => '感兴趣的产品种类不能超过:rule个字符', 'message.require' => '留言内容不能为空', - 'message.max' => '留言内容不能超过1024个字符', + 'message.max' => '留言内容不能超过:rule个字符', ]; } diff --git a/app/index/validate/ContactUsDistributorValidate.php b/app/index/validate/ContactUsDistributorValidate.php index 67ab1900..5ad6a68a 100644 --- a/app/index/validate/ContactUsDistributorValidate.php +++ b/app/index/validate/ContactUsDistributorValidate.php @@ -31,18 +31,18 @@ class ContactUsDistributorValidate extends Validate */ protected $message = [ 'corp_name.require' => '公司名称不能为空', - 'corp_name.max' => '公司名称不能超过64个字符', + 'corp_name.max' => '公司名称不能超过:rule个字符', 'email.require' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', - 'email.max' => '邮箱不能超过128个字符', + 'email.max' => '邮箱不能超过:rule个字符', 'phone.require' => '电话号码不能为空', - 'phone.max' => '电话号码不能超过64个字符', + 'phone.max' => '电话号码不能超过:rule个字符', 'business_type.require' => '业务类型不能为空', - 'business_type.max' => '业务类型不能超过128个字符', + 'business_type.max' => '业务类型不能超过:rule个字符', 'enterprise_size.require' => '企业规模不能为空', - 'enterprise_size.max' => '企业规模不能超过128个字符', + 'enterprise_size.max' => '企业规模不能超过:rule个字符', 'address.require' => '公司地址不能为空', - 'address.max' => '公司地址不能超过255个字符', + 'address.max' => '公司地址不能超过:rule个字符', 'message.require' => '留言不能为空', ]; } diff --git a/app/index/validate/ContactUsMessageValidate.php b/app/index/validate/ContactUsMessageValidate.php index 738f6d8d..c1dc2414 100644 --- a/app/index/validate/ContactUsMessageValidate.php +++ b/app/index/validate/ContactUsMessageValidate.php @@ -27,11 +27,11 @@ class ContactUsMessageValidate extends Validate */ protected $message = [ 'name.require' => '姓名不能为空', - 'name.max' => '姓名不能超过64个字符', + 'name.max' => '姓名不能超过:rule个字符', 'email.require' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', - 'email.max' => '邮箱不能超过128个字符', + 'email.max' => '邮箱不能超过:rule个字符', 'content.require' => '问题不能为空', - 'content.max' => '问题不能超过1024个字符' + 'content.max' => '问题不能超过:rule个字符' ]; } diff --git a/app/index/validate/ProductInquiryValidate.php b/app/index/validate/ProductInquiryValidate.php index c696fea9..a9629a96 100644 --- a/app/index/validate/ProductInquiryValidate.php +++ b/app/index/validate/ProductInquiryValidate.php @@ -32,20 +32,20 @@ class ProductInquiryValidate extends Validate */ protected $message = [ 'first_name.require' => '名不能为空', - 'first_name.max' => '名不能超过64个字符', + 'first_name.max' => '名不能超过:rule个字符', 'last_name.require' => '姓不能为空', - 'last_name.max' => '姓不能超过64个字符', + 'last_name.max' => '姓不能超过:rule个字符', 'email.require' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', - 'email.max' => '邮箱不能超过128个字符', - 'phone.max' => '电话号码不能超过32个字符', + 'email.max' => '邮箱不能超过:rule个字符', + 'phone.max' => '电话号码不能超过:rule个字符', 'country_name.require' => '国家不能为空', - 'country_name.max' => '国家不能超过128个字符', + 'country_name.max' => '国家不能超过:rule个字符', 'corp_name.require' => '公司/组织不能为空', - 'corp_name.max' => '公司/组织不能超过128个字符', + 'corp_name.max' => '公司/组织不能超过:rule个字符', 'industry.require' => '行业不能为空', - 'industry.max' => '行业不能超过64个字符', + 'industry.max' => '行业不能超过:rule个字符', 'message.require' => '询问内容不能为空', - 'message.max' => '询问内容不能超过1024个字符' + 'message.max' => '询问内容不能超过:rule个字符' ]; } diff --git a/app/index/view/mobile/product/detail.html b/app/index/view/mobile/product/detail.html index 8dd0c949..049131d8 100644 --- a/app/index/view/mobile/product/detail.html +++ b/app/index/view/mobile/product/detail.html @@ -60,7 +60,7 @@
  • {eq name="attr_value_type" value="IMAGE"} - {elseif condition="attr_value_type == 'RGB'" /} + {elseif condition="$attr_value_type == 'RGB'" /} $pv.attr_value])}> {else/} {$pv.attr_value} @@ -130,15 +130,15 @@

    *{:lang_i18n('姓名')}

    + name="first_name" id="firstname" style="margin-right:0.5rem;"> + name="last_name" id="lastname">

    *{:lang_i18n('公司/组织')}

    - +
    @@ -156,7 +156,7 @@

    *{:lang_i18n('国家')}

    - {volist name="country_list" id="country"} @@ -173,7 +173,7 @@

    *{:lang_i18n('询问内容')}

    - +
    {:lang_i18n('提交')}