add

miaomiao/www/js/controllers/account.js

@@ -3,34 +3,34 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
             //$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('登录中...');
-                //        msg.loading();
-                //        userService.wechat_login(response.code).then(function(result){
-                //            msg.hide();
-                //             // 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);
-                //                $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                //                $scope.user=storage.getObject('user');
-                //                $state.go('app.home');
-                //            }else{
-                //                $state.go("loginAccount",{wechat:response.code})
-                //            }
-                //        },function(error){
-                //             console.log("loginbywx Failed: " + JSON.stringify(error));
-                //            $state.go("loginAccount",{wechat:$scope.wecaht});
-                //        });
-                //    }
-                // }, function (error) {
-                //    console.log("Failed: " + JSON.stringify(error));
-                // })
-                $state.go("loginAccount",{wechat:1231});
+                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('登录中...');
+                       msg.loading();
+                       userService.wechat_login(response.code).then(function(result){
+                           msg.hide();
+                            // 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);
+                               $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                               $scope.user=storage.getObject('user');
+                               $state.go('app.home');
+                           }else{
+                               $state.go("loginAccount",{wechat:response.code})
+                           }
+                       },function(error){
+                            console.log("loginbywx Failed: " + JSON.stringify(error));
+                           $state.go("loginAccount",{wechat:$scope.wecaht});
+                       });
+                   }
+                }, function (error) {
+                   console.log("Failed: " + JSON.stringify(error));
+                })
+                // $state.go("loginAccount",{wechat:1231});
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",