Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/config-manage into develop

app/Http/Controllers/ConfigController.php

@@ -72,6 +72,12 @@ class ConfigController extends Controller
                     '3' => '区县district',
                     '4' => '街道street',
                 ],
+                //链接方式
+                'link_type' => [
+                    '1' => '专题',
+                    '0' => '仅展示',
+                    '2' => '链接',
+                ],
         ];
     }
 }

app/Http/Controllers/ConfigPickupNodeController.php

@@ -40,7 +40,10 @@ class ConfigPickupNodeController extends BaseController
         $data = $fractal->createData($resource)->toArray();
         $data['extra'] = [
             'filters' => [
-                'id'
+                'id',
+                'name',
+                'city_id',
+                'status'
             ],
             'columns' => [
                 'id',

app/Repositories/ConfigPickupNodeRepository.php

@@ -23,6 +23,18 @@ class ConfigPickupNodeRepository {
             $where[] = ['id', '=', $request['id']];
         }
 
+        if(isset($request['name'])){
+            $where[] = ['name', 'like', "%{$request['name']}%"];
+
+        }
+
+        if(isset($request['city_id'])){
+            $where[] = ['city_id', '=', $request['city_id']];
+        }
+
+        if(isset($request['status'])){
+            $where[] = ['status', '=', $request['status']];
+        }
         return $this->configPickupNode->where($where)->paginate($perPage);
 
     }