作者 Your Name

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

... ... @@ -203,5 +203,5 @@ class LoginController extends BaseController
$info = $logic->autologin($data);
$this->response('success',Code::SUCCESS,['info'=>$info]);
}
}
... ...
... ... @@ -51,7 +51,7 @@ class CountLogic extends BaseLogic
*/
public function scheme_info(){
$data = [
'company'=>$this->project['title'],
'company'=>$this->project['company'],
'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']],
'service_duration'=>$this->project['deploy_build']['service_duration'],
];
... ...
... ... @@ -149,6 +149,7 @@ class UserLoginLogic
*/
public function autoAssembleParam($info){
$project = $this->getProjectInfo($info['project_id']);
$info['title'] = $project['title'] ?? '';
$info['company'] = $project['company'] ?? '';
$info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
... ... @@ -169,6 +170,7 @@ class UserLoginLogic
$info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','project_id']);
//获取项目详情
$project = $this->getProjectInfo($project_id);
$info['title'] = $project['title'] ?? '';
$info['company'] = $project['company'] ?? '';
$info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
... ...