Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
b72d791ff9
@ -59,7 +59,10 @@ class Merchant extends BaseController
|
||||
{
|
||||
[$page, $limit] = $this->getPage();
|
||||
$where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id', 'area_id', 'street_id']);
|
||||
return app('json')->success($this->repository->lst($where, $page, $limit));
|
||||
$data = $this->repository->lst($where, $page, $limit);
|
||||
$data['lists'] = $data['list'];
|
||||
unset($data['list']);
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -39,7 +39,10 @@ class StoreProduct extends BaseController
|
||||
unset($_where['product_type']);
|
||||
unset($_where['star']);
|
||||
$where = array_merge($where, $_where);
|
||||
return app('json')->success($this->repository->getAdminList($merId, $where, $page, $limit));
|
||||
$data = $this->repository->getAdminList($merId, $where, $page, $limit);
|
||||
$data['lists'] = $data['list'];
|
||||
unset($data['list']);
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
public function lists()
|
||||
|
@ -41,7 +41,10 @@ class User extends BaseController
|
||||
'uid',
|
||||
]);
|
||||
[$page, $limit] = $this->getPage();
|
||||
return app('json')->success($this->repository->getList($where, $page, $limit));
|
||||
$data = $this->repository->getList($where, $page, $limit);
|
||||
$data['lists'] = $data['list'];
|
||||
unset($data['list']);
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -26,7 +26,10 @@ class UserGroup extends BaseController
|
||||
{
|
||||
$page = 1;
|
||||
$limit = 9999;
|
||||
return app('json')->success($this->repository->getList([], $page, $limit));
|
||||
$data = $this->repository->getList([], $page, $limit);
|
||||
$data['lists'] = $data['list'];
|
||||
unset($data['list']);
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -28,7 +28,10 @@ class UserLabel extends BaseController
|
||||
$limit = 9999;
|
||||
$where = $this->request->params(['type', 'all']);
|
||||
$where['mer_id'] = $this->request->merId();
|
||||
return app('json')->success($this->repository->getList($where, $page, $limit));
|
||||
$data = $this->repository->getList($where, $page, $limit);
|
||||
$data['lists'] = $data['list'];
|
||||
unset($data['list']);
|
||||
return app('json')->success($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user