Merge remote-tracking branch 'origin/develop' into akun

@@ -27,6 +27,18 @@ class BTemplateModuleController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取详情
+     * @name   :read
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/17 15:30
+     */
+    public function read(BTemplateModuleLogic $BTemplateModuleLogic){
+        $info = $BTemplateModuleLogic->moduleRead();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取所有模块类型
      * @remark :获取所有模块类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh

@@ -30,6 +30,18 @@ class BTemplateModuleLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取模版详情
+     * @name   :moduleRead
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/17 15:36
+     */
+    public function moduleRead(){
+        $info = $this->model->read($this->param);
+        return $this->success($info);
+    }
+
+    /**
      * @remark :获取所有模块类型
      * @remark :获取所有模块类型
      * @name   :ModuleType
      * @name   :ModuleType
      * @author :lyh
      * @author :lyh

@@ -233,7 +233,12 @@ class CustomTemplateLogic extends BaseLogic
                 $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
                 $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
         }else{
         }else{
             //兼容老数据，获取首页数据
             //兼容老数据，获取首页数据
-            $TemplateInfo = $this->webTemplateInfo($info['template_id'],1,0);
+            $TemplateInfo = (new BTemplate())->read([
+                'template_id'=>$info['template_id'],
+                'source'=>1,
+                'project_id'=>$this->user['project_id'],
+                'source_id'=>0,
+            ]);;
             if($TemplateInfo !== false){
             if($TemplateInfo !== false){
                 $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s',$html_style , $TemplateInfo['html']);
                 $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s',$html_style , $TemplateInfo['html']);
                 //内容
                 //内容

@@ -294,6 +294,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::prefix('module')->group(function () {
         Route::prefix('module')->group(function () {
             //获取所有左侧模版
             //获取所有左侧模版
             Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'lists'])->name('template_module_lists');
             Route::any('/', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'lists'])->name('template_module_lists');
+            Route::any('/read', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'read'])->name('template_module_read');
             Route::any('/type', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'getType'])->name('template_module_getType');
             Route::any('/type', [\App\Http\Controllers\Bside\Template\BTemplateModuleController::class, 'getType'])->name('template_module_getType');
         });
         });