|
|
@ -218,7 +218,7 @@ class Goods extends GoodsService |
|
|
|
return []; |
|
|
|
return []; |
|
|
|
} |
|
|
|
} |
|
|
|
$list = $goodsList->toArray(); |
|
|
|
$list = $goodsList->toArray(); |
|
|
|
$list['data'] = $this->newFormatGoodsList($list['data']); |
|
|
|
//$list['data'] = $this->newFormatGoodsList($list['data']); |
|
|
|
return $list; |
|
|
|
return $list; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -257,7 +257,7 @@ class Goods extends GoodsService |
|
|
|
} |
|
|
|
} |
|
|
|
$list = $goodsList->toArray(); |
|
|
|
$list = $goodsList->toArray(); |
|
|
|
|
|
|
|
|
|
|
|
$list['data'] = $this->newFormatGoodsList($list['data']); |
|
|
|
//$list['data'] = $this->newFormatGoodsList($list['data']); |
|
|
|
return $list; |
|
|
|
return $list; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -278,11 +278,11 @@ class Goods extends GoodsService |
|
|
|
'paihang' => 1, |
|
|
|
'paihang' => 1, |
|
|
|
'categoryId' => $v['category_id'], |
|
|
|
'categoryId' => $v['category_id'], |
|
|
|
], 3); |
|
|
|
], 3); |
|
|
|
$v['goods_list'] = []; |
|
|
|
$v['goods_list'] = $goodsList->toArray()['data']; |
|
|
|
if (!$goodsList->isEmpty()) { |
|
|
|
// if (!$goodsList->isEmpty()) { |
|
|
|
$list2 = $goodsList->toArray()['data']; |
|
|
|
// $list2 = $goodsList->toArray()['data']; |
|
|
|
$v['goods_list'] = $this->newFormatGoodsList($list2); |
|
|
|
// $v['goods_list'] = $this->newFormatGoodsList($list2); |
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return $list; |
|
|
|
return $list; |
|
|
|