|
|
@ -91,9 +91,11 @@ class Square extends Controller |
|
|
|
$list['data'][$kr]['avatar_url'] = $files ?: null; |
|
|
|
$list['data'][$kr]['avatar_url'] = $files ?: null; |
|
|
|
} |
|
|
|
} |
|
|
|
if ($r['goods_id']) { |
|
|
|
if ($r['goods_id']) { |
|
|
|
|
|
|
|
|
|
|
|
$modelgoods = new GoodsModel; |
|
|
|
$modelgoods = new GoodsModel; |
|
|
|
$goods = $modelgoods->getDetails2($r['goods_id'])->toArray(); |
|
|
|
$goods = $modelgoods->getDetails2($r['goods_id'])->toArray(); |
|
|
|
$res[$kr]['goodsInfo'] = $goods; |
|
|
|
//print_r($goods);die; |
|
|
|
|
|
|
|
$list['data'][$kr]['goodsInfo'] = $goods; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return $this->renderSuccess($list); |
|
|
|
return $this->renderSuccess($list); |
|
|
|