junghwi 6 年之前
父節點
當前提交
6c02e69287
共有 3 個文件被更改,包括 10 次插入7 次删除
  1. 0 1
      app/Http/Controllers/Admin/LoginController.php
  2. 9 5
      app/Http/Controllers/Api/UserController.php
  3. 1 1
      config/app.php

+ 0 - 1
app/Http/Controllers/Admin/LoginController.php

@@ -1,7 +1,6 @@
 <?php
 
 namespace App\Http\Controllers\Admin;
-
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

+ 9 - 5
app/Http/Controllers/Api/UserController.php

@@ -4,19 +4,23 @@ namespace App\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-
+use App\Models;
 class UserController extends Controller
 {
+
     //
     function getUserDetails(Request $req){
-        $uid=S('token_user_id');
-        $user=\App\Models\Member::where('id',$uid)->first();
-        if(!$user){
+        $uid = S('token_user_id');
+        $user = Models\Member::where('id',$uid)->first();
+        $userdetails = Models\MembersDetailed::where('members_id',$uid)->first();
+        if(!$user||!$userdetails){
             return toJson(-20002);
         }
         $user=$user->toArray();
+        $userdetails = $userdetails->toArray();
         unset($user['password']);
         unset($user['solt']);
-        return toJson($user);
+        $userdata = array_merge($user,$userdetails);
+        return toJson($userdata);
     }
 }

+ 1 - 1
config/app.php

@@ -39,7 +39,7 @@ return [
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => env('APP_DEBUG', true),
 
     /*
     |--------------------------------------------------------------------------