|
|
@@ -81,7 +81,7 @@ class MerchantCategoryService extends BaseService
|
|
|
->each(function($item, $k) use($locale){
|
|
|
$item['icon'] = $item['icon']? get_image_url($item['icon']) : '';
|
|
|
$name = isset($item['name'])? $item['name'] : '';
|
|
|
- $item['name'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
|
|
|
+ $item['text'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
|
|
|
});
|
|
|
$datas = $datas? $datas->toArray() : [];
|
|
|
if($datas){
|
|
|
@@ -131,7 +131,7 @@ class MerchantCategoryService extends BaseService
|
|
|
if(isset($item['icon'])){
|
|
|
$item['icon'] = $item['icon']? get_image_url($item['icon']) : '';
|
|
|
$name = isset($item['name'])? $item['name'] : '';
|
|
|
- $item['name'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
|
|
|
+ $item['text'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
|
|
|
}
|
|
|
unset($item);
|
|
|
}
|