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

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

Browse Source
This commit is contained in:
liangjiami
2025-07-14 15:13:12 +08:00
parent 4111e05957 082ed00d74
commit 7daaf12908
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/validate/v1/VideoValidate.php
View File

@@ -18,7 +18,7 @@ class VideoValidate extends Validate
'language_id' => 'require|integer', 'language_id' => 'require|integer',
'category_id' => 'require|integer', 'category_id' => 'require|integer',
'name' => 'require|max:64', 'name' => 'require|max:64',
'desc' => 'max:255', 'desc' => 'max:512',
'image' => 'max:125', 'image' => 'max:125',
'video' => 'max:125', 'video' => 'max:125',
'link' => 'url|max:125', 'link' => 'url|max:125',
@@ -44,7 +44,7 @@ class VideoValidate extends Validate
'category_id.integer' => '分类参数类型错误', 'category_id.integer' => '分类参数类型错误',
'name.require' => '名称不能为空', 'name.require' => '名称不能为空',
'name.max' => '名称不能超过64个字符', 'name.max' => '名称不能超过64个字符',
'desc.max' => '描述不能超过255个字符', 'desc.max' => '描述不能超过512个字符',
'image.max' => '图片不能超过125个字符', 'image.max' => '图片不能超过125个字符',
'video.max' => '视频不能超过125个字符', 'video.max' => '视频不能超过125个字符',
'link.url' => '链接格式错误', 'link.url' => '链接格式错误',

10
app/command/DataMigration.php
View File

@@ -60,10 +60,10 @@ class DataMigration extends Command
// $this->migrateProductPurchaseLinks(); // $this->migrateProductPurchaseLinks();
// 迁移文章 // 迁移文章
$this->migrateArticle([ // $this->migrateArticle([
16 => 7, // 16 => 7,
31 => 9, // 31 => 9,
32 => 8, // 32 => 8,
// 68 => 10, // 68 => 10,
// 69 => 11, // 69 => 11,
// 70 => 12, // 70 => 12,
@@ -80,7 +80,7 @@ class DataMigration extends Command
// 83 => 24, // 83 => 24,
// 84 => 25, // 84 => 25,
// 85 => 26 // 85 => 26
]); // ]);
// 迁移faq // 迁移faq
// $this->migrateFaq(); // $this->migrateFaq();

5
app/index/controller/Product.php
View File

@@ -396,8 +396,11 @@ class Product extends Common
->order(['sort' => 'asc', 'id' => 'desc']) ->order(['sort' => 'asc', 'id' => 'desc'])
->select() ->select()
->hidden(['platform']) ->hidden(['platform'])
->bindAttr('platform', ['platform_name' => 'platform']) ->bindAttr('platform', ['platform_name' => 'platform', 'platform_sort' => 'sort'])
->toArray(); ->toArray();
// 根据购买链接平台排序
$sort_by_arr = array_column($product_purchase_links, 'platform_sort');
array_multisort($sort_by_arr, SORT_ASC, $product_purchase_links);
// 获取相关产品信息 // 获取相关产品信息
$related = ProductRelatedModel::with(['product' => function($query) { $related = ProductRelatedModel::with(['product' => function($query) {

4
app/index/view/pc/public/header.html
View File

@@ -92,7 +92,7 @@
</div> </div>
{eq name=":cookie('think_lang')" value="en-us"} {eq name=":cookie('think_lang')" value="en-us"}
{notempty name="basic_config['navigation_store_url']['value']"} {notempty name="basic_config['navigation_store_url']['value']"}
<a class="storetopbt" href="{$basic_config['navigation_store_url']['value']}"> <a class="storetopbt" href="{$basic_config['navigation_store_url']['value']}" target="_blank">
<img src="__IMAGES__/shopico.png" class="storeImgico" />{:lang_i18n('店铺')} <img src="__IMAGES__/shopico.png" class="storeImgico" />{:lang_i18n('店铺')}
</a> </a>
{/notempty} {/notempty}
@@ -115,7 +115,7 @@
<div class="popmain"> <div class="popmain">
{volist name="header_hot_products" id="vo"} {volist name="header_hot_products" id="vo"}
<div class="popitem"> <div class="popitem">
<a href="{:url('product/detail', ['id' => $vo.id])}"><img src="{$vo.cover_image}" class="popimg" /></a> <a href="{:url('product/detail', ['id' => $vo.id])}"><img src="{:thumb($vo.cover_image)}" class="popimg" /></a>
<div class="productName">{$vo.name}</div> <div class="productName">{$vo.name}</div>
<div class="produc-dec">{$vo.short_name}</div> <div class="produc-dec">{$vo.short_name}</div>
</div> </div>