Skip to content

L
luna
Unverified Commit 87b03a4e authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: update

parent d6d3490e
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 55 deletions
src/app/app.service.ts
View file @ 87b03a4e
...@@ -275,70 +275,81 @@ export class AppService implements OnInit { ...@@ -275,70 +275,81 @@ export class AppService implements OnInit {
this._router.navigate([document.location.pathname]); this._router.navigate([document.location.pathname]);
} }
// jQuery('angular2').show(); // jQuery('angular2').show();
} else if (document.location.pathname === '/luna/connect') {
User.logined = true;
} else { } else {
// this.browser(); // this.browser();
if (document.location.pathname !== '/luna/connect') { this._http.get_user_profile()
this._http.get_user_profile() .subscribe(
.subscribe( data => {
data => { User.id = data['id'];
User.id = data['id']; User.name = data['name'];
User.name = data['name']; User.username = data['username'];
User.username = data['username']; User.email = data['email'];
User.email = data['email']; User.is_active = data['is_active'];
User.is_active = data['is_active']; User.is_superuser = data['is_superuser'];
User.is_superuser = data['is_superuser']; User.role = data['role'];
User.role = data['role']; // User.groups = data['groups'];
// User.groups = data['groups']; User.wechat = data['wechat'];
User.wechat = data['wechat']; User.comment = data['comment'];
User.comment = data['comment']; User.date_expired = data['date_expired'];
User.date_expired = data['date_expired']; if (data['phone']) {
if (data['phone']) { User.phone = data['phone'].toString();
User.phone = data['phone'].toString(); }
} User.logined = data['logined'];
User.logined = data['logined']; this._logger.debug(User);
this._logger.debug(User); this._localStorage.set('user', data['id']);
this._localStorage.set('user', data['id']); },
}, err => {
err => { // this._logger.error(err);
// this._logger.error(err); User.logined = false;
User.logined = false; window.location.href = document.location.origin + '/users/login?next=' + document.location.pathname + document.location.search;
window.location.href = document.location.origin + '/users/login?next=' + document.location.pathname + document.location.search; // this._router.navigate(['login']);
// this._router.navigate(['login']); },
}, // () => {
// () => { // if (User.logined) {
// if (User.logined) { // if (document.location.pathname === '/login') {
// if (document.location.pathname === '/login') { // this._router.navigate(['']);
// this._router.navigate(['']); // } else {
// } else { // this._router.navigate([document.location.pathname]);
// this._router.navigate([document.location.pathname]); // }
// } // } else {
// } else { // this._router.navigate(['login']);
// this._router.navigate(['login']); // }
// } // jQuery('angular2').show();
// jQuery('angular2').show(); // }
// } );
);
}
} }
} }
} else {
this._router.navigate(['FOF']);
// jQuery('angular2').show();
} }
} }
browser() { else {
this._http.report_browser(); this;
} .
_router;
.
getQueryString(name) { navigate(['FOF']);
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
const r = window.location.search.substr(1).match(reg); // jQuery('angular2').show();
if (r != null) { }
return unescape(r[2]); }
}
return null; browser();
{
this._http.report_browser();
}
getQueryString(name);
{
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
const r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
} }
return null;
}
// //
// //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment