3 Комити 2a8fe4c556 ... 2e000196a0

Аутор SHA1 Порука Датум
  junghwi 2e000196a0 Merge branch 'master' of http://git.meme100.com:10180/yigao/qpapi пре 6 година
  junghwi dfcd23d0f9 dsd пре 6 година
  junghwi 6c02e69287 ddd пре 6 година

+ 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;

+ 19 - 0
app/Http/Controllers/Api/NoticeController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+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();
+        if(!$data){
+            return toJson(-1);
+        }
+        return toJson(1,'',$data);
+    }
+}

+ 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(1,1,$userdata);
     }
 }

+ 14 - 0
app/Models/Notice.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Notice extends Model
+{
+    protected $table = 'notice';
+    function notice_info() {
+        $info = $this->select('title','type','content')->get();
+        return $info;
+    }
+}

+ 1 - 1
config/app.php

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