正在显示
2 个修改的文件
包含
28 行增加
和
3 行删除
| @@ -16,6 +16,7 @@ use App\Models\Template\Setting; | @@ -16,6 +16,7 @@ use App\Models\Template\Setting; | ||
| 16 | use App\Models\Template\BTemplate; | 16 | use App\Models\Template\BTemplate; |
| 17 | use App\Models\Template\BTemplateLog; | 17 | use App\Models\Template\BTemplateLog; |
| 18 | use App\Models\Template\Template; | 18 | use App\Models\Template\Template; |
| 19 | +use App\Models\Template\TemplateTypeMain; | ||
| 19 | use Illuminate\Support\Facades\Cache; | 20 | use Illuminate\Support\Facades\Cache; |
| 20 | use Illuminate\Support\Facades\DB; | 21 | use Illuminate\Support\Facades\DB; |
| 21 | use mysql_xdevapi\Exception; | 22 | use mysql_xdevapi\Exception; |
| @@ -170,7 +171,7 @@ class BTemplateLogic extends BaseLogic | @@ -170,7 +171,7 @@ class BTemplateLogic extends BaseLogic | ||
| 170 | $bTemplateMainModel = new BTemplateMain(); | 171 | $bTemplateMainModel = new BTemplateMain(); |
| 171 | $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$type]); | 172 | $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$type]); |
| 172 | if($mainInfo === false){ | 173 | if($mainInfo === false){ |
| 173 | - $data['main_html'] = "<main>{$this->getModule($type)}</main>"; | 174 | + $data['main_html'] = $this->getModule($type); |
| 174 | $data['main_css'] = "<style id='globalsojs-styles'></style>"; | 175 | $data['main_css'] = "<style id='globalsojs-styles'></style>"; |
| 175 | }else{ | 176 | }else{ |
| 176 | $data['main_html'] = $mainInfo['main_html']; | 177 | $data['main_html'] = $mainInfo['main_html']; |
| @@ -449,8 +450,8 @@ class BTemplateLogic extends BaseLogic | @@ -449,8 +450,8 @@ class BTemplateLogic extends BaseLogic | ||
| 449 | */ | 450 | */ |
| 450 | public function getModule($type){ | 451 | public function getModule($type){ |
| 451 | //获取公共主题头部底部 | 452 | //获取公共主题头部底部 |
| 452 | - $serviceSettingModel = new ServiceSettingModel(); | ||
| 453 | - $info = $serviceSettingModel->read(['type'=>$type]); | 453 | + $mainModel = new TemplateTypeMain(); |
| 454 | + $info = $mainModel->read(['type'=>$type]); | ||
| 454 | return $info['main_html']; | 455 | return $info['main_html']; |
| 455 | } | 456 | } |
| 456 | 457 |
app/Models/Template/TemplateTypeMain.php
0 → 100644
| 1 | +<?php | ||
| 2 | +/** | ||
| 3 | + * @remark : | ||
| 4 | + * @name :TemplateTypeMain.php | ||
| 5 | + * @author :lyh | ||
| 6 | + * @method :post | ||
| 7 | + * @time :2023/10/27 17:49 | ||
| 8 | + */ | ||
| 9 | + | ||
| 10 | +namespace App\Models\Template; | ||
| 11 | + | ||
| 12 | +use App\Models\Base; | ||
| 13 | + | ||
| 14 | +/** | ||
| 15 | + * @remark :默认数据main详情表 | ||
| 16 | + * @name :TemplateTypeMain | ||
| 17 | + * @author :lyh | ||
| 18 | + * @method :post | ||
| 19 | + * @time :2023/10/27 17:49 | ||
| 20 | + */ | ||
| 21 | +class TemplateTypeMain extends Base | ||
| 22 | +{ | ||
| 23 | + protected $table = 'gl_template_type_main'; | ||
| 24 | +} |
-
请 注册 或 登录 后发表评论