Mike 7 年之前
父節點
當前提交
6b68016c23
共有 2 個文件被更改,包括 37 次插入31 次删除
  1. 31 31
      miaomiao/www/js/controllers/account.js
  2. 6 0
      server/app/Http/Controllers/Api/V1/AuthController.php

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

xqd
@@ -30,37 +30,37 @@
                  //   console.log("Failed: " + JSON.stringify(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'});
-                //    }
-                //} )
+                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'});
+                   }
+                } )
 
             }
     }]);

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

xqd
@@ -192,6 +192,12 @@ class AuthController extends Controller
         $arr = json_decode($res, true);
         $openid='';
         if(!isset($arr['errcode']))$openid = $arr['openid'];
+        if(!empty($openid)){
+            $url = "https://api.weixin.qq.com/sns/userinfo?access_token=".$access_token."&openid=".$openid."&lang=zh_CN";
+            $userInfoJson = file_get_contents($url);     //file_get_contents获取指定路由返回的数据
+            $userInfo = json_decode($userInfoJson, true);
+            \Log::info('userInfo: ' . $userInfo);
+        }
         \Log::info('openid: ' . $openid);
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
         \Log::info($user);