gx

@@ -222,4 +222,26 @@ class ATemplateController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
+
+    /**
+     * @remark :私有公共模板详情
+     * @name   :getProjectPublicTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/28 16:34
+     */
+    public function getProjectPublicTemplate(ATemplateLogic $aTemplateLogic){
+        $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
+        $this->map['project_id'] = ['!=',0];
+        $this->map['deleted_status'] = 0;
+        $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['image_link'] = getImageUrl($v['image']);
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
 }
 }

@@ -150,41 +150,4 @@ class BTemplateController extends BaseController
         $this->response('success');
         $this->response('success');
     }
     }
 
 
-    /**
-     * @remark :获取私有模块列表
-     * @name   :getProjectPublicTemplate
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/27 14:57
-     */
-    public function getProjectPublicTemplate(BTemplate $BTemplate){
-        $filed = ['*'];
-        $this->map['project_id'] = ['!=',0];
-        $this->map['deleted_status'] = 0;
-        $lists = $BTemplate->lists($this->map,$this->page,$this->row,$this->order,$filed);
-        if(!empty($lists) && !empty($lists['list'])){
-            foreach ($lists['list'] as $k => &$v){
-                $v['image_link'] = getImageUrl($v['image']);
-                $lists['list'][$k] = $v;
-            }
-        }
-        $this->response('success',Code::SUCCESS,$lists);
-    }
-
-    /**
-     * @remark :删除测试模版
-     * @name   :delTemplate
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/27 15:06
-     */
-    public function delTemplate(BTemplateLogic $bTemplateLogic){
-        $this->request->validate([
-            'id'=>'required',
-        ],[
-            'id.required' => '主键不能为空',
-        ]);
-        $bTemplateLogic->delTemplate();
-        $this->response('success');
-    }
 }
 }

@@ -630,19 +630,4 @@ class BTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
-
-    /**
-     * @remark :删除测试模版
-     * @name   :delTemplate
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/27 15:08
-     */
-    public function delTemplate(){
-        $rs = $this->model->edit(['deleted_status'=>1,'deleted_at'=>date('Y-m-d H:i:s')],['id'=>$this->param['id']]);
-        if($rs === false){
-            $this->fail('系统错误，请联系管理员');
-        }
-        return $this->success();
-    }
 }
 }

@@ -311,6 +311,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('admin.template_setHeadFooter');
         Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('admin.template_setHeadFooter');
         Route::any('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('admin.template_getHeadFooter');
         Route::any('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('admin.template_getHeadFooter');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
+        Route::any('/getProjectPublicTemplate', [Aside\Template\ATemplateController::class, 'getProjectPublicTemplate'])->name('admin.template_getProjectPublicTemplate');
         // 左侧模块
         // 左侧模块
         Route::prefix('module')->group(function () {
         Route::prefix('module')->group(function () {
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');

@@ -302,10 +302,6 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('template')->group(function () {
     Route::prefix('template')->group(function () {
         //获取所有公共主题模版
         //获取所有公共主题模版
         Route::any('/publicTemplateLists', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'publicTemplateLists'])->name('template_publicTemplateLists');
         Route::any('/publicTemplateLists', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'publicTemplateLists'])->name('template_publicTemplateLists');
-        //获取测试模版
-        Route::any('/getProjectPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getProjectPublicTemplate'])->name('template_getProjectPublicTemplate');
-        //删除测试模版
-        Route::any('/delTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'delTemplate'])->name('template_delTemplate');
         //获取选中的主题模版
         //获取选中的主题模版
         Route::any('/getPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getPublicTemplate'])->name('template_getPublicTemplate');
         Route::any('/getPublicTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getPublicTemplate'])->name('template_getPublicTemplate');
         //保存修改后的模版
         //保存修改后的模版