jsasg/orico-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

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

Browse Source
This commit is contained in:
迷和油
2025-06-21 15:21:59 +08:00
parent 9f8496b3a8 610a492d5a
commit 42687fc12b
9 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/index/common.php
View File

@@ -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();

3
app/index/controller/ContactUs.php
View File

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

1
app/index/lang/en-us/validate.php
View File

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

3
app/index/validate/ContactUsBulkBuyValidate.php
View File

@@ -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个字符',

3
app/index/validate/ContactUsDistributorValidate.php
View File

@@ -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' => '企业规模不能为空',

2
app/index/view/mobile/article/index.html
View File

@@ -45,7 +45,7 @@
<h3>{$ar.title}</h3>
<p>{$ar.desc|raw}</p>
</a>
<span class="blue">{$ar.release_time|default=''|date='Y-m-d'}</span>
<span class="blue">{$ar.release_time|date_format_i18n}</span>
</li>
{/volist}
</ul>

12
app/index/view/mobile/contact_us/distributor.html
View File

@@ -19,19 +19,19 @@
<div class="theit">
<div class="bditem">
<label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
<input type="text" class="form-control itinp companyName" placeholder="{:lang_i18n('请输入公司名称')}" />
<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_i18n('电子邮件')}<span class="redtag">*</span></label>
<input type="text" class="form-control itinp email" placeholder="{:lang_i18n('请输入邮箱')}" />
<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_i18n('电话号码')}<span class="redtag">*</span></label>
<input type="text" class="form-control itinp mphone" placeholder="{:lang_i18n('请输入电话号码')}" />
<input type="text" name="phone" class="form-control itinp mphone" placeholder="{:lang_i18n('请输入电话号码')}" />
</div>
</div>
<div class="theit">
@@ -47,7 +47,7 @@
<div class="theit">
<div class="bditem">
<label class="itlable">{:lang_i18n('在线商店网址')}</label>
<input type="text" class="form-control itinp url" placeholder="{:lang_i18n('请输入网址')}" />
<input type="text" name="website_url" class="form-control itinp url" placeholder="{:lang_i18n('请输入网址')}" />
</div>
</div>
<div class="theit">
@@ -63,13 +63,13 @@
<div class="theit">
<div class="bditem bditem1">
<label class="itlable">{:lang_i18n('公司地址')}<span class="redtag">*</span></label>
<input type="text" class="form-control itinp address" placeholder="{:lang_i18n('请输入地址')}">
<input type="text" name="address" class="form-control itinp address" placeholder="{:lang_i18n('请输入地址')}">
</div>
</div>
<div class="theit">
<div class="bditem bditem1">
<label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
<textarea class="ittextarea message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
<textarea name="message" class="ittextarea message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
</div>
</div>
</div>

2
app/index/view/mobile/product/search.html
View File

@@ -16,7 +16,7 @@
{notempty name="products"}
<div class="prlist">
{volist name="products" id="pro"}
<a class="pritem">
<a class="pritem" href="{:url('product/detail',['id'=>$pro.id])}">
<img src="{$pro.cover_image}" class="primg"/>
<div class="prinfo">
<span class="t1">{$pro.name|raw}</span>

2
app/index/view/pc/contact_us/distributor.html
View File

@@ -46,7 +46,7 @@
</div>
<div class="bditem">
<label class="itlable">{:lang_i18n('在线商店网址')}</label>
<input type="text" class="form-control itinp" name="url" placeholder="{:lang_i18n('请输入网址')}" />
<input type="text" class="form-control itinp" name="website_url" placeholder="{:lang_i18n('请输入网址')}" />
</div>
</div>
<div class="theit">