Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev
This commit is contained in:
commit
fa2b0e5549
@ -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_id'] = $this->request->merId();
|
||||
$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('编辑成功');
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user