wzq 5 vuotta sitten
vanhempi
commit
f3601ce091

+ 13 - 1
app/Http/Controllers/V1/PostController.php

@@ -32,11 +32,23 @@ class PostController extends Controller
      */
     public function suggestPost(Request $request)
     {
-        $purchaseList = $this->postRepositories->suggestPost($request->all());
+        $param = $request->all();
+        $purchaseList = $this->postRepositories->suggestPost($param);
         $fractal = new Manager();
         $resource = new Collection($purchaseList, new SuggestTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($purchaseList));
         $data = $fractal->createData($resource)->toArray();
+
+        if(!(isset($param['current_page']) && $param['current_page'] > 1)){
+            $newData = [];
+            foreach($data['data'] as $key => $val){
+                $newData[] = $val;
+                if($key == 3){
+                    $newData[] = ['type' => 1];
+                }
+            }
+            $data['data'] = $newData;
+        }
         return jsonSuccess($data);
     }
 }

app/Behavior.php → app/Models/Behavior.php


app/BindPhoneRecord.php → app/Models/BindPhoneRecord.php


app/BindWxRecord.php → app/Models/BindWxRecord.php


app/CommentAccountRecord.php → app/Models/CommentAccountRecord.php


+ 4 - 10
app/Feed.php

@@ -1,22 +1,16 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: wangzhiqiang
- * Date: 2019/4/24
- * Time: 15:21
+ * User: Administrator
+ * Date: 2019/6/15
+ * Time: 13:35
  */
-
 namespace App\Models;
-
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Feed extends Model
 {
-    //
-    use SoftDeletes;
+//
     protected $table = 'feed';
     protected $guarded = [];
-
-
 }

app/GeneralLedgerRecord.php → app/Models/GeneralLedgerRecord.php


+ 4 - 10
app/PostCollect.php

@@ -1,22 +1,16 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: wangzhiqiang
- * Date: 2019/4/24
- * Time: 15:21
+ * User: Administrator
+ * Date: 2019/6/15
+ * Time: 13:35
  */
-
 namespace App\Models;
-
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 class PostCollect extends Model
 {
-    //
-    use SoftDeletes;
+//
     protected $table = 'post_collect';
     protected $guarded = [];
-
-
 }

+ 4 - 10
app/PostLike.php

@@ -1,22 +1,16 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: wangzhiqiang
- * Date: 2019/4/24
- * Time: 15:21
+ * User: Administrator
+ * Date: 2019/6/15
+ * Time: 13:35
  */
-
 namespace App\Models;
-
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
 
 class PostLike extends Model
 {
-    //
-    use SoftDeletes;
+//
     protected $table = 'post_like';
     protected $guarded = [];
-
-
 }

app/RegisteredAccountsRecord.php → app/Models/RegisteredAccountsRecord.php


app/ReleaseRecord.php → app/Models/ReleaseRecord.php


+ 0 - 22
app/Post.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: wangzhiqiang
- * Date: 2019/4/24
- * Time: 15:21
- */
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class Post extends Model
-{
-    //
-    use SoftDeletes;
-    protected $table = 'post';
-    protected $guarded = [];
-
-
-}

+ 0 - 22
app/PostData.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: wangzhiqiang
- * Date: 2019/4/24
- * Time: 15:21
- */
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class PostData extends Model
-{
-    //
-    use SoftDeletes;
-    protected $table = 'post_data';
-    protected $guarded = [];
-
-
-}

+ 1 - 0
app/Transformers/Post/SuggestTransformer.php

@@ -17,6 +17,7 @@ class SuggestTransformer extends TransformerAbstract
     public function transform(Post $post)
     {
         return [
+            'type' => 0,
             'id' => $post['id'],
         ];
     }