wesmiler 报恩寺项目提交

app/Http/Controllers/FoxiangController.php

@@ -34,12 +34,5 @@ class FoxiangController extends Backend
         $this->service = new FoxiangService();
     }
 
-    /**
-     * 佛像选项列表
-     * @return array
-     */
-    public function options(){
-        $params = request()->all();
-        return $this->service->getDataList($params);
-    }
+
 }

app/Http/Controllers/GongdengFoxiangController.php

@@ -11,6 +11,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\LampMealsModel;
 use App\Services\GongdengFoxiangService;
 
 /**
@@ -34,4 +35,13 @@ class GongdengFoxiangController extends Backend
         $this->service = new GongdengFoxiangService();
     }
 
+    /**
+     * 佛像选项列表
+     * @return array
+     */
+    public function options(){
+        $params = request()->all();
+        return $this->service->getDataList($params);
+    }
+
 }

app/Http/Controllers/LampMealsController.php

@@ -34,4 +34,12 @@ class LampMealsController extends Backend
         $this->service = new LampMealsService();
     }
 
+
+    /**
+     * 佛像选项列表
+     * @return array
+     */
+    public function options(){
+        return $this->service->getDataList();
+    }
 }

app/Services/GongdengFoxiangService.php

@@ -46,7 +46,18 @@ class GongdengFoxiangService extends BaseService
         $dataList = $this->model::from('gongdeng_foxiang as a')
             ->where(function ($query) use ($params) {
                 $query->where('a.mark', 1);
-                $query->whereIn('a.status',[1,2]);
+
+                $name = isset($params['name']) ? trim($params['name']) : '';
+                if (!empty($name)) {
+                    $query->where('a.name', 'like', "%{$name}%");
+                }
+
+                $status = isset($params['status']) ? $params['status'] : 0;
+                if ($status > 0) {
+                    $query->where('a.status', $status);
+                } else {
+                    $query->whereIn('a.status', [1, 2]);
+                }
             })
             ->orderBy('a.sort', 'asc')
             ->paginate($pageSize);

routes/web.php

@@ -321,6 +321,7 @@ Route::get('/lampmeals/info', [LampMealsController::class, 'info']);
 Route::post('/lampmeals/edit', [LampMealsController::class, 'edit']);
 Route::post('/lampmeals/delete', [LampMealsController::class, 'delete']);
 Route::post('/lampmeals/status', [LampMealsController::class, 'status']);
+Route::post('/lampmeals/options', [LampMealsController::class, 'options']);
 
 // 佛像管理
 Route::get('/foxiang/index', [\App\Http\Controllers\FoxiangController::class, 'index']);
@@ -344,6 +345,7 @@ Route::get('/gongdengfoxiang/info', [\App\Http\Controllers\GongdengFoxiangContro
 Route::post('/gongdengfoxiang/edit', [\App\Http\Controllers\GongdengFoxiangController::class, 'edit']);
 Route::post('/gongdengfoxiang/delete', [\App\Http\Controllers\GongdengFoxiangController::class, 'delete']);
 Route::post('/gongdengfoxiang/status', [\App\Http\Controllers\GongdengFoxiangController::class, 'status']);
+Route::post('/gongdengfoxiang/options', [\App\Http\Controllers\GongdengFoxiangController::class, 'options']);
 
 // 供灯订单
 Route::get('/gdorders/index', [\App\Http\Controllers\GongdengOrderController::class, 'index']);