From 9b40f0792d7b23e2e53fdb36418a17a0a1761807 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Thu, 15 May 2025 18:07:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BA=A7=E5=93=81=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/controller/Product.php | 97 +++++++++++++++- app/index/view/product/category.bak.html | 71 ++++++++++++ app/index/view/product/category.html | 105 ++++++------------ app/index/view/product/product_category.html | 59 ---------- ...duct_subcategory.html => subcategory.html} | 1 + 5 files changed, 200 insertions(+), 133 deletions(-) create mode 100644 app/index/view/product/category.bak.html delete mode 100644 app/index/view/product/product_category.html rename app/index/view/product/{product_subcategory.html => subcategory.html} (96%) diff --git a/app/index/controller/Product.php b/app/index/controller/Product.php index 3a9625ca..52a8205d 100644 --- a/app/index/controller/Product.php +++ b/app/index/controller/Product.php @@ -22,12 +22,100 @@ use think\helper\Arr; */ class Product extends Common { - // 产品分类 + // 产品分类 - 查看顶层分类 public function category() { // 参数 $param = request()->param(['id']); + // 获取分类及产品信息 + $categorys_data = ProductCategoryModel::field(['id', 'pid', 'name', 'path', 'level']) + ->language($this->lang_id) + ->displayed(true) + ->children($param['id']) + ->order(['pid' => 'asc', 'sort' => 'asc', 'id' => 'desc']) + ->select() + ->toArray(); + + $list = []; + if (!empty($categorys_data)) { + // 分组分类 + $list = array_filter($categorys_data, fn($it) => $it['level'] == 2); + foreach ($list as &$it) { + $it['children'] = array_column(array_filter($categorys_data, fn($v) => in_array($it['id'], explode(',', $v['path']))), 'id'); + } + unset($it); + + // 获取分类下的产品信息 + if (!empty($list)) { + $product_model = new ProductModel; + $sql = $product_model->field([ + 'id', + 'category_id', + 'spu', + 'name', + 'cover_image', + 'is_new', + '(' . $list[0]['id'] . ')' => 'group_mark' + ]) + ->byCategory(data_get($list[0], 'children')) + ->language($this->lang_id) + ->enabled(true) + ->onSale(true) + ->onShelves(true) + ->append(['p' => $list[0]['id']]) + ->order(['sort' => 'asc', 'id' => 'desc']) + ->limit(5) + ->buildSql(); + $query = \think\facade\Db::table("($sql) as a"); + foreach ($list as $it) { + $query = $query->union(function($query) use($product_model, $it) { + $query->model($product_model) + ->name($product_model->getName()) + ->field([ + 'id', + 'category_id', + 'spu', + 'name', + 'cover_image', + 'is_new', + '(' . $it['id'] . ')' => 'group_mark' + ]) + ->byCategory($it['children']) + ->language($this->lang_id) + ->enabled(true) + ->onSale(true) + ->onShelves(true) + ->order(['sort' => 'asc', 'id' => 'desc']) + ->limit(5); + }); + } + $pros = $query->select(); + if (!empty($pros)) { + $pros_map = []; + foreach ($pros as $pro) { + $pros_map[$pro['group_mark']][] = $pro; + } + foreach ($list as &$it) { + if (isset($pros_map[$it['id']])) { + $it['products'] = $pros_map[$it['id']]; + } + unset($it['children']); + } + unset($it); + } + } + } + View::assign('list', $list); + + return View::fetch('category'); + } + // 产品分类 - 查看子类 + public function subcategory() + { + // 参数 + $param = request()->param(['id']); + $focus_image = []; // 获取产品分类页焦点横幅 $banner = SysBannerModel::with(['items' => function($query) { @@ -60,6 +148,7 @@ class Product extends Common ->child($param['id'], true) ->order(['sort' => 'asc', 'id' => 'desc']) ->select(); + if (!$categorys_data->isEmpty()) { if ($categorys_data->count() > 1) { // 当分类数不只一个时，当前分类下有子分类，移除当前分类，只输出子分类 @@ -70,8 +159,8 @@ class Product extends Common $categorys_data = $categorys_data->toArray(); $products = ProductModel::field([ - 'id', - 'category_id', + 'id', + 'category_id', 'spu', 'name', 'short_name', @@ -151,7 +240,7 @@ class Product extends Common } View::assign('categorys_data', $categorys_data); - return View::fetch('category'); + return View::fetch('subcategory'); } /** diff --git a/app/index/view/product/category.bak.html b/app/index/view/product/category.bak.html new file mode 100644 index 00000000..6363511d --- /dev/null +++ b/app/index/view/product/category.bak.html @@ -0,0 +1,71 @@ +{extend name="public/base" /} +{block name="style"} + +{/block} +{block name="main"} +
+ {notempty name="focus_image"} +
+ {volist name="focus_image" id="fimg"} + + {/volist} +
+ {/notempty} + +
+ {notempty name="categorys_data"} + {volist name="categorys_data" id="vo"} +
+ {$vo.name} + {eq name="vo.level" value="2"} + 查看更多 + {/eq} +
+ {notempty name="vo.products"} +
+ {volist name="vo.products" id="vp"} + +
+ {volist name="vp.sku" id="vs" key="vs_idx"} + + {/volist} +
+
{$vp.name}
+
{$vp.spu}
+ {notempty name="vp.colors"} +
+ {volist name="vp.colors" id="vc" key="vc_idx"} +
+ {assign name="color_type" value=":rgb_or_image($vc.attr_value)" /} + {eq name="color_type" value="IMAGE"} + + {elseif condition="$color_type == 'RGB'" /} + $vc.attr_value])}> + {/eq} +
+ {/volist} +
+ {/notempty} + + {/volist} +
+ {/notempty} + {/volist} + {/notempty} +
+
+{/block} +{block name="script"} + +{/block} \ No newline at end of file diff --git a/app/index/view/product/category.html b/app/index/view/product/category.html index 6363511d..597e265c 100644 --- a/app/index/view/product/category.html +++ b/app/index/view/product/category.html @@ -1,71 +1,36 @@ -{extend name="public/base" /} -{block name="style"} - -{/block} -{block name="main"} -
- {notempty name="focus_image"} -
- {volist name="focus_image" id="fimg"} - - {/volist} -
- {/notempty} - -
- {notempty name="categorys_data"} - {volist name="categorys_data" id="vo"} -
- {$vo.name} - {eq name="vo.level" value="2"} - 查看更多 - {/eq} -
- {notempty name="vo.products"} -
- {volist name="vo.products" id="vp"} - -
- {volist name="vp.sku" id="vs" key="vs_idx"} - - {/volist} -
-
{$vp.name}
-
{$vp.spu}
- {notempty name="vp.colors"} -
- {volist name="vp.colors" id="vc" key="vc_idx"} -
- {assign name="color_type" value=":rgb_or_image($vc.attr_value)" /} - {eq name="color_type" value="IMAGE"} - - {elseif condition="$color_type == 'RGB'" /} - $vc.attr_value])}> - {/eq} -
- {/volist} -
- {/notempty} - - {/volist} -
- {/notempty} - {/volist} - {/notempty} -
-
-{/block} -{block name="script"} - +{extend name="public/base" /} +{block name="style"} + +{/block} +{block name="main"} +
+ +
+ {volist name="list" id="vo"} +
+
+
{$vo.name}
+ + {:lang('product_newpro.view_all')} + + +
+
+ {volist name="vo.products" id="pro"} + +
+ +
+
{$pro.name}
+
{$pro.spu}
+ {eq name="pro.is_new" value="1"} +
New
+ {/eq} + + {/volist} +
+
+ {/volist} +
+
{/block} \ No newline at end of file diff --git a/app/index/view/product/product_category.html b/app/index/view/product/product_category.html deleted file mode 100644 index cbff7f93..00000000 --- a/app/index/view/product/product_category.html +++ /dev/null @@ -1,59 +0,0 @@ -{extend name="public/base" /} -{block name="style"} - -{block name="main"} -
- -
-
-
-
Power Strip
- - View all - - -
-
- -
- -
-
ORICO 5 in 1 Travel Power Strip
-
ORICO-AP3-2A3U
-
New
- - -
- -
-
ORICO 5 in 1 Travel Power Strip
-
ORICO-AP3-2A3U
-
New
- - -
- -
-
ORICO 5 in 1 Travel Power Strip
-
ORICO-AP3-2A3U
- - -
- -
-
ORICO 5 in 1 Travel Power Strip
-
ORICO-AP3-2A3U
- - -
- -
-
ORICO 5 in 1 Travel Power Strip
-
ORICO-AP3-2A3U
-
New
- -
-
-
-
-{/block} \ No newline at end of file diff --git a/app/index/view/product/product_subcategory.html b/app/index/view/product/subcategory.html similarity index 96% rename from app/index/view/product/product_subcategory.html rename to app/index/view/product/subcategory.html index 681ac0f1..0e9ce46d 100644 --- a/app/index/view/product/product_subcategory.html +++ b/app/index/view/product/subcategory.html @@ -1,6 +1,7 @@ {extend name="public/base" /} {block name="style"} +{/block} {block name="main"}