Merge remote-tracking branch 'origin/master'

@@ -94,6 +94,7 @@ class User extends Api
     "time": "1553839125",
     "time": "1553839125",
     "data": {
     "data": {
     "token": "token",//登录唯一标识
     "token": "token",//登录唯一标识
+    "avatar": "头像"
     },
     },
     })
     })
      */
      */
@@ -160,7 +161,7 @@ class User extends Api
                 ->where('openid', $openid)
                 ->where('openid', $openid)
                 ->where('app_id', $appId)
                 ->where('app_id', $appId)
                 ->update($userData);
                 ->update($userData);
-            $this->success("登录成功!", ['token' => $token]);
+            $this->success("登录成功!", ['token' => $token, 'avatar' => $wxUserData['avatarUrl']]);
         } else {
         } else {
             if(empty($data['inviter'])){
             if(empty($data['inviter'])){
                 $invite_id = '';
                 $invite_id = '';
@@ -198,7 +199,7 @@ class User extends Api
             if ($userId && $row) {
             if ($userId && $row) {
                 Db::commit();
                 Db::commit();
                 $token = generate_user_token($userId);
                 $token = generate_user_token($userId);
-                $this->success("登录成功!", ['token' => $token]);
+                $this->success("登录成功!", ['token' => $token, 'avatar' => $wxUserData['avatarUrl']]);
             } else {
             } else {
                 Db::rollback();
                 Db::rollback();
                 $this->error('登录失败');
                 $this->error('登录失败');