Mike %!s(int64=7) %!d(string=hai) anos
pai
achega
3ef2c29700
Modificáronse 2 ficheiros con 29 adicións e 29 borrados
  1. 26 26
      miaomiao/www/js/controllers/account.js
  2. 3 3
      miaomiao/www/js/controllers/home.js

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

xqd
@@ -4,32 +4,32 @@
             //$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'});
+                // 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'});
 
             }
     }]);

+ 3 - 3
miaomiao/www/js/controllers/home.js

xqd xqd
@@ -3,8 +3,8 @@
         , function ($scope, $ionicTabsDelegate, $http, config, $state, $ionicSlideBoxDelegate, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate, $rootScope) {
         $scope.$on('$ionicView.enter', function () {
             $ionicTabsDelegate.showBar(true);
-            $scope.load(true);
-            $ionicSlideBoxDelegate.start();
+            // $scope.load(true);
+            // $ionicSlideBoxDelegate.start();
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
                 if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
@@ -19,7 +19,7 @@
         });
         $rootScope.$on('msg-new', function (event, msg) {
             //收到新消息
-            alert('收到新消息,改变样式');
+            // alert('收到新消息,改变样式');
             $scope.showMessage = 1;
         });
         $scope.type = 'hot';//tab切换