Mike před 7 roky
rodič
revize
e7aac1dd23

+ 31 - 29
miaomiao/www/js/controllers/account.js

xqd
@@ -4,35 +4,37 @@
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                userService.isTest().then(function(result){
-                    Wechat.auth(scope, state, function (response) {
-                        // alert("response:"+JSON.stringify(response));
-                        // var response={code:1231};
-                       if(response.code){
-                           msg.loading('登录中...');
-                           userService.wechat_login(response.code).then(function(result){
-                               msg.hide();
-                                // 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.data.data.openid})
-                               }
-                           },function(error){
-                                console.log("loginbywx Failed: " + JSON.stringify(error));
-                               $state.go("loginAccount");
-                           });
-                       }
-                    }, function (error) {
-                       console.log("Failed: " + JSON.stringify(error));
-                    })
-                }, function (error) {
-                    $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                })
+                userService.isTest().then(function(res){
+                    if(res.data.data){
+                        Wechat.auth(scope, state, function (response) {
+                            // alert("response:"+JSON.stringify(response));
+                            // var response={code:1231};
+                           if(response.code){
+                               msg.loading('登录中...');
+                               userService.wechat_login(response.code).then(function(result){
+                                   msg.hide();
+                                    // 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.data.data.openid})
+                                   }
+                               },function(error){
+                                    console.log("loginbywx Failed: " + JSON.stringify(error));
+                                   $state.go("loginAccount");
+                               });
+                           }
+                        }, function (error) {
+                           console.log("Failed: " + JSON.stringify(error));
+                        })
+                    }else{
+                        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                    }
+                } )
 
             }
     }]);

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

xqd
@@ -21,8 +21,8 @@ class AuthController extends Controller
     private $expireTimeExist     = 24*60;
 
     public function test(){
-        return $this->error(0);
-//        return $this->api(['test' => 'test']);
+//        return $this->error(0);
+        return $this->api(1);
     }
     /**
      * @api {post} /api/auth/login 登陆(login)