|
| xqd
@@ -88,13 +88,20 @@ class ProductController extends Controller
|
|
|
->get();
|
|
|
$data = [];
|
|
|
foreach ($list as $v){
|
|
|
+ if($v['upload_display_pid'] === 0){
|
|
|
+ $v['pid'] = 0;
|
|
|
+ }elseif ($v['upload_display_pid'] > 0){
|
|
|
+ $v['pid'] = $v['upload_display_pid'];
|
|
|
+ }else{
|
|
|
+ $v['pid'] = $v['pid'];
|
|
|
+ }
|
|
|
$data[] =[
|
|
|
'id' => $v['id'],
|
|
|
'icon' => $v['icon'],
|
|
|
'zh_name' => $v['zh_name'],
|
|
|
'ko_name' => $v['ko_name'],
|
|
|
'describe' => $v['describe'],
|
|
|
- 'pid' => $v['upload_display_pid'] > 0?$v['upload_display_pid']:$v['pid'],
|
|
|
+ 'pid' => $v['pid'],
|
|
|
'is_display' => $v['is_upload_display']
|
|
|
];
|
|
|
}
|
