合并分支 'Branch_liuzhen' 到 'master'

登录接口新增返回头像



查看合并请求 !10

@@ -94,6 +94,7 @@ class User extends Api
     "time": "1553839125",
     "time": "1553839125",
     "data": {
     "data": {
     "token": "token",//登录唯一标识
     "token": "token",//登录唯一标识
+    "avatar": "头像"
     },
     },
     })
     })
      */
      */
@@ -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('登录失败');