|
|
@ -129,8 +129,8 @@ class Merchant extends Controller |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function list(): Json { |
|
|
|
public function list(): Json { |
|
|
|
$model = new MerchantModel; |
|
|
|
$model = new MerchantModel; |
|
|
|
$pageSize = $this->request->param('pageSize', 15); |
|
|
|
$pageSize = $this->request->get('pageSize', 15); |
|
|
|
$sort = $this->request->param('sort', "merchant_id"); |
|
|
|
$sort = $this->request->get('sort', "merchant_id"); |
|
|
|
$list = $model->getList($this->request->param(), intval($pageSize), $sort)->toArray(); |
|
|
|
$list = $model->getList($this->request->param(), intval($pageSize), $sort)->toArray(); |
|
|
|
|
|
|
|
|
|
|
|
foreach ($list['data'] as $kr => $r) { |
|
|
|
foreach ($list['data'] as $kr => $r) { |
|
|
|