wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/GongdengController.php

@@ -55,7 +55,7 @@ class GongdengController extends BaseController
      * @return mixed
      */
     public function fxList(){
-        return $this->fxService->getList();
+        return $this->fxService->getDataList();
     }
 
     /**

app/Http/Controllers/FoxiangController.php

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

app/Services/GongdengFoxiangService.php

@@ -46,6 +46,41 @@ 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]);
+            })
+            ->orderBy('a.sort', 'asc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+            }
+            unset($item);
+        }
+
+        return [
+            'code' => 0,
+            'success'=> true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
+    }
+
+    /**
+     * 列表
+     * @return array
+     */
+    public function getDataList(){
+        $params = request()->all();
+        $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+
+        $dataList = $this->model::from('gongdeng_foxiang as a')
+            ->where(function ($query) use ($params) {
+                $query->where('a.mark', 1);
                 $query->where('a.status',1);
             })
             ->orderBy('a.sort', 'asc')