Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev
This commit is contained in:
@@ -19,7 +19,7 @@ return [
|
||||
// 扩展语言包
|
||||
'extend_list' => [
|
||||
'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',
|
||||
],
|
||||
],
|
||||
|
||||
@@ -223,7 +223,7 @@ class Product extends Common
|
||||
foreach ($skus as $v) {
|
||||
// 找到相应产品的sku图片信息
|
||||
$skus_map[$v['product_id']][] = [
|
||||
'id' => $v['id'],
|
||||
'id' => $v['id'],
|
||||
'sku' => $v['sku'],
|
||||
'main_image' => $v['main_image'],
|
||||
];
|
||||
@@ -231,7 +231,7 @@ class Product extends Common
|
||||
$attr = $sku_attrs_map[$v['id']]?? [];
|
||||
if (!empty($attr)) {
|
||||
foreach ($attr as $at) {
|
||||
if ($at['attr_name'] == '颜色') {
|
||||
if (in_array($at['attr_name'], ['颜色', 'Color'])) {
|
||||
$color_map[$v['product_id']][] = $at;
|
||||
}
|
||||
}
|
||||
@@ -377,8 +377,8 @@ class Product extends Common
|
||||
|
||||
$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_name'] = $v['attr_name'];
|
||||
$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_values'][] = [
|
||||
'sku_id' => $v['sku_id'],
|
||||
'attr_value' => $v['attr_value'],
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'首页' => 'Home',
|
||||
'产品列表' => 'Products',
|
||||
'店铺' => 'Store',
|
||||
'搜索记录' => 'Search History',
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<div class="categorySearch">
|
||||
<form action="{:url('article/index', ['pid' => $Request.param.pid])}" method="get">
|
||||
<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="">
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user