Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/js/controllers/account.js

@@ -29,7 +29,6 @@
                  //}, function (error) {
                  //   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) {

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

@@ -203,15 +203,17 @@ class AuthController extends Controller
         \Log::info('openid: ' . $openid);
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
         \Log::info($user);
-        if (empty($user)) {
+        if (empty($user)||$user->phone=='') {
             \Log::info('empty: ' . empty($user));
-            UserInfoModel::create([
-                'wechat'=>$openid,
-                'nickname'=>$userInfo['nickname'],
-                'nickname'=>$userInfo['avatar'],
-                'status'=>1,
-                'password'=>bcrypt(123456)
-            ]);
+            if(empty($user)){
+                UserInfoModel::create([
+                    'wechat'=>$openid,
+                    'nickname'=>$userInfo['nickname'],
+                    'avatar'=>$userInfo['headimgurl'],
+                    'status'=>1,
+                    'password'=>bcrypt(123456)
+                ]);
+            }
             return $this->api(['openid' => $openid]);
         }else{
             $token = $user->createToken($user->phone)->accessToken;