From 5e07e733c5a6041c30e0da55d876403d01a47e64 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Fri, 27 Jun 2025 17:10:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20ipd=E8=AE=BF=E9=97=AE=E6=97=B6lang?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/config/lang.php | 2 +- app/index/lang/en-us/pc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/index/config/lang.php b/app/index/config/lang.php index 980ab80c..8944bc1a 100644 --- a/app/index/config/lang.php +++ b/app/index/config/lang.php @@ -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', ], ], diff --git a/app/index/lang/en-us/pc.php b/app/index/lang/en-us/pc.php index c895e7e9..3572f170 100644 --- a/app/index/lang/en-us/pc.php +++ b/app/index/lang/en-us/pc.php @@ -1,6 +1,7 @@ 'Home', '产品列表' => 'Products', '店铺' => 'Store', '搜索记录' => 'Search History', From 8a447b52e36791888afdff9fd41533062bf6b70a Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Fri, 27 Jun 2025 17:17:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20pc=20=E6=96=87=E7=AB=A0=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/view/pc/article/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/index/view/pc/article/index.html b/app/index/view/pc/article/index.html index 916810d5..e428d598 100644 --- a/app/index/view/pc/article/index.html +++ b/app/index/view/pc/article/index.html @@ -23,6 +23,7 @@
+
From 182c2a10aad48d2cd64a04016df181efe83df0ed Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Fri, 27 Jun 2025 17:30:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/Product.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/index/controller/Product.php b/app/index/controller/Product.php index c6e89b20..74510312 100644 --- a/app/index/controller/Product.php +++ b/app/index/controller/Product.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'],