|
@@ -524,13 +524,13 @@ class MerchantService extends BaseService
|
|
|
->first();
|
|
->first();
|
|
|
$info = $info? $info->setHidden(['usdt','update_time','mark'])->toArray() : [];
|
|
$info = $info? $info->setHidden(['usdt','update_time','mark'])->toArray() : [];
|
|
|
if($info){
|
|
if($info){
|
|
|
- $info['logo'] = isset($info['logo']) && $info['logo']? [['url'=> get_image_url($info['logo'])]] : [];
|
|
|
|
|
- $info['business_img'] = isset($info['business_img']) && $info['business_img']? [['url'=> get_image_url($info['business_img'])]] : [];
|
|
|
|
|
|
|
+ $info['logo'] = isset($info['logo']) && $info['logo']? get_image_url($info['logo']) : '';
|
|
|
|
|
+ $info['business_img'] = isset($info['business_img']) && $info['business_img']? get_image_url($info['business_img']) : '';
|
|
|
$albums = isset($info['albums']) && $info['albums']? json_decode($info['albums'], true) : [];
|
|
$albums = isset($info['albums']) && $info['albums']? json_decode($info['albums'], true) : [];
|
|
|
$info['albums'] = $albums? get_images_preview($albums) : [];
|
|
$info['albums'] = $albums? get_images_preview($albums) : [];
|
|
|
if(isset($info['category']) && $info['category']){
|
|
if(isset($info['category']) && $info['category']){
|
|
|
$info['category_name'] = isset($info['category']['name'])? $info['category']['name'] : '';
|
|
$info['category_name'] = isset($info['category']['name'])? $info['category']['name'] : '';
|
|
|
- $info['category'] = isset($info['category']['id'])? $info['category']['id'] : '';
|
|
|
|
|
|
|
+ $info['category_id'] = isset($info['category']['id'])? $info['category']['id'] : '';
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
