gx

@@ -37,13 +37,13 @@ class BTemplateController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/7/31 14:27
      * @time   :2024/7/31 14:27
      */
      */
-    public function info(BTemplateLogic $BTemplateLogic){
+    public function publicInfo(BTemplateLogic $BTemplateLogic){
         $this->request->validate([
         $this->request->validate([
             'id'=>'required',
             'id'=>'required',
         ],[
         ],[
             'id.required' => 'id不能为空',
             'id.required' => 'id不能为空',
         ]);
         ]);
-        $info = $BTemplateLogic->getTemplateInfo();
+        $info = $BTemplateLogic->getPublicTemplateInfo();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 

@@ -51,7 +51,14 @@ class BTemplateLogic extends BaseLogic
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 
 
-    public function getTemplateInfo(){
+    /**
+     * @remark :获取模版详情
+     * @name   :getPublicTemplateInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/31 14:31
+     */
+    public function getPublicTemplateInfo(){
         $templateModel = new Template();
         $templateModel = new Template();
         $info = $templateModel->read($this->param);
         $info = $templateModel->read($this->param);
         return $this->success($info);
         return $this->success($info);

@@ -126,7 +126,9 @@ class CustomTemplateLogic extends BaseLogic
             if($bSettingInfo === false){
             if($bSettingInfo === false){
                 $this->fail('请先选择模版');
                 $this->fail('请先选择模版');
             }
             }
-            $this->saveCommonTemplate($html,$bSettingInfo['template_id']);
+            if(!isset($this->param['template_status'])){
+                $this->saveCommonTemplate($html,$bSettingInfo['template_id']);
+            }
             $this->param['html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
             $this->param['html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
             $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
             $this->param['html_style'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
         }
         }

@@ -356,6 +356,7 @@ 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('/publicInfo', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'publicInfo'])->name('template_publicInfo');
         //获取选中的主题模版
         //获取选中的主题模版
         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');
         Route::any('/getTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getTemplate'])->name('template_getTemplate');
         Route::any('/getTemplate', [\App\Http\Controllers\Bside\Template\BTemplateController::class, 'getTemplate'])->name('template_getTemplate');