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

GXgeo设置



查看合并请求 !2271

@@ -12,6 +12,8 @@ namespace App\Http\Controllers\Bside\Geo;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Geo\GeoQuestionResLogic;
+use App\Models\Geo\GeoPlatform;
+use App\Models\Geo\GeoQuestion;
 use Illuminate\Http\Request;
 
 /**
@@ -28,6 +30,21 @@ class GeoQuestionResController extends BaseController
         parent::__construct($request);
         $this->logic = new GeoQuestionResLogic();
     }
+    /**
+     * @remark :获取类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/3 10:47
+     */
+    public function getType(){
+        $questionModel = new GeoQuestion();
+        $data['type'] = $questionModel->brandType();
+        $data['frequency'] = $questionModel->frequency;
+        $geoPlatformModel = new GeoPlatform();
+        $data['platform'] = $geoPlatformModel->getList();
+        return $this->success($data);
+    }
 
     /**
      * @remark :获取列表数据

@@ -39,21 +39,6 @@ class GeoLogic extends BaseLogic
     }
 
     /**
-     * @remark :获取类型
-     * @name   :getType
-     * @author :lyh
-     * @method :post
-     * @time   :2025/7/3 10:47
-     */
-    public function getType(){
-        $data['type'] = $this->model->brandType();
-        $data['frequency'] = $this->model->frequency;
-        $geoPlatformModel = new GeoPlatform();
-        $data['platform'] = $geoPlatformModel->getList();
-        return $this->success($data);
-    }
-
-    /**
      * @remark :获取问题列表
      * @name   :getGeoQuestionList
      * @author :lyh

@@ -556,7 +556,6 @@ Route::middleware(['aloginauth'])->group(function () {
     //geo设置
     Route::prefix('geo')->group(function () {
         Route::any('/setGeoStatus', [Aside\Geo\GeoQuestionController::class, 'setGeoStatus'])->name('admin.geo_setGeoStatus');//开启与关闭geo设置
-        Route::any('/getType', [Aside\Geo\GeoQuestionController::class, 'getType'])->name('admin.geo_getType');//geo设置类型
         Route::prefix('question')->group(function () {
             Route::any('/getGeoQuestionList', [Aside\Geo\GeoQuestionController::class, 'getGeoQuestionList'])->name('admin.geo_question_getGeoQuestionList');
             Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion');

@@ -753,6 +753,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('geo_result')->group(function () {
         Route::any('/getList', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class,'getList'])->name('geo_result_getList');
         Route::any('/getInfo', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class,'getInfo'])->name('geo_result_getInfo');
+        Route::any('/getType', [\App\Http\Controllers\Bside\Geo\GeoQuestionResController::class, 'getType'])->name('geo_result_getType');//geo设置类型
     });
 });
 //无需登录验证的路由组