|
@@ -7,9 +7,9 @@
|
|
Wechat.auth(scope, state, function (response) {
|
|
Wechat.auth(scope, state, function (response) {
|
|
// alert("response:"+JSON.stringify(response));
|
|
// alert("response:"+JSON.stringify(response));
|
|
// var response={code:1231};
|
|
// var response={code:1231};
|
|
- if(response.code){
|
|
|
|
|
|
+ if(response.openid){
|
|
msg.loading('登录中...');
|
|
msg.loading('登录中...');
|
|
- userService.wechat_login(response.code).then(function(result){
|
|
|
|
|
|
+ userService.wechat_login(response.openid).then(function(result){
|
|
msg.hide();
|
|
msg.hide();
|
|
// alert("wechat_login success: " + JSON.stringify(result));
|
|
// alert("wechat_login success: " + JSON.stringify(result));
|
|
if(result.data.data){
|
|
if(result.data.data){
|
|
@@ -19,15 +19,15 @@
|
|
$scope.user=storage.getObject('user');
|
|
$scope.user=storage.getObject('user');
|
|
$state.go('app.home');
|
|
$state.go('app.home');
|
|
}else{
|
|
}else{
|
|
- $state.go("loginAccount",{wechat:response.code})
|
|
|
|
|
|
+ $state.go("loginAccount",{wechat:response.openid})
|
|
}
|
|
}
|
|
},function(error){
|
|
},function(error){
|
|
- console.log("loginbywx Failed: " + JSON.stringify(error));
|
|
|
|
|
|
+ alert("loginbywx Failed: " + JSON.stringify(error));
|
|
$state.go("loginAccount",{wechat:$scope.wecaht});
|
|
$state.go("loginAccount",{wechat:$scope.wecaht});
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}, function (error) {
|
|
}, function (error) {
|
|
- console.log("Failed: " + JSON.stringify(error));
|
|
|
|
|
|
+ alert("Failed: " + JSON.stringify(error));
|
|
})
|
|
})
|
|
//$state.go("loginAccount",{wechat:1231});
|
|
//$state.go("loginAccount",{wechat:1231});
|
|
}
|
|
}
|