|
|
@ -57,10 +57,7 @@ class Goods extends Controller |
|
|
|
if (!isset($params['merchant_id']) || !$params['merchant_id']) { |
|
|
|
if (!isset($params['merchant_id']) || !$params['merchant_id']) { |
|
|
|
$params['merchant_id'] = $this->merchantId; |
|
|
|
$params['merchant_id'] = $this->merchantId; |
|
|
|
} |
|
|
|
} |
|
|
|
$params['p_store_id'] = $this->storeInfo->p_store_id; |
|
|
|
$params['storeInfo'] = $this->storeInfo; |
|
|
|
// echo "<pre>"; |
|
|
|
|
|
|
|
// print_r($this->storeInfo->p_store_id); |
|
|
|
|
|
|
|
// exit(); |
|
|
|
|
|
|
|
$list = $model->getList($params, (int)$this->request->param('pageSize', 15)); |
|
|
|
$list = $model->getList($params, (int)$this->request->param('pageSize', 15)); |
|
|
|
if ($list->isEmpty()) { |
|
|
|
if ($list->isEmpty()) { |
|
|
|
return $this->renderSuccess(compact('list')); |
|
|
|
return $this->renderSuccess(compact('list')); |
|
|
|