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:
liangjiami
2025-06-27 18:04:03 +08:00
parent 487442a25e 61bf02b031
commit 642b813a18
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/index/config/lang.php
View File

@@ -19,7 +19,7 @@ return [
// 扩展语言包 // 扩展语言包
'extend_list' => [ 'extend_list' => [
'en-us' => [ 'en-us' => [
app()->getAppPath() . '/lang/en-us/' . (request()->isMobile() ? 'mobile' : 'pc') . '.php', app()->getAppPath() . '/lang/en-us/' . get_platform() . '.php',
app()->getAppPath() . '/lang/en-us/validate.php', app()->getAppPath() . '/lang/en-us/validate.php',
], ],
], ],

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

@@ -223,7 +223,7 @@ class Product extends Common
foreach ($skus as $v) { foreach ($skus as $v) {
// 找到相应产品的sku图片信息 // 找到相应产品的sku图片信息
$skus_map[$v['product_id']][] = [ $skus_map[$v['product_id']][] = [
'id' => $v['id'], 'id' => $v['id'],
'sku' => $v['sku'], 'sku' => $v['sku'],
'main_image' => $v['main_image'], 'main_image' => $v['main_image'],
]; ];
@@ -231,7 +231,7 @@ class Product extends Common
$attr = $sku_attrs_map[$v['id']]?? []; $attr = $sku_attrs_map[$v['id']]?? [];
if (!empty($attr)) { if (!empty($attr)) {
foreach ($attr as $at) { foreach ($attr as $at) {
if ($at['attr_name'] == '颜色') { if (in_array($at['attr_name'], ['颜色', 'Color'])) {
$color_map[$v['product_id']][] = $at; $color_map[$v['product_id']][] = $at;
} }
} }
@@ -377,8 +377,8 @@ class Product extends Common
$v['attr_name'] = $attrs[$v['attr_id']]?? ''; $v['attr_name'] = $attrs[$v['attr_id']]?? '';
// 按属性分组 // 按属性分组
$product_sku_attrs[$v['attr_id']]['attr_id'] = $v['attr_id']; $product_sku_attrs[$v['attr_id']]['attr_id'] = $v['attr_id'];
$product_sku_attrs[$v['attr_id']]['attr_name'] = $v['attr_name']; $product_sku_attrs[$v['attr_id']]['attr_name'] = $v['attr_name'];
$product_sku_attrs[$v['attr_id']]['attr_values'][] = [ $product_sku_attrs[$v['attr_id']]['attr_values'][] = [
'sku_id' => $v['sku_id'], 'sku_id' => $v['sku_id'],
'attr_value' => $v['attr_value'], 'attr_value' => $v['attr_value'],

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

@@ -1,6 +1,7 @@
<?php <?php
return [ return [
'首页' => 'Home',
'产品列表' => 'Products', '产品列表' => 'Products',
'店铺' => 'Store', '店铺' => 'Store',
'搜索记录' => 'Search History', '搜索记录' => 'Search History',

1
app/index/view/pc/article/index.html
View File

@@ -23,6 +23,7 @@
<div class="categorySearch"> <div class="categorySearch">
<form action="{:url('article/index', ['pid' => $Request.param.pid])}" method="get"> <form action="{:url('article/index', ['pid' => $Request.param.pid])}" method="get">
<i class="search_icon"></i> <i class="search_icon"></i>
<input type="hidden" name="cid" value="{$Request.param.cid}" />
<input type="text" class="search" id="article-search-in" name="keywords" value=""> <input type="text" class="search" id="article-search-in" name="keywords" value="">
</form> </form>
</div> </div>