mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-12-01 10:25:45 +08:00
parent 46c51afb2a
commit 05e5fe5016
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/controller/admin/store/StoreCategory.php
View File

@ -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);
}
/**

10
app/controller/merchant/store/product/Product.php
View File

@ -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('礼包数量超过数量限制');