From 1ec0dafde752924184aad8c190269fb8cc4c8865 Mon Sep 17 00:00:00 2001
From: lqmac <lqmac@qq.com>
Date: Thu, 20 Jun 2024 14:54:06 +0800
Subject: [PATCH] 1

---
 app/api/controller/Goods.php |  9 ---------
 app/api/service/Goods.php    | 14 +++++++-------
 app/store/model/Goods.php    | 10 +---------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index 1370a0f4..6e5006e6 100644
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -1,13 +1,4 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
 declare (strict_types=1);
 
 namespace app\api\controller;
diff --git a/app/api/service/Goods.php b/app/api/service/Goods.php
index 3f4a6e53..6be8cd53 100644
--- a/app/api/service/Goods.php
+++ b/app/api/service/Goods.php
@@ -218,7 +218,7 @@ class Goods extends GoodsService
             return [];
         }
         $list = $goodsList->toArray();
-        $list['data'] = $this->newFormatGoodsList($list['data']);
+        //$list['data'] = $this->newFormatGoodsList($list['data']);
         return $list;
 
     }
@@ -257,7 +257,7 @@ class Goods extends GoodsService
         }
         $list = $goodsList->toArray();
 
-        $list['data'] = $this->newFormatGoodsList($list['data']);
+        //$list['data'] = $this->newFormatGoodsList($list['data']);
         return $list;
 
     }
@@ -278,11 +278,11 @@ class Goods extends GoodsService
                 'paihang' => 1,
                 'categoryId' => $v['category_id'],
             ], 3);
-            $v['goods_list'] = [];
-            if (!$goodsList->isEmpty()) {
-                $list2 = $goodsList->toArray()['data'];
-                $v['goods_list'] = $this->newFormatGoodsList($list2);
-            }
+            $v['goods_list'] = $goodsList->toArray()['data'];
+            // if (!$goodsList->isEmpty()) {
+            //     $list2 = $goodsList->toArray()['data'];
+            //     $v['goods_list'] = $this->newFormatGoodsList($list2);
+            // }
 
         }
         return $list;
diff --git a/app/store/model/Goods.php b/app/store/model/Goods.php
index 1f274f46..5e36f7dd 100644
--- a/app/store/model/Goods.php
+++ b/app/store/model/Goods.php
@@ -1,13 +1,5 @@
 <?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
+
 declare (strict_types=1);
 
 namespace app\store\model;