周海龙 / globalso · 提交

转到一个项目

作者 Your Name
提交 479aa5c6a32b826755a2746567910a508c97290a 2 个父辈 ad405a79 80ca7801

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 1 行删除
@@ -51,7 +51,7 @@ class CountLogic extends BaseLogic @@ -51,7 +51,7 @@ class CountLogic extends BaseLogic
51 */ 51 */
52 public function scheme_info(){ 52 public function scheme_info(){
53 $data = [ 53 $data = [
54 - 'company'=>$this->project['title'], 54 + 'company'=>$this->project['company'],
55 'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']], 55 'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']],
56 'service_duration'=>$this->project['deploy_build']['service_duration'], 56 'service_duration'=>$this->project['deploy_build']['service_duration'],
57 ]; 57 ];
@@ -149,6 +149,7 @@ class UserLoginLogic @@ -149,6 +149,7 @@ class UserLoginLogic
149 */ 149 */
150 public function autoAssembleParam($info){ 150 public function autoAssembleParam($info){
151 $project = $this->getProjectInfo($info['project_id']); 151 $project = $this->getProjectInfo($info['project_id']);
  152 + $info['title'] = $project['title'] ?? '';
152 $info['company'] = $project['company'] ?? ''; 153 $info['company'] = $project['company'] ?? '';
153 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 154 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
154 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? 155 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
@@ -169,6 +170,7 @@ class UserLoginLogic @@ -169,6 +170,7 @@ class UserLoginLogic
169 $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','project_id']); 170 $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','project_id']);
170 //获取项目详情 171 //获取项目详情
171 $project = $this->getProjectInfo($project_id); 172 $project = $this->getProjectInfo($project_id);
  173 + $info['title'] = $project['title'] ?? '';
172 $info['company'] = $project['company'] ?? ''; 174 $info['company'] = $project['company'] ?? '';
173 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 175 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
174 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? 176 $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?