瀏覽代碼

路由修改

duqinya 6 年之前
父節點
當前提交
c95e75576f
共有 2 個文件被更改,包括 11 次插入7 次删除
  1. 6 2
      app/Repositories/ConfigPickupNodeRepository.php
  2. 5 5
      routes/api.php

+ 6 - 2
app/Repositories/ConfigPickupNodeRepository.php

@@ -20,10 +20,14 @@ class ConfigPickupNodeRepository
         if (isset($request['keyword'])) {
             $this->configPickupNode = $this->configPickupNode
                 ->orderBy('id', 'desc')
+                ->where('city_id', $request['city_id'])
                 ->where(function ($query) use ($request) {
-                    $query->orWhere('name', 'like', "{$request['keyword']}%")
-                        ->orWhere('status', $request['status']);
+                        $query->where('status', 0)
+                        ->orWhere('name', 'like', "{$request['keyword']}%");
                 });
+        }else{
+            $this->configPickupNode = $this->configPickupNode
+                ->orderBy('id', 'desc')->where(['status' => 0,'city_id' => $request['city_id']]);
         }
             return $this->configPickupNode->paginate($page);
 

+ 5 - 5
routes/api.php

@@ -17,16 +17,16 @@ $api->version('v1', [
     'namespace' => 'App\Http\Controllers',
 ], function ($api) {
     $api->post('upload', 'UploadController@uploadImage');
-    // 自提点列表
-    $api->get('/pickupNode/index','ConfigPickupNodeController@index');
-    //获取某自提点
-    $api->post('/pickupNode/getPickupNode','ConfigPickupNodeController@getPickupNode');
+
     //登录+验签
     $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
 
     });
     //仅验签
     $api->group(['middleware' => 'chxq_sign'], function ($api) {
-
+        //自提点列表
+        $api->get('/pickupNode/index','ConfigPickupNodeController@index');
+        //获取某自提点
+        $api->post('/pickupNode/getPickupNode','ConfigPickupNodeController@getPickupNode');
     });
 });