作者 李宇航

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

gx



查看合并请求 !1739
@@ -261,7 +261,10 @@ class UserLoginLogic @@ -261,7 +261,10 @@ class UserLoginLogic
261 $info['from_order_id'] = $project['from_order_id'] ?? ''; 261 $info['from_order_id'] = $project['from_order_id'] ?? '';
262 $info['aicc'] = $project['aicc'] ?? ''; 262 $info['aicc'] = $project['aicc'] ?? '';
263 $info['hagro'] = $project['hagro'] ?? ''; 263 $info['hagro'] = $project['hagro'] ?? '';
264 - $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 264 + $plan = Project::planMap();
  265 + $seo_plan = Project::seoMap();
  266 + $info['plan'] = $plan[$project['deploy_build']['plan']] ?? 0;
  267 + $info['seo_plan'] = $seo_plan[$project['deploy_build']['seo_plan']] ?? 0;
265 $info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1; 268 $info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1;
266 $info['test_domain'] = $project['deploy_build']['test_domain'] ?? ''; 269 $info['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
267 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 270 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));