|
@@ -83,8 +83,8 @@ class ProductController extends Controller
|
|
$data[] =[
|
|
$data[] =[
|
|
'id' => $v['id'],
|
|
'id' => $v['id'],
|
|
'icon' => $v['icon'],
|
|
'icon' => $v['icon'],
|
|
- 'zh_name' => $v['zh_alias'] != null?$v['zh_alias']:$v['zh_name'],
|
|
|
|
- 'ko_name' => $v['ko_alias'] != null?$v['ko_alias']:$v['ko_name'],
|
|
|
|
|
|
+ 'zh_name' => $v['zh_name'],
|
|
|
|
+ 'ko_name' => $v['ko_name'],
|
|
'describe' => $v['describe'],
|
|
'describe' => $v['describe'],
|
|
'pid' => $v['upload_display_pid'] > 0?$v['upload_display_pid']:$v['pid'],
|
|
'pid' => $v['upload_display_pid'] > 0?$v['upload_display_pid']:$v['pid'],
|
|
'is_display' => $v['is_upload_display']
|
|
'is_display' => $v['is_upload_display']
|