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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-12-05 14:48:28 +08:00
commit b72d791ff9
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controller/middle/Merchant.php
View File

@ -59,7 +59,10 @@ class Merchant extends BaseController
{ {
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id', 'area_id', 'street_id']); $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);
} }
} }

5
app/controller/middle/StoreProduct.php
View File

@ -39,7 +39,10 @@ class StoreProduct extends BaseController
unset($_where['product_type']); unset($_where['product_type']);
unset($_where['star']); unset($_where['star']);
$where = array_merge($where, $_where); $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() public function lists()

5
app/controller/middle/User.php
View File

@ -41,7 +41,10 @@ class User extends BaseController
'uid', 'uid',
]); ]);
[$page, $limit] = $this->getPage(); [$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);
} }
} }

5
app/controller/middle/UserGroup.php
View File

@ -26,7 +26,10 @@ class UserGroup extends BaseController
{ {
$page = 1; $page = 1;
$limit = 9999; $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);
} }
} }

5
app/controller/middle/UserLabel.php
View File

@ -28,7 +28,10 @@ class UserLabel extends BaseController
$limit = 9999; $limit = 9999;
$where = $this->request->params(['type', 'all']); $where = $this->request->params(['type', 'all']);
$where['mer_id'] = $this->request->merId(); $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);
} }
} }