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

Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
mkm 2023-06-09 17:24:21 +08:00
commit fa2b0e5549
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,8 @@ class Product extends BaseController
$data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1; $data['mer_status'] = ($this->request->merchant()->is_del || !$this->request->merchant()->mer_state || !$this->request->merchant()->status) ? 0 : 1;
$data['mer_id'] = $this->request->merId(); $data['mer_id'] = $this->request->merId();
$data['update_time'] = date('Y-m-d H:i:s'); $data['update_time'] = date('Y-m-d H:i:s');
$this->repository->edit($id, $data, $this->request->merId(), 0); $productType = $this->request->merchant()->type_id == 12 ? 98 : 0;
$this->repository->edit($id, $data, $this->request->merId(), $productType);
return app('json')->success('编辑成功'); return app('json')->success('编辑成功');
} }