From 72565683c8e774da5900569fd6afeea7c157e424 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 21 Jun 2025 10:15:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20mobile=20=E4=BA=A7=E5=93=81=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=A1=B5=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/view/mobile/product/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index/view/mobile/product/search.html b/app/index/view/mobile/product/search.html index 2fd24f87..5d3822bd 100644 --- a/app/index/view/mobile/product/search.html +++ b/app/index/view/mobile/product/search.html @@ -16,7 +16,7 @@ {notempty name="products"}
{volist name="products" id="pro"} - +
{$pro.name|raw} From 1873e6ac3ac56c69b34430e0b14ccdfc3d9fa216 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 21 Jun 2025 10:21:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20mobile=20=E6=96=87=E7=AB=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/common.php | 2 +- app/index/view/mobile/article/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/index/common.php b/app/index/common.php index 226b3689..6bc89d59 100644 --- a/app/index/common.php +++ b/app/index/common.php @@ -120,7 +120,7 @@ if (!function_exists('date_format_i18n')) { * @param bool $keep_time 是否保留时间 * @return string */ - function date_format_i18n(int|string $datetime, string $lang = '', bool $keep_time = false): string + function date_format_i18n(int|string|null $datetime, string $lang = '', bool $keep_time = false): string { // 处理语言标识，若未提供则使用当前语言设置，并转换为小写 $lang = $lang ?: Lang::getLangSet(); diff --git a/app/index/view/mobile/article/index.html b/app/index/view/mobile/article/index.html index 676293f2..319c3eb4 100644 --- a/app/index/view/mobile/article/index.html +++ b/app/index/view/mobile/article/index.html @@ -45,7 +45,7 @@

{$ar.title}

{$ar.desc|raw}

 - {$ar.release_time|default=''|date='Y-m-d'} + {$ar.release_time|date_format_i18n} {/volist} From 64d9b2129d13b190d3e06b450c7abf19ee653f27 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 21 Jun 2025 14:05:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20pc/mobile=20=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E7=95=99=E8=A8=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/ContactUs.php | 3 ++- app/index/lang/en-us/validate.php | 2 ++ app/index/validate/ContactUsDistributorValidate.php | 3 +++ app/index/view/mobile/contact_us/distributor.html | 12 ++++++------ app/index/view/pc/contact_us/distributor.html | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/index/controller/ContactUs.php b/app/index/controller/ContactUs.php index c214a79d..5f8b474b 100644 --- a/app/index/controller/ContactUs.php +++ b/app/index/controller/ContactUs.php @@ -136,6 +136,7 @@ class ContactUs extends Common 'corp_name', 'email', 'phone', + 'website_url', 'business_type', 'enterprise_size', 'address', @@ -155,7 +156,7 @@ class ContactUs extends Common 'email' => $form_data['email'], 'phone' => $form_data['phone'], 'referer_url' => request()->header('referer'), - 'website_url' => request()->header('host'), + 'website_url' => $form_data['website_url'], 'business_type' => $form_data['business_type'], 'enterprise_size' => $form_data['enterprise_size'], 'address' => $form_data['address'], diff --git a/app/index/lang/en-us/validate.php b/app/index/lang/en-us/validate.php index fdd0ffca..39fd50ef 100644 --- a/app/index/lang/en-us/validate.php +++ b/app/index/lang/en-us/validate.php @@ -22,6 +22,8 @@ return [ '公司地址不能超过:rule个字符' => 'Company Address cannot exceed :rule characters', '企业规模不能为空' => 'Enterprise Size is required', '企业规模不能超过:rule个字符' => 'Enterprise Size cannot exceed :rule characters', + '网址格式不正确' => 'URL format is incorrect', + '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters', '业务类型不能为空' => 'Type of Business is required', '业务类型不能超过:rule个字符' => 'Type of Business cannot exceed :rule characters', '公司/组织不能为空' => 'Company/Organization is required', diff --git a/app/index/validate/ContactUsDistributorValidate.php b/app/index/validate/ContactUsDistributorValidate.php index 5ad6a68a..86b1285d 100644 --- a/app/index/validate/ContactUsDistributorValidate.php +++ b/app/index/validate/ContactUsDistributorValidate.php @@ -17,6 +17,7 @@ class ContactUsDistributorValidate extends Validate 'corp_name' => 'require|max:64', 'email' => 'require|email|max:128', 'phone' => 'require|max:64', + 'website_url' => 'url|max:255', 'business_type' => 'require|max:128', 'enterprise_size' => 'require|max:128', 'address' => 'require|max:255', @@ -37,6 +38,8 @@ class ContactUsDistributorValidate extends Validate 'email.max' => '邮箱不能超过:rule个字符', 'phone.require' => '电话号码不能为空', 'phone.max' => '电话号码不能超过:rule个字符', + 'website_url.url' => '网址格式不正确', + 'website_url.max' => '网址不能超过:rule个字符', 'business_type.require' => '业务类型不能为空', 'business_type.max' => '业务类型不能超过:rule个字符', 'enterprise_size.require' => '企业规模不能为空', diff --git a/app/index/view/mobile/contact_us/distributor.html b/app/index/view/mobile/contact_us/distributor.html index 427f653d..676b8bc6 100644 --- a/app/index/view/mobile/contact_us/distributor.html +++ b/app/index/view/mobile/contact_us/distributor.html @@ -19,19 +19,19 @@
- +
- +
- +
@@ -47,7 +47,7 @@
- +
@@ -63,13 +63,13 @@
- +
- +
diff --git a/app/index/view/pc/contact_us/distributor.html b/app/index/view/pc/contact_us/distributor.html index d735dab0..d4668f85 100644 --- a/app/index/view/pc/contact_us/distributor.html +++ b/app/index/view/pc/contact_us/distributor.html @@ -46,7 +46,7 @@
- +
From d98c26e562a39b85d1c8a4c7f176aa440a358b85 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Sat, 21 Jun 2025 14:12:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20pc/mobile=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=A4=9F=E4=B9=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/lang/en-us/validate.php | 3 +-- app/index/validate/ContactUsBulkBuyValidate.php | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/index/lang/en-us/validate.php b/app/index/lang/en-us/validate.php index 39fd50ef..8715e4de 100644 --- a/app/index/lang/en-us/validate.php +++ b/app/index/lang/en-us/validate.php @@ -15,6 +15,7 @@ return [ '邮箱不能超过:rule个字符' => 'Email cannot exceed :rule characters', '国家不能为空' => 'Country is required', '国家不能超过:rule个字符' => 'Country cannot exceed :rule characters', + '网址格式不正确' => 'URL format is incorrect', '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters', '公司名称不能为空' => 'Company Name is required', '公司名称不能超过:rule个字符' => 'Company name cannot exceed :rule characters', @@ -22,8 +23,6 @@ return [ '公司地址不能超过:rule个字符' => 'Company Address cannot exceed :rule characters', '企业规模不能为空' => 'Enterprise Size is required', '企业规模不能超过:rule个字符' => 'Enterprise Size cannot exceed :rule characters', - '网址格式不正确' => 'URL format is incorrect', - '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters', '业务类型不能为空' => 'Type of Business is required', '业务类型不能超过:rule个字符' => 'Type of Business cannot exceed :rule characters', '公司/组织不能为空' => 'Company/Organization is required', diff --git a/app/index/validate/ContactUsBulkBuyValidate.php b/app/index/validate/ContactUsBulkBuyValidate.php index e3517abc..ffaa81b8 100644 --- a/app/index/validate/ContactUsBulkBuyValidate.php +++ b/app/index/validate/ContactUsBulkBuyValidate.php @@ -15,7 +15,7 @@ class ContactUsBulkBuyValidate extends Validate */ protected $rule = [ 'corp_name' => 'require|max:128', - 'url' => 'max:255', + 'url' => 'url|max:255', 'first_name' => 'require|max:64', 'last_name' => 'require|max:64', 'email' => 'require|email|max:128', @@ -33,6 +33,7 @@ class ContactUsBulkBuyValidate extends Validate protected $message = [ 'corp_name.require' => '公司名称不能为空', 'corp_name.max' => '公司名称不能超过:rule个字符', + 'url.url' => '网址格式不正确', 'url.max' => '网址不能超过:rule个字符', 'first_name.require' => '名不能为空', 'first_name.max' => '名不能超过:rule个字符',