add

miaomiao/config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.miaomiao.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.miaomiao.app" version="0.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
   <description>
         An Ionic Framework and Cordova project.

miaomiao/www/js/controllers/account.js

@@ -3,6 +3,7 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
+<<<<<<< HEAD
                 //var scope = "snsapi_userinfo", state = "_" + (+new Date());
                 //Wechat.auth(scope, state, function (response) {
                 //    // alert("response:"+JSON.stringify(response));
@@ -31,6 +32,35 @@
                 //   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('登录中...');
+                        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'});
+>>>>>>> 12e5208308dc8fe23ee8e47511e275104dcc5c77
             }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

miaomiao/www/js/services/msgservice.js

@@ -32,9 +32,8 @@
                 $ionicLoading.hide()
             },
             loading: function (template) {
-                template = template || "正在加载数据...";
                 $ionicLoading.show({
-                    template: '<ion-spinner class="nerve-loading"></ion-spinner><br>' + template
+                    template: '<ion-spinner class="nerve-loading"></ion-spinner>'
                 });
                 //超时退出
                 setTimeout(function() {

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

@@ -189,9 +189,11 @@ class AuthController extends Controller
         if(!isset($arr['errcode']))$openid = $arr['openid'];
         \Log::info('openid: ' . $openid);
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
+        \Log::info($user);
         if (empty($user)) {
+            \Log::info('empty: ' . empty($user));
 //            return $this->error(ErrorCode::LOGIN_FAILED);
-            return $this->api(compact('openid'));
+            return $this->api(['openid' => $openid]);
         }else{
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'openid','token'));

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

@@ -38,7 +38,7 @@ class Controller extends BaseController
 //        $queries = \DB::getQueryLog();
 //        dd($queries);
 
-        $this->user = Auth::guard('api')->user();
+//        $this->user = Auth::guard('api')->user();
 //        if ($this->_user !== null) {
 //            $this->_user->last_ip = Request::ip();
 //        }

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

@@ -347,7 +347,6 @@ class IndexController extends Controller
     {
         $sex = $request->sex;
         $age = $request->age;
-//        dd($age);
         $area = $request->area;
         $login_user = $this->getUser();
         $id = $login_user->id;

server/routes/api.php

@@ -55,11 +55,11 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
     // Auth
     // signin
     $api->post('auth/login', [
-        'as' => 'auth.login',
+        'as' => 'login',
         'uses' => 'AuthController@login',
     ]);
     $api->get('auth/wechat_login', [
-        'as' => 'auth.wechat_login',
+        'as' => 'wechat_login',
         'uses' => 'AuthController@wechatLogin',
     ]);
     $api->get('auth/logout', [