gq 8 yıl önce
ebeveyn
işleme
a4dcd901d9

+ 1 - 1
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -89,7 +89,7 @@ class AuthController extends Controller
 
         if ($request->verify_code != $code)
             return $this->error(ErrorCode::SERVICE_CODE_FAILED);
-
+        session(['tel' => $phone]);
         return $this->api(['verify_code' => $code]);
 
     }

+ 3 - 3
server/app/Http/Controllers/Api/V1/Controller.php

xqd
@@ -18,14 +18,14 @@ class Controller extends BaseController
 
 
     public function __construct() {
-
+/*
         $this->middleware('auth:api', [
             'except' => [
                 'upload', 'getCode', 'reset', 'login', 'get', 'register', 'alipayNotify', 'wechatpayNotify',
-                'get', 'area', 'get_province', 'get_city', 'get_county', 'test',
+                'get', 'area', 'get_province', 'get_city', 'get_county', 'test','/home/index'
 
             ]
-        ]);
+        ]);*/
 
 //        \DB::connection()->enableQueryLog();
 //        $queries = \DB::getQueryLog();

+ 17 - 2
server/app/Http/Controllers/Api/V1/HomeController.php

xqd xqd
@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Models\BaseSettingsModel;
+use App\Models\DreamInfoModel;
+use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
 class HomeController extends Controller
@@ -30,10 +33,22 @@ class HomeController extends Controller
      *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
      */
 
-    public function index()
+    public function index(Request $request)
     {
+//        $tel = $request->session()->get('tel');
+        $a = 1234235434534;
+        return $a;
+        $user = UserInfoModel::where('tel',$tel)->frist();
 //获取轮播图
-
+        $banner = BaseSettingsModel::where([['category' => 'banner'],['status' => '1']])
+            ->orderBy('sort')->limit('3')->get()->toArray();
+//        关注的用户
+       $other_user =  $user->UserCareUser;
+        return $other_user;
+        dd($other_user);
+//        获取其他用户信息 及梦想
+        $user_info = UserInfoModel::orderBy('id')->get()->toArray();
+        $dream = DreamInfoModel::orderBy('created_at')->get()->toArray();
         return $this->error(ErrorCode::SERVICE_CODE_FAILED);
     }
 }

+ 5 - 0
server/app/Models/DreamInfoModel.php

xqd
@@ -40,4 +40,9 @@ class DreamInfoModel extends BaseModel
                            'status'
                           ];
 
+    public function dreamUser()
+    {
+        return $this->belongsToMany('App\Models\UserInfoModel','user_dream','user_id','dream_id');
+    }
+
 }

+ 10 - 0
server/app/Models/UserCareDream.php

xqd
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserCareDream extends Model
+{
+    protected $table = 'user_care_dream';
+}

+ 10 - 0
server/app/Models/UserCareUser.php

xqd
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserCareUser extends Model
+{
+    protected $table = 'user_care_user';
+}

+ 10 - 0
server/app/Models/UserDream.php

xqd
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserDream extends Model
+{
+    protected $table = 'user_dream';
+}

+ 5 - 0
server/app/Models/UserInfoModel.php

xqd
@@ -44,4 +44,9 @@ class UserInfoModel extends BaseModel
                            'remember_token'
                           ];
 
+    public function UserCareUser()
+    {
+        return $this->belongsToMany('App\Models\UserInfoModel','user_care_user','user_id','other_user_id');
+    }
+
 }

+ 1 - 0
server/composer.json

xqd
@@ -7,6 +7,7 @@
     "require": {
         "php": ">=5.6.4",
         "dingo/api": "1.0.x@dev",
+        "doctrine/dbal": "^2.5",
         "laravel/framework": "5.4.*",
         "laravel/passport": "^2.0",
         "laravel/tinker": "~1.0",

+ 32 - 0
server/database/migrations/2017_06_01_071703_altercol_to_user_care_user_table.php

xqd
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AltercolToUserCareUserTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user_care_user', function ($table) {
+            $table->renameColumn('dream_id', 'other_user_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user_care_user', function (Blueprint $table) {
+            //
+        });
+    }
+}