Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop
正在显示
1 个修改的文件
包含
3 行增加
和
3 行删除
| @@ -55,10 +55,10 @@ class RankDataLogic extends BaseLogic | @@ -55,10 +55,10 @@ class RankDataLogic extends BaseLogic | ||
| 55 | //项目信息 | 55 | //项目信息 |
| 56 | $data['project'] = [ | 56 | $data['project'] = [ |
| 57 | 'company' => $project['company'], | 57 | 'company' => $project['company'], |
| 58 | - 'domain' => $project['deploy_optimize']['domain'], | 58 | + 'domain' => $project['deploy_optimize']['domain'] ?? '', |
| 59 | 'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''), | 59 | 'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''), |
| 60 | 'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''), | 60 | 'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''), |
| 61 | - 'plan' => str_replace('营销大师-', '全球搜-', $project['deploy_build']['plan'][0]), | 61 | + 'plan' => str_replace('营销大师-', '全球搜-', $project['deploy_build']['plan'][0] ?? ''), |
| 62 | 'keyword_num' => $project['deploy_build']['keyword_num'], | 62 | 'keyword_num' => $project['deploy_build']['keyword_num'], |
| 63 | 'compliance_day' => $rank['compliance_day'] ?? 0, | 63 | 'compliance_day' => $rank['compliance_day'] ?? 0, |
| 64 | 'remain_day' => $project['deploy_build']['service_duration'] - ($rank['compliance_day'] ?? 0), | 64 | 'remain_day' => $project['deploy_build']['service_duration'] - ($rank['compliance_day'] ?? 0), |
| @@ -69,7 +69,7 @@ class RankDataLogic extends BaseLogic | @@ -69,7 +69,7 @@ class RankDataLogic extends BaseLogic | ||
| 69 | $lang_data = $quanqiusou_api->getLangRankData($api_no); | 69 | $lang_data = $quanqiusou_api->getLangRankData($api_no); |
| 70 | $lang_data = Arr::setValueToKey($lang_data, 'language'); | 70 | $lang_data = Arr::setValueToKey($lang_data, 'language'); |
| 71 | $data['langs'] = []; | 71 | $data['langs'] = []; |
| 72 | - foreach($project['deploy_optimize']['minor_languages'] as $lang){ | 72 | + foreach($project['deploy_optimize']['minor_languages']??[] as $lang){ |
| 73 | $remain_day = $lang_data[$lang['tl']]['dabiao_day'] ?? 0; | 73 | $remain_day = $lang_data[$lang['tl']]['dabiao_day'] ?? 0; |
| 74 | $data['langs'][$lang['tl'] ?? ''] = [ | 74 | $data['langs'][$lang['tl'] ?? ''] = [ |
| 75 | 'lang_text' => Translate::getTls($lang['tl'] ?? ''), | 75 | 'lang_text' => Translate::getTls($lang['tl'] ?? ''), |
-
请 注册 或 登录 后发表评论