diff --git a/app/controller/admin/store/StoreCategory.php b/app/controller/admin/store/StoreCategory.php index 1d131296..3dd7b2e6 100644 --- a/app/controller/admin/store/StoreCategory.php +++ b/app/controller/admin/store/StoreCategory.php @@ -204,26 +204,26 @@ class StoreCategory extends BaseController $lv = $this->request->param('lv',null); if (!is_null($lv)) $lv = $lv + 1; $data = $this->repository->getList($type,$lv); - if ($lv) { - $ret = $data; - } else { - $ret = []; - foreach ($data as $key => $value) { - if (isset($value['children'])) { - $level = []; - foreach ($value['children'] as $child) { - if (isset($child['children'])) { - $level[] = $child; - } - } - if (isset($level) && !empty($level)) { - $value['children'] = $level; - $ret[] = $value; - } - } - } - } - return app('json')->success($ret); + // if ($lv) { + // $ret = $data; + // } else { + // $ret = []; + // foreach ($data as $key => $value) { + // if (isset($value['children'])) { + // $level = []; + // foreach ($value['children'] as $child) { + // if (isset($child['children'])) { + // $level[] = $child; + // } + // } + // if (isset($level) && !empty($level)) { + // $value['children'] = $level; + // $ret[] = $value; + // } + // } + // } + // } + return app('json')->success($data); } /** diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php index 14d05a16..e6558a10 100644 --- a/app/controller/merchant/store/product/Product.php +++ b/app/controller/merchant/store/product/Product.php @@ -86,11 +86,11 @@ class Product extends BaseController { $params = $this->request->params($this->repository::CREATE_PARAMS); $data = $this->repository->checkParams($params,$this->request->merId()); - $cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id'); - if(!$cate_id){ - return app('json')->fail('请先添加第三级分类'); - } - $data['cate_id']=$cate_id; + // $cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id'); + // if(!$cate_id){ + // return app('json')->fail('请先添加第三级分类'); + // } + // $data['cate_id']=$cate_id; $data['mer_id'] = $this->request->merId(); if ($data['is_gift_bag'] && !$this->repository->checkMerchantBagNumber($data['mer_id'])) return app('json')->fail('礼包数量超过数量限制');