gx

@@ -83,15 +83,5 @@ class ATemplateModuleController extends BaseController
         $this->response('success');
     }
 
-    /**
-     * @remark :获取所有模块类型
-     * @name   :getType
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/29 14:41
-     */
-    public function getType(ATemplateModuleLogic $ATemplateModuleLogic){
-        $list = $ATemplateModuleLogic->ModuleType($this->map);
-        $this->response('success',Code::SUCCESS,$list);
-    }
+
 }

@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers\Aside\Template;
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Template\ATemplateModuleLogic;
 use App\Http\Logic\Aside\Template\ATemplateTypeLogic;
 use App\Http\Requests\Aside\Template\ATemplateTypeRequest;
 
@@ -15,6 +17,18 @@ use App\Http\Requests\Aside\Template\ATemplateTypeRequest;
 class ATemplateTypeController extends BaseController
 {
     /**
+     * @remark :获取所有模块类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/29 14:41
+     */
+    public function getType(ATemplateTypeLogic $ATemplateTypeLogic){
+        $list = $ATemplateTypeLogic->ModuleType($this->map);
+        $this->response('success',Code::SUCCESS,$list);
+    }
+
+    /**
      * @remark :设置类型
      * @name   :save
      * @author :lyh
@@ -33,4 +47,21 @@ class ATemplateTypeController extends BaseController
         $ATemplateTypeLogic->typeSave();
         $this->response('success');
     }
+
+    /**
+     * @remark :逻辑删除模块
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/28 16:55
+     */
+    public function del(ATemplateTypeLogic $ATemplateTypeLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $ATemplateTypeLogic->aTemplateTypeDel();
+        $this->response('success');
+    }
 }

@@ -151,7 +151,7 @@ class ATemplateLogic extends BaseLogic
      */
     public function getHeadInfo(){
         $serviceSettingModel = new ServiceSettingModel();
-        $info = $serviceSettingModel->read(['type'=>2,'key'=>'head']);
+        $info = $serviceSettingModel->read(['type'=>2,'key'=>'head'],['id','key','values','created_at']);
         return $this->success($info);
     }
 }

@@ -86,16 +86,5 @@ class ATemplateModuleLogic extends BaseLogic
         return $this->success();
     }
 
-    /**
-     * @remark :获取所有模块类型
-     * @name   :ModuleType
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/29 14:42
-     */
-    public function ModuleType($map){
-        $typeModel = new TemplateType();
-        $lists = $typeModel->list($map);
-        return $this->success($lists);
-    }
+
 }

@@ -38,4 +38,31 @@ class ATemplateTypeLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :获取所有模块类型
+     * @name   :ModuleType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/29 14:42
+     */
+    public function ModuleType($map){
+        $lists = $this->model->list($map);
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :删除模块类型
+     * @name   :aTemplateTypeDel
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/10 16:26
+     */
+    public function aTemplateTypeDel(){
+        $rs = $this->model->del($this->param);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
 }

@@ -241,6 +241,8 @@ Route::group([], function () {
         //设置类型
         Route::prefix('type')->group(function () {
             Route::any('/save', [Aside\Template\ATemplateTypeController::class, 'save'])->name('admin.ATemplateType_save');
+            Route::any('/', [Aside\Template\ATemplateTypeController::class, 'getType'])->name('admin.ATemplateType_getType');
+            Route::any('/del', [Aside\Template\ATemplateTypeController::class, 'del'])->name('admin.ATemplateType_del');
         });
     });
 });