|
|
|
@ -145,7 +145,7 @@ class Merchant extends Controller |
|
|
|
|
|
|
|
|
|
$modelgoods = new GoodsModel; |
|
|
|
|
$param = $this->request->param(); |
|
|
|
|
$params['merchantId'] = $r['merchant_id']; |
|
|
|
|
$param['merchantId'] = $r['merchant_id']; |
|
|
|
|
$listgoods = $modelgoods->getList($param, 3); |
|
|
|
|
$list['data'][$kr]['goodsInfo'] = $listgoods; |
|
|
|
|
} |
|
|
|
|