add

miaomiao/www/js/config/config.js

@@ -1,13 +1,8 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-<<<<<<< HEAD
-          //server: 'http://q8.9026.com/',
-          //imgServer: 'http://q8.9026.com/attachment/'
-=======
-          // server: 'http://q8.9026.com/',
-          // imgServer: 'http://q8.9026.com/attachment/'
->>>>>>> d684ce7718047987c6835496179130b948b131a5
+        // server: 'http://q8.9026.com/',
+        // imgServer: 'http://q8.9026.com/attachment/'
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/'
 

miaomiao/www/js/controllers/account.js

@@ -3,33 +3,33 @@
         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('登录中...');
-                //        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'});
+                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'});
 
             }
     }]);