Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -555,19 +555,21 @@ class Auth extends BaseController
 //            Db::name("MarketingUser") -> insert($data);
 //        }
 
-        return app('json')->success($repository->returnToken($user, $tokenInfo));
+        $result = $repository->returnToken($user, $tokenInfo);
+        $result['uid'] = $user->uid;
+
+        return app('json')->success($result);
+
     }
     /**
      * 绑定邀请人
      */
     public function bindSpread(UserRepository $repository)
     {
-        $data = $this->request->params(['spread_phone']);
-        $user = $this->request->user();
-        if (!$user || empty($user->uid)) {
-            return app('json')->fail('用户未登录');
-        }
-        $uid = $user->uid;
+        $data = $this->request->params(['uid','spread_phone']);
+
+        $user=$repository->accountByUser($data['uid']);
+        $uid=$user['uid'];
 
         if (empty($data['spread_phone'])) {
             return app('json')->fail('推荐人手机号不能为空');