正在显示
1 个修改的文件
包含
10 行增加
和
12 行删除
| @@ -65,19 +65,19 @@ class GoogleKeywordInsightController extends BaseController | @@ -65,19 +65,19 @@ class GoogleKeywordInsightController extends BaseController | ||
| 65 | $detailModel = new GoogleKeywordInsightDetail(); | 65 | $detailModel = new GoogleKeywordInsightDetail(); |
| 66 | $resultData = []; | 66 | $resultData = []; |
| 67 | if(!empty($main_keyword)){ | 67 | if(!empty($main_keyword)){ |
| 68 | - $result = []; | ||
| 69 | $resultData = $this->paginateArray($main_keyword,$this->page,$this->row); | 68 | $resultData = $this->paginateArray($main_keyword,$this->page,$this->row); |
| 70 | $detailList = $detailModel->read(['search'=>['in',$resultData['data']]]); | 69 | $detailList = $detailModel->read(['search'=>['in',$resultData['data']]]); |
| 71 | foreach ($resultData['data'] as $key => $item){ | 70 | foreach ($resultData['data'] as $key => $item){ |
| 72 | - $result[]['keyword'] = $item; | 71 | + $result['keyword'] = $item; |
| 73 | $searchKeyword = $this->getSearchDetail($item,$detailList); | 72 | $searchKeyword = $this->getSearchDetail($item,$detailList); |
| 74 | if($searchKeyword === false){ | 73 | if($searchKeyword === false){ |
| 75 | - $result[]['data'] = []; | 74 | + $result['data'] = []; |
| 76 | }else{ | 75 | }else{ |
| 77 | - $result[]['data'] = $searchKeyword; | 76 | + $result['data'] = $searchKeyword; |
| 78 | } | 77 | } |
| 78 | + $resultData['data'][$key] = $result; | ||
| 79 | } | 79 | } |
| 80 | - $resultData['data'] = $result; | 80 | + |
| 81 | } | 81 | } |
| 82 | $this->response('success',Code::SUCCESS,$resultData); | 82 | $this->response('success',Code::SUCCESS,$resultData); |
| 83 | } | 83 | } |
| @@ -115,13 +115,11 @@ class GoogleKeywordInsightController extends BaseController | @@ -115,13 +115,11 @@ class GoogleKeywordInsightController extends BaseController | ||
| 115 | $offset = ($page - 1) * $pageSize; | 115 | $offset = ($page - 1) * $pageSize; |
| 116 | $data = array_slice($array, $offset, $pageSize); | 116 | $data = array_slice($array, $offset, $pageSize); |
| 117 | return [ | 117 | return [ |
| 118 | - 'list'=>[ | ||
| 119 | - 'page' => $page, | ||
| 120 | - 'size' => $pageSize, | ||
| 121 | - 'total_page' => $totalPages, | ||
| 122 | - 'total' => $totalItems, | ||
| 123 | - ], | ||
| 124 | - 'data' => $data | 118 | + 'list' => $data, |
| 119 | + 'page' => $page, | ||
| 120 | + 'size' => $pageSize, | ||
| 121 | + 'total_page' => $totalPages, | ||
| 122 | + 'total' => $totalItems, | ||
| 125 | ]; | 123 | ]; |
| 126 | } | 124 | } |
| 127 | } | 125 | } |
-
请 注册 或 登录 后发表评论