合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1640

@@ -66,8 +66,8 @@ class GoogleKeywordInsightController extends BaseController
         $resultData = [];
         $resultData = [];
         if(!empty($main_keyword)){
         if(!empty($main_keyword)){
             $resultData = $this->paginateArray($main_keyword,$this->page,$this->row);
             $resultData = $this->paginateArray($main_keyword,$this->page,$this->row);
-            $detailList = $detailModel->read(['search'=>['in',$resultData['data']]]);
-            foreach ($resultData['data'] as $key => $item){
+            $detailList = $detailModel->read(['search'=>['in',$resultData['list']]]);
+            foreach ($resultData['list'] as $key => $item){
                 $result['keyword'] = $item;
                 $result['keyword'] = $item;
                 $searchKeyword = $this->getSearchDetail($item,$detailList);
                 $searchKeyword = $this->getSearchDetail($item,$detailList);
                 if($searchKeyword === false){
                 if($searchKeyword === false){
@@ -75,7 +75,7 @@ class GoogleKeywordInsightController extends BaseController
                 }else{
                 }else{
                     $result['data'] = $searchKeyword;
                     $result['data'] = $searchKeyword;
                 }
                 }
-                $resultData['data'][$key] = $result;
+                $resultData['list'][$key] = $result;
             }
             }
 
 
         }
         }