Mike hace 7 años
padre
commit
fcf9c644db

+ 6 - 6
miaomiao/www/js/controllers/account.js

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

+ 1 - 0
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -191,6 +191,7 @@ class AuthController extends Controller
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
         if (empty($user)) {
 //            return $this->error(ErrorCode::LOGIN_FAILED);
+            return $this->api(compact('openid'));
         }else{
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'openid','token'));