合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3081

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\SettingFaqLogic;
 use App\Http\Logic\Bside\Setting\SettingFaqLogic;
+use App\Models\RouteMap\RouteMap;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 class SettingFaqController extends BaseController
 class SettingFaqController extends BaseController
@@ -24,6 +25,18 @@ class SettingFaqController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取所有路由
+     * @name   :getRouteList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:35
+     */
+    public function getRouteList(){
+        $data = $this->logic->getRouteList();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
      * @remark :faq列表页数据
      * @remark :faq列表页数据
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
@@ -37,6 +50,24 @@ class SettingFaqController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取详情
+     * @name   :getInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:28
+     */
+    public function getInfo()
+    {
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $data = $this->logic->getFaqInfo();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
      * @remark :保存faq数据
      * @remark :保存faq数据
      * @name   :saveFaq
      * @name   :saveFaq
      * @author :lyh
      * @author :lyh

@@ -23,6 +23,20 @@ class SettingFaqLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取数据
+     * @name   :getRouteList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:36
+     */
+    public function getRouteList($map = [])
+    {
+        $routeModel = new RouteMap();
+        $list = $routeModel->list($map,'id',['*'],'desc',20);
+        return $this->success($list);
+    }
+
+    /**
      * @remark :获取列表页数据
      * @remark :获取列表页数据
      * @name   :getFaqLists
      * @name   :getFaqLists
      * @author :lyh
      * @author :lyh
@@ -36,6 +50,18 @@ class SettingFaqLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取详情数据
+     * @name   :getFaqById
+     * @author :lyh
+     * @method :post
+     * @time   :2025/10/30 09:29
+     */
+    public function getFaqInfo(){
+        $data = $this->model->read($this->param);
+        return $this->success($data);
+    }
+
+    /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :saveFaq
      * @name   :saveFaq
      * @author :lyh
      * @author :lyh

@@ -9,9 +9,16 @@
 
 
 namespace App\Models\WebSetting;
 namespace App\Models\WebSetting;
 
 
+use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 
 
 class SettingFaq extends Base
 class SettingFaq extends Base
 {
 {
     protected $table = 'gl_setting_faq';
     protected $table = 'gl_setting_faq';
+
+    public function getQaAttribute($value)
+    {
+        $value = Arr::s2a($value);
+        return $value;
+    }
 }
 }

@@ -772,8 +772,10 @@ Route::middleware(['bloginauth'])->group(function () {
     //faq渲染数据
     //faq渲染数据
     Route::prefix('faq')->group(function () {
     Route::prefix('faq')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'lists'])->name('faq_lists');
         Route::any('/', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'lists'])->name('faq_lists');
+        Route::any('/getRouteList', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getRouteList'])->name('faq_getRouteList');
         Route::any('/saveFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'saveFaq'])->name('faq_saveFaq');
         Route::any('/saveFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'saveFaq'])->name('faq_saveFaq');
         Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
         Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
+        Route::any('/getInfo', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getInfo'])->name('faq_getInfo');
     });
     });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组