diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index ede3a45..7157455 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -22,7 +22,7 @@ -

+

北京安信科创软件有限公司提供技术支持和维护

diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss index f476283..ceaf0a0 100644 --- a/src/app/pages/login/login.component.scss +++ b/src/app/pages/login/login.component.scss @@ -27,7 +27,7 @@ .hint { text-align: right; - margin-bottom: 40px; + margin-bottom: 50px; .forget{ cursor: pointer; color: #2399FF; diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index d379c6a..8d2dc37 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -43,23 +43,25 @@ export class LoginComponent implements OnInit { this.message.create('error', `请输入账号密码`); return } - if (!this.selectedRole) { - this.message.create('error', `请选择登录角色`); - return - } + // if (!this.selectedRole) { + // this.message.create('error', `请选择登录角色`); + // return + // } this.http.post('/api/TokenAuth/Authenticate', { userNameOrEmailAddress: this.validateForm.value.userName, password: this.validateForm.value.password }).subscribe( (data: any) => { - this.message.create('success', `登陆成功`); + sessionStorage.setItem("token", data.result.accessToken); this.cookieService.set("token", data.result.accessToken, null, '/'); this.cookieService.set("refreshToken", data.result.encryptedAccessToken, null, '/'); - this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data:any) => { - sessionStorage.setItem('userdata',JSON.stringify(data.result.user)) + this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe((data: any) => { + sessionStorage.setItem('userdata', JSON.stringify(data.result.user)) + this.message.create('success', `登陆成功`); + this.router.navigate(['/home/plan']) }) - this.router.navigate(['/home/plan']) + //调用服务中的function刷新token // this.token.startUp() },