add

miaomiao/www/js/controllers/account.js

@@ -4,32 +4,35 @@
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
-                // 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));
-                // })
-                $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                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'});
+                })
 
             }
     }]);

miaomiao/www/js/services/userservice.js

@@ -21,7 +21,12 @@
                     data: { phone: mobile}
                 })
             },
-
+            isTest: function () {
+                return $http({
+                    url: config.server + 'api/test',
+                    method: "get",
+                })
+            },
             isLogin: function () {
              return !util.empty(storage.get("token")) && storage.getObject("user");
             }

server/app/Http/Controllers/Api/V1/AuthController.php

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