app/Http/Controllers/Api/NoticeController.php

@@ -7,7 +7,9 @@ use App\Http\Controllers\Controller;
 use App\Models;
 class NoticeController extends Controller
 {
-    //公告
+    /*
+     * 公告
+     */
     public function notice(Request $req){
         $Notice = new Models\Notice;
         $data = $Notice->notice_info();

app/Http/Controllers/Api/UserController.php

@@ -8,19 +8,27 @@ use App\Models;
 class UserController extends Controller
 {
 
-    //
+    /*
+     * 获取登录用户信息
+     */
     function getUserDetails(Request $req){
-        $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);
+        try {
+            $uid = S('token_user_id');
+            $member = new Models\Member;
+            $user = $member
+                ->join('membersDetailed as md', 'md.members_id', 'members.id')
+                ->select('members.*','md.membersDetailed_cash')
+                ->where('members.id',$uid)
+                ->get();
+            if(empty($user)){
+                return toJson(-20002);
+            }
+            $user=$user->toArray();
+            unset($user['password']);
+            unset($user['solt']);
+            return toJson(1,1,$user);
+        } catch (Exception $e) {
+            echo $e->getMessage();
         }
-        $user=$user->toArray();
-        $userdetails = $userdetails->toArray();
-        unset($user['password']);
-        unset($user['solt']);
-        $userdata = array_merge($user,$userdetails);
-        return toJson(1,1,$userdata);
     }
 }