gx

@@ -75,6 +75,18 @@ class BTemplateController extends BaseController
     }
 
     /**
+     * @remark :可视化装修数据类型设置
+     * @name   :moduleSetting
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/17 15:55
+     */
+    public function getModuleTypes(BTemplateLogic $BTemplateLogic){
+        $list = $BTemplateLogic->getModuleTypes();
+        $this->response('success',Code::SUCCESS,$list);
+    }
+
+    /**
      * @remark :公共主题设置公共head
      * @name   :setHead
      * @author :lyh

@@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Blog\Blog;
 use App\Models\Blog\BlogCategory;
 use App\Models\CustomModule\CustomModule;
+use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\News\News;
 use App\Models\News\NewsCategory;
 use App\Models\Product\Category;
@@ -708,9 +709,14 @@ class BTemplateLogic extends BaseLogic
         $moduleModel = new CustomModule();
         $moduleList = $moduleModel->list(['status'=>0]);
         foreach ($moduleList as $v){
-            $data[] = ['id'=>'custom-'.$v['id'],'name'=>$v['name'],'category'=>[["id"=>"all", "name"=>"全部",], ["id"=>"new", "name"=>"最新"]]];
+            $moduleCategory = $this->getCategoryList((new CustomModuleCategory()));
+            $categoryList = [["id"=>"all", "name"=>"全部"], ["id"=>"new", "name"=>"最新"]];
+            foreach ($moduleCategory as $values){
+                $categoryList[] = $values;
+            }
+            $data[] = ['id'=>'custom-'.$v['id'],'name'=>$v['name'],'category'=>$categoryList];
         }
-
+        return $this->success($data);
     }
 
     /**

@@ -310,6 +310,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'save'])->name('template_save');
         //可视化保存获取数据类型
         Route::any('/getTypeSetting', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getTypeSetting'])->name('template_getTypeSetting');
+        Route::any('/getModuleTypes', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getModuleTypes'])->name('template_getModuleTypes');
         Route::any('/getHeadFooter', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getHeadFooter'])->name('template_getHeadFooter');
         Route::any('/setHeadFooter', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'setHeadFooter'])->name('template_setHeadFooter');
         Route::any('/savePublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'savePublicTemplate'])->name('template_savePublicTemplate');