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

Lyh server



查看合并请求 !1726

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

@@ -451,7 +451,7 @@ class ProjectLogic extends BaseLogic
     }
 
     /**
-     * @remark :保存seo白帽类型
+     * @remark :保存seo白帽类型,上线保存一条审核记录，
      * @name   :saveSeoPlan
      * @author :lyh
      * @method :post
@@ -463,7 +463,7 @@ class ProjectLogic extends BaseLogic
             $onlineInfo = $onlineCheckModel->read(['project_id'=>$project_id]);
             if($onlineInfo === false){
                 if(empty($optimist_mid) || empty($quality_mid)){
-                    $this->fail('请选择优化师及品控');
+                    $this->fail('自动提交审核，请选择优化师及品控');
                 }
                 $data = [
                     'project_id' => $project_id,
@@ -477,6 +477,10 @@ class ProjectLogic extends BaseLogic
                     'created_at'=>date('Y-m-d H:i:s'),
                 ];
                 $onlineCheckModel->addReturnId($data);
+                $this->param['status'] = Project::STATUS_ONE;
+                if(empty($this->param['uptime'])){
+                    $this->param['uptime'] = date('Y-m-d H:i:s');
+                }
             }
         }
         return true;

@@ -115,7 +115,6 @@ class Project extends Base
             12 => '俄语商务版',
             14 => '俄语旗舰版',
             13 => '体验版',
-            15 => '白帽SEO方案',
         ];
     }