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

Lyh server



查看合并请求 !1791

@@ -38,8 +38,6 @@ class GoogleLinkController extends BaseController
                 $this->response('success');
                 $this->response('success');
             }
             }
         }
         }
-        $lists['y_total'] = $linkModel->counts(['status'=>1,'project_id'=>$this->user['project_id']]);
-        $lists['n_total'] = $linkModel->counts(['status'=>0,'project_id'=>$this->user['project_id']]);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -37,7 +37,7 @@ class GoogleSearchController extends BaseController
         //查询详情数据
         //查询详情数据
         $searchDetailModel = new GoogleSearchDetail();
         $searchDetailModel = new GoogleSearchDetail();
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $data = $searchDetailModel->lists($this->map,$this->page,$this->row,'clicks',['keys','click_rate','impressions_rate']);
+        $data = $searchDetailModel->lists($this->map,$this->page,$this->row,'impressions',['keys','click_rate','impressions_rate']);
         if(!empty($data)){
         if(!empty($data)){
             if($this->param['type'] == 'country'){
             if($this->param['type'] == 'country'){
                 $codeCountryModel = new GoogleCodeCountry();
                 $codeCountryModel = new GoogleCodeCountry();