Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-05-28 f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e

 src/app/routes/passport/login/login.component.ts

@@ -99,7 +99,7 @@
                       this.router.navigate(['/']);
                   }
                },
                (err: HttpErrorResponse) => {                    
                (err: HttpErrorResponse) => {  
                    if (!!err) {
                        const errMsg = err.error;
                        console.log(errMsg);