Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -47,6 +47,9 @@ class RankDataLogic extends BaseLogic
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $project = (new ProjectLogic())->getProjectInfo($project_id);
         $domain_info = (new DomainInfoLogic)->getDomainInfo($project_id);
         $domain_info = (new DomainInfoLogic)->getDomainInfo($project_id);
         $rank = RankData::where('project_id', $project_id)->first();
         $rank = RankData::where('project_id', $project_id)->first();
+        if(empty($rank) && ($project['deploy_optimize']['api_no'] != 0)){
+            $data['langs_status'] = 1;
+        }
         $rank_week = RankWeek::where('project_id', $project_id)->first();
         $rank_week = RankWeek::where('project_id', $project_id)->first();
         $recomm_domain = RecommDomain::where('project_id', $project_id)->first();
         $recomm_domain = RecommDomain::where('project_id', $project_id)->first();
         $external_links = ExternalLinks::where('project_id', $project_id)->first();
         $external_links = ExternalLinks::where('project_id', $project_id)->first();
@@ -86,9 +89,6 @@ class RankDataLogic extends BaseLogic
         //小语种列表
         //小语种列表
         $quanqiusou_api = new QuanqiusouApi();
         $quanqiusou_api = new QuanqiusouApi();
         $lang_data = $quanqiusou_api->getLangRankData($api_no);
         $lang_data = $quanqiusou_api->getLangRankData($api_no);
-        if(empty($lang_data)){
-            $data['langs_status'] = 0;
-        }
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $lang_data = Arr::setValueToKey($lang_data, 'language');
         $data['langs'] = [];
         $data['langs'] = [];
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();

@@ -334,24 +334,24 @@ class TranslateLogic extends BaseLogic
             $page = $arr[1];
             $page = $arr[1];
             $route = $arr[0];
             $route = $arr[0];
         }
         }
-        if(in_array($route,['products','news','blog'])){
-            //固定路由
-            $data['page'] = $page;
-            $data['is_list'] = 1;
-            if($route == 'products'){
-                $data['source'] = 2;
-            }elseif ($route == 'news'){
-                $data['source'] = 4;
-            }else{
-                $data['source'] = 3;
-            }
-            return $this->success($data);
-        }
-
         $routeModel = new RouteMap();
         $routeModel = new RouteMap();
         $routeInfo = $routeModel->read(['route'=>$route]);
         $routeInfo = $routeModel->read(['route'=>$route]);
         if($routeInfo === false){
         if($routeInfo === false){
             return $data;
             return $data;
+        }else{
+            if(in_array($route,['products','news','blog'])){
+                //固定路由
+                $data['page'] = $page;
+                $data['is_list'] = 1;
+                if($route == 'products'){
+                    $data['source'] = 2;
+                }elseif ($route == 'news'){
+                    $data['source'] = 4;
+                }else{
+                    $data['source'] = 3;
+                }
+                return $this->success($data);
+            }
         }
         }
         $data = $this->resultData($routeInfo,$data);
         $data = $this->resultData($routeInfo,$data);
         $data['page'] = $page;
         $data['page'] = $page;