移除分类图片

app/Http/Controllers/Mini/ProductController.php

@@ -17,39 +17,11 @@ use Modules\AnnoRoute\Attribute\RequestAttribute;
 #[RequestAttribute('/mini', 'mini', authGuard: 'users')]
 class ProductController extends BaseMiniController
 {
-    /** 分类树（仅含上架商品的分类及其祖先，保证树结构完整） */
+    /** 分类树（全部启用分类，含暂无商品的分类） */
     #[GetRoute('/product/categories', authorize: true)]
     public function categories(): JsonResponse
     {
-        $activeCategoryIds = ProductModel::query()
-            ->where('status', ProductModel::STATUS_ON)
-            ->distinct()
-            ->pluck('category_id')
-            ->map(static fn ($id) => (int) $id)
-            ->filter(static fn (int $id) => $id > 0);
-
-        $categories = ProductCategoryModel::query()
-            ->where('status', ProductCategoryModel::STATUS_NORMAL)
-            ->get()
-            ->keyBy('id');
-
-        // 保留有上架商品的分类 + 其全部祖先
-        $keep = [];
-        foreach ($activeCategoryIds as $categoryId) {
-            $cursor = $categoryId;
-            $guard = 0;
-            while ($cursor > 0 && $guard++ < 20 && $categories->has($cursor)) {
-                $keep[$cursor] = true;
-                $cursor = (int) $categories[$cursor]->parent_id;
-            }
-        }
-
-        $filtered = array_values(array_filter(
-            $categories->toArray(),
-            static fn (array $item) => isset($keep[$item['id']])
-        ));
-
-        return $this->success(ProductCategoryModel::buildTree($filtered));
+        return $this->success(ProductCategoryModel::getTreeData(['*'], true));
     }
 
     /**
@@ -88,7 +60,7 @@ class ProductController extends BaseMiniController
         if (!$user)  return $this->success($data);
         // 门店
         $store = $this->boundStore($user);
-        if(!$store) return $this->success('12313');
+        if(!$store) return $this->success($data);
 
         if ($store->level_id > 0) {
             foreach ($data['data'] as &$row) {