作者 lyh

gx

@@ -213,7 +213,8 @@ class ProjectLogic extends BaseLogic @@ -213,7 +213,8 @@ class ProjectLogic extends BaseLogic
213 } 213 }
214 $param['remain_day'] = $param['deploy_build']['service_duration'] - $param['finish_remain_day']; 214 $param['remain_day'] = $param['deploy_build']['service_duration'] - $param['finish_remain_day'];
215 $param['remain_day'] = ($param['remain_day'] > 0) ? $param['remain_day'] : 0; 215 $param['remain_day'] = ($param['remain_day'] > 0) ? $param['remain_day'] : 0;
216 - unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],$param['online_check'],$param['project_after'],$param['inquiry_filter_config']); 216 + unset($param['payment'],$param['deploy_build'],$param['deploy_optimize'],
  217 + $param['online_check'],$param['project_after'],$param['inquiry_filter_config'],$param['minor_language']);
217 //文件上传默认值 218 //文件上传默认值
218 if($param['is_upload_manage']){ 219 if($param['is_upload_manage']){
219 $param['upload_config'] = [ 220 $param['upload_config'] = [
@@ -14,6 +14,7 @@ use App\Http\Logic\Bside\BaseLogic; @@ -14,6 +14,7 @@ use App\Http\Logic\Bside\BaseLogic;
14 use App\Models\Domain\DomainInfo; 14 use App\Models\Domain\DomainInfo;
15 use App\Models\Project\DeployBuild; 15 use App\Models\Project\DeployBuild;
16 use App\Models\Project\DeployOptimize; 16 use App\Models\Project\DeployOptimize;
  17 +use App\Models\Project\MinorLanguages;
17 use App\Models\Project\Project; 18 use App\Models\Project\Project;
18 use App\Models\RankData\ExternalLinks; 19 use App\Models\RankData\ExternalLinks;
19 use App\Models\RankData\ExternalLinks as ExternalLinksModel; 20 use App\Models\RankData\ExternalLinks as ExternalLinksModel;
@@ -83,14 +84,16 @@ class RankDataLogic extends BaseLogic @@ -83,14 +84,16 @@ class RankDataLogic extends BaseLogic
83 $lang_data = $quanqiusou_api->getLangRankData($api_no); 84 $lang_data = $quanqiusou_api->getLangRankData($api_no);
84 $lang_data = Arr::setValueToKey($lang_data, 'language'); 85 $lang_data = Arr::setValueToKey($lang_data, 'language');
85 $data['langs'] = []; 86 $data['langs'] = [];
86 - if(isset($project['deploy_optimize']['minor_languages']) && !empty($project['deploy_optimize']['minor_languages']) && is_array($project['deploy_optimize']['minor_languages'])){  
87 - foreach($project['deploy_optimize']['minor_languages']??[] as $lang){  
88 - $remain_day = $lang_data[$lang['tl']]['dabiao_day'] ?? 0;  
89 - $data['langs'][$lang['tl'] ?? ''] = [ 87 + $languageModel = new MinorLanguages();
  88 + $languageList = $languageModel->list(['project_id'=>$project['id']]);
  89 + if(!empty($languageList) && is_array($languageList)){
  90 + foreach($languageList as $lang){
  91 + $remain_day = $lang_data[$lang['language']]['dabiao_day'] ?? 0;
  92 + $data['langs'][$lang['language'] ?? ''] = [
90 'lang_text' => Translate::getTls($lang['tl'] ?? ''), 93 'lang_text' => Translate::getTls($lang['tl'] ?? ''),
91 'keyword_num' => $lang['keywords'] ?? 0, 94 'keyword_num' => $lang['keywords'] ?? 0,
92 - 'reach_day' => $lang_data[$lang['tl']]['dabiao_day'] ?? 0,  
93 - 'home_cnt' => $lang_data[$lang['tl']]['home_cnt'] ?? 0, 95 + 'reach_day' => $lang_data[$lang['language']]['dabiao_day'] ?? 0,
  96 + 'home_cnt' => $lang_data[$lang['language']]['home_cnt'] ?? 0,
94 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day, 97 'remain_day' => ($lang['type']??0) == 1 ? $data['project']['remain_day'] : $lang['service_day'] - $remain_day,
95 'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数 2 保证首页关键词 项目达标天数 98 'type' => $lang['type'] ?? 0, //1 项目关键词 项目天数 2 保证首页关键词 项目达标天数
96 ]; 99 ];