From 162d4fbd466c7f94891820820733e84de4dbd92d Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 18 Jan 2022 11:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=BB=A5=E5=8F=8A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ProductCategoryController.php        | 7 +++++--
 .../Api/Http/Controllers/Product/PartController.php        | 2 +-
 app/Models/ProductCategory.php                             | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/ProductCategoryController.php b/app/Admin/Controllers/ProductCategoryController.php
index d447d7f7..e79ea055 100644
--- a/app/Admin/Controllers/ProductCategoryController.php
+++ b/app/Admin/Controllers/ProductCategoryController.php
@@ -24,10 +24,12 @@ class ProductCategoryController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ProductCategory(), function (Grid $grid) {
+        $builder = ProductCategory::with('parent');
+        return Grid::make($builder, function (Grid $grid) {
             $grid->column('id')->sortable();
-            $grid->column('name')->tree();
+            $grid->column('name');
             $grid->column('icon')->image(50, 50);
+            $grid->column('parent.name', '上级分类')->label();
             $grid->column('is_show')
                 ->if(function () {
                     return Admin::user()->can('dcat.admin.product_categories.edit');
@@ -71,6 +73,7 @@ class ProductCategoryController extends AdminController
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
                 $filter->equal('name')->width(3);
+                $filter->equal('parent_id', '上级分类')->select(ProductCategoryModel::selectOptions())->width(3);
             });
         });
     }
diff --git a/app/Endpoint/Api/Http/Controllers/Product/PartController.php b/app/Endpoint/Api/Http/Controllers/Product/PartController.php
index 04c215ac..2a0c55ce 100644
--- a/app/Endpoint/Api/Http/Controllers/Product/PartController.php
+++ b/app/Endpoint/Api/Http/Controllers/Product/PartController.php
@@ -26,7 +26,7 @@ class PartController extends Controller
             $part = ProductPart::where('key', $key)->first();
         }
 
-        $paginator = ProductPartSku::with('sku:id,name,cover,sell_price,vip_price')
+        $paginator = ProductPartSku::with('sku:id,name,cover,sell_price,vip_price,market_price')
                                     ->whereHas('sku', function ($query) {
                                         return $query->online();
                                     })
diff --git a/app/Models/ProductCategory.php b/app/Models/ProductCategory.php
index df2509fa..afa775e1 100644
--- a/app/Models/ProductCategory.php
+++ b/app/Models/ProductCategory.php
@@ -55,4 +55,9 @@ class ProductCategory extends Model
     {
         return $this->parent_id;
     }
+
+    public function parent()
+    {
+        return $this->belongsTo(ProductCategory::class, 'parent_id');
+    }
 }