| xqd
@@ -66,11 +66,11 @@
|
|
|
storage.set('token', result.data.data.token);
|
|
|
$http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
|
|
|
$scope.user=storage.getObject('user');
|
|
|
- $state.go('app.home');
|
|
|
if(localStorage['jpush']){
|
|
|
console.log("jpush: " + localStorage['jpush']);
|
|
|
userService.jpush({ jpush: localStorage['jpush']}).then(function (result) {}, function (error) {});
|
|
|
}
|
|
|
+ $state.go('app.home');
|
|
|
}else{
|
|
|
$state.go("loginAccount",{wechat:result.data.data.openid})
|
|
|
}
|
| xqd
@@ -112,11 +112,11 @@
|
|
|
storage.set('token', result.data.data.token);
|
|
|
$http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
|
|
|
$scope.user=storage.getObject('user');
|
|
|
- $state.go('app.home');
|
|
|
if(localStorage['jpush']){
|
|
|
console.log("jpush: " + localStorage['jpush']);
|
|
|
userService.jpush({ jpush: localStorage['jpush']}).then(function (result) {}, function (error) {});
|
|
|
}
|
|
|
+ $state.go('app.home');
|
|
|
}, function (error) {
|
|
|
|
|
|
});
|