作者 lyh

gx翻译域名

@@ -68,6 +68,17 @@ class CountAllProject extends Command @@ -68,6 +68,17 @@ class CountAllProject extends Command
68 if(empty($v['online_date'])){ 68 if(empty($v['online_date'])){
69 $v['online_date'] = null; 69 $v['online_date'] = null;
70 } 70 }
  71 + if(!empty($v['category'])){
  72 + $arr = explode('.',$v['category']);
  73 + if($arr[0] == 1){
  74 + $v['status'] = 1;
  75 +
  76 + }elseif ($arr[0] == 2){
  77 + $v['status'] = 2;
  78 +
  79 + }
  80 + $v['category'] = $arr[1] ?? '';
  81 + }
71 if($v['is_admin5'] == 5){ 82 if($v['is_admin5'] == 5){
72 $v['version'] = 2; 83 $v['version'] = 2;
73 }else{ 84 }else{
@@ -35,11 +35,14 @@ class DetailController extends BaseController @@ -35,11 +35,14 @@ class DetailController extends BaseController
35 $data_column = $column->list([],'id',['*'],'asc'); 35 $data_column = $column->list([],'id',['*'],'asc');
36 if(!empty($data_column) && !empty($data)){ 36 if(!empty($data_column) && !empty($data)){
37 foreach ($data_column as $k => $v){ 37 foreach ($data_column as $k => $v){
38 - foreach ($data as $k1 => $v1){ 38 + $column_data = [];
  39 + foreach ($data as $v1){
39 if($v['id'] == $v1['column_id']){ 40 if($v['id'] == $v1['column_id']){
40 - $data_column[$k]['data'][] = $v1; 41 + $column_data[] = $v1;
41 } 42 }
42 } 43 }
  44 + $v['data'] = $column_data;
  45 + $data_column[$k] = $v;
43 } 46 }
44 } 47 }
45 $this->response('success',Code::SUCCESS,$data_column); 48 $this->response('success',Code::SUCCESS,$data_column);