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

geo项目剩余服务时常设置



查看合并请求 !2649

@@ -161,6 +161,7 @@ class RenewProjectController extends BaseController
             $data = APublicModel::getNumByProjectId($item['id']);
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         }
         $plan = Project::planMap();
         $plan = Project::planMap();
+        $seoPlan = Project::seoMap();
         $item = [
         $item = [
             'id' => $item['id'],
             'id' => $item['id'],
             'title' => $item['title'],
             'title' => $item['title'],
@@ -178,7 +179,8 @@ class RenewProjectController extends BaseController
             'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
             'optimize_tech' => $manageModel->getName($item['deploy_optimize']['tech_mid']), //售后技术
             'type' => $item['type'],
             'type' => $item['type'],
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
             'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
-            'plan' =>$plan[$item['deploy_build']['plan']] ?? '白帽seo版本',
+            'plan' =>$plan[$item['deploy_build']['plan']] ?? '无',
+            'seo_plan' =>$seoPlan[$item['deploy_build']['seo_plan']] ?? '无',
             'plan_id' =>$item['deploy_build']['plan'],
             'plan_id' =>$item['deploy_build']['plan'],
             'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'domain' => !empty($item['deploy_optimize']['domain']) ?  $domainModel->getDomain($item['deploy_optimize']['domain']) : '',
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
             'created_at' => date('Y年m月d日', strtotime($item['created_at'])),