|
| xqd
@@ -11,19 +11,19 @@
|
|
|
msg.loading('登录中...');
|
|
|
userService.wechat_login(response.code).then(function(result){
|
|
|
msg.hide();
|
|
|
- alert("wechat_login success: " + JSON.stringify(result));
|
|
|
- if(result.data.data){
|
|
|
+ // alert("wechat_login success: " + JSON.stringify(result));
|
|
|
+ if(result.data.data.user){
|
|
|
storage.setObject('user', result.data.data.user);
|
|
|
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');
|
|
|
}else{
|
|
|
- $state.go("loginAccount",{wechat:result.openid})
|
|
|
+ $state.go("loginAccount",{wechat:result.data.data.openid})
|
|
|
}
|
|
|
},function(error){
|
|
|
console.log("loginbywx Failed: " + JSON.stringify(error));
|
|
|
- $state.go("loginAccount",{wechat:$scope.wecaht});
|
|
|
+ $state.go("loginAccount");
|
|
|
});
|
|
|
}
|
|
|
}, function (error) {
|
Mike