正在显示
7 个修改的文件
包含
32 行增加
和
14 行删除
| @@ -14,7 +14,7 @@ use App\Models\Product\CategoryRelated; | @@ -14,7 +14,7 @@ use App\Models\Product\CategoryRelated; | ||
| 14 | use App\Models\Product\Keyword; | 14 | use App\Models\Product\Keyword; |
| 15 | use App\Models\Product\KeywordRelated; | 15 | use App\Models\Product\KeywordRelated; |
| 16 | use App\Models\Product\Product; | 16 | use App\Models\Product\Product; |
| 17 | -use App\Models\Template\BSetting; | 17 | +use App\Models\Template\Setting; |
| 18 | use App\Models\Template\BTemplate; | 18 | use App\Models\Template\BTemplate; |
| 19 | use App\Models\User\User; | 19 | use App\Models\User\User; |
| 20 | use App\Rules\Ids; | 20 | use App\Rules\Ids; |
| @@ -48,7 +48,7 @@ class ProductController extends BaseController | @@ -48,7 +48,7 @@ class ProductController extends BaseController | ||
| 48 | $cate_data = $this->getCategoryList();//分类 | 48 | $cate_data = $this->getCategoryList();//分类 |
| 49 | $key_data = $this->getKeywordsList();//关键字 | 49 | $key_data = $this->getKeywordsList();//关键字 |
| 50 | //获取当前用户选择的模版 | 50 | //获取当前用户选择的模版 |
| 51 | - $templateSettingModel = new BSetting(); | 51 | + $templateSettingModel = new Setting(); |
| 52 | $info = $templateSettingModel->read(['project_id'=>$this->user['project_id']]); | 52 | $info = $templateSettingModel->read(['project_id'=>$this->user['project_id']]); |
| 53 | $userModel = new User(); | 53 | $userModel = new User(); |
| 54 | foreach ($lists['list'] as $k=>$v){ | 54 | foreach ($lists['list'] as $k=>$v){ |
| @@ -237,7 +237,7 @@ class ProductController extends BaseController | @@ -237,7 +237,7 @@ class ProductController extends BaseController | ||
| 237 | } | 237 | } |
| 238 | $v['status_text'] = Product::statusMap()[$v['status']] ?? ''; | 238 | $v['status_text'] = Product::statusMap()[$v['status']] ?? ''; |
| 239 | //获取当前用户选择的模版 | 239 | //获取当前用户选择的模版 |
| 240 | - $templateSettingModel = new BSetting(); | 240 | + $templateSettingModel = new Setting(); |
| 241 | $templateInfo = $templateSettingModel->read(['project_id'=>$this->user['project_id']]); | 241 | $templateInfo = $templateSettingModel->read(['project_id'=>$this->user['project_id']]); |
| 242 | $v['is_renovation'] = $this->getProductIsRenovation($templateInfo,$v['id']); | 242 | $v['is_renovation'] = $this->getProductIsRenovation($templateInfo,$v['id']); |
| 243 | $v['url'] = $this->user['domain'].$v['route']; | 243 | $v['url'] = $this->user['domain'].$v['route']; |
| @@ -5,7 +5,7 @@ namespace App\Http\Logic\Aside\Template; | @@ -5,7 +5,7 @@ namespace App\Http\Logic\Aside\Template; | ||
| 5 | use App\Http\Logic\Aside\BaseLogic; | 5 | use App\Http\Logic\Aside\BaseLogic; |
| 6 | use App\Models\Service\Service as ServiceSettingModel; | 6 | use App\Models\Service\Service as ServiceSettingModel; |
| 7 | use App\Models\Template\Template; | 7 | use App\Models\Template\Template; |
| 8 | -use App\Models\Template\BSetting; | 8 | +use App\Models\Template\Setting; |
| 9 | use Illuminate\Support\Facades\DB; | 9 | use Illuminate\Support\Facades\DB; |
| 10 | use mysql_xdevapi\Exception; | 10 | use mysql_xdevapi\Exception; |
| 11 | 11 | ||
| @@ -93,7 +93,7 @@ class ATemplateLogic extends BaseLogic | @@ -93,7 +93,7 @@ class ATemplateLogic extends BaseLogic | ||
| 93 | */ | 93 | */ |
| 94 | public function aTemplateDel(){ | 94 | public function aTemplateDel(){ |
| 95 | //查看当前模板是否有模板在使用 | 95 | //查看当前模板是否有模板在使用 |
| 96 | - $BSettingModel = new BSetting(); | 96 | + $BSettingModel = new Setting(); |
| 97 | $info = $BSettingModel->read(['template_id'=>$this->param['id']]); | 97 | $info = $BSettingModel->read(['template_id'=>$this->param['id']]); |
| 98 | if($info !== false){ | 98 | if($info !== false){ |
| 99 | $this->fail('当前模板有项目在使用,不允许删除'); | 99 | $this->fail('当前模板有项目在使用,不允许删除'); |
| @@ -170,7 +170,7 @@ class ATemplateLogic extends BaseLogic | @@ -170,7 +170,7 @@ class ATemplateLogic extends BaseLogic | ||
| 170 | * @time :2023/6/29 9:47 | 170 | * @time :2023/6/29 9:47 |
| 171 | */ | 171 | */ |
| 172 | public function setTemplate(){ | 172 | public function setTemplate(){ |
| 173 | - $bSettingModel = new BSetting(); | 173 | + $bSettingModel = new Setting(); |
| 174 | $info = $bSettingModel->read(['project_id'=>$this->param['project_id']]); | 174 | $info = $bSettingModel->read(['project_id'=>$this->param['project_id']]); |
| 175 | if($info === false){ | 175 | if($info === false){ |
| 176 | $param = [ | 176 | $param = [ |
| @@ -9,7 +9,7 @@ use App\Models\Product\Category; | @@ -9,7 +9,7 @@ use App\Models\Product\Category; | ||
| 9 | use App\Models\Product\Product; | 9 | use App\Models\Product\Product; |
| 10 | use App\Models\RouteMap\RouteMap; | 10 | use App\Models\RouteMap\RouteMap; |
| 11 | use App\Models\Service\Service as ServiceSettingModel; | 11 | use App\Models\Service\Service as ServiceSettingModel; |
| 12 | -use App\Models\Template\BSetting; | 12 | +use App\Models\Template\Setting; |
| 13 | use App\Models\Template\BTemplate; | 13 | use App\Models\Template\BTemplate; |
| 14 | use App\Models\Template\BTemplateLog; | 14 | use App\Models\Template\BTemplateLog; |
| 15 | use App\Models\Template\Template; | 15 | use App\Models\Template\Template; |
| @@ -55,7 +55,7 @@ class BTemplateLogic extends BaseLogic | @@ -55,7 +55,7 @@ class BTemplateLogic extends BaseLogic | ||
| 55 | * @time :2023/6/29 9:44 | 55 | * @time :2023/6/29 9:44 |
| 56 | */ | 56 | */ |
| 57 | public function getTemplate(){ | 57 | public function getTemplate(){ |
| 58 | - $bSettingModel = new BSetting(); | 58 | + $bSettingModel = new Setting(); |
| 59 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); | 59 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); |
| 60 | if($info === false){ | 60 | if($info === false){ |
| 61 | $this->fail('请先选择模版'); | 61 | $this->fail('请先选择模版'); |
| @@ -151,7 +151,7 @@ class BTemplateLogic extends BaseLogic | @@ -151,7 +151,7 @@ class BTemplateLogic extends BaseLogic | ||
| 151 | * @time :2023/6/29 9:47 | 151 | * @time :2023/6/29 9:47 |
| 152 | */ | 152 | */ |
| 153 | public function setTemplate(){ | 153 | public function setTemplate(){ |
| 154 | - $bSettingModel = new BSetting(); | 154 | + $bSettingModel = new Setting(); |
| 155 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); | 155 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); |
| 156 | if($info === false){ | 156 | if($info === false){ |
| 157 | $param = [ | 157 | $param = [ |
| @@ -6,7 +6,7 @@ use App\Http\Logic\Bside\BaseLogic; | @@ -6,7 +6,7 @@ use App\Http\Logic\Bside\BaseLogic; | ||
| 6 | use App\Models\RouteMap\RouteMap; | 6 | use App\Models\RouteMap\RouteMap; |
| 7 | use App\Models\Service\Service as ServiceSettingModel; | 7 | use App\Models\Service\Service as ServiceSettingModel; |
| 8 | use App\Models\Template\BCustomTemplate; | 8 | use App\Models\Template\BCustomTemplate; |
| 9 | -use App\Models\Template\BSetting; | 9 | +use App\Models\Template\Setting; |
| 10 | use App\Models\Template\BTemplate; | 10 | use App\Models\Template\BTemplate; |
| 11 | 11 | ||
| 12 | class CustomTemplateLogic extends BaseLogic | 12 | class CustomTemplateLogic extends BaseLogic |
| @@ -171,7 +171,7 @@ class CustomTemplateLogic extends BaseLogic | @@ -171,7 +171,7 @@ class CustomTemplateLogic extends BaseLogic | ||
| 171 | */ | 171 | */ |
| 172 | public function getBodyHeaderFooter($preg_html,$html_style){ | 172 | public function getBodyHeaderFooter($preg_html,$html_style){ |
| 173 | //获取设置的默认模版 | 173 | //获取设置的默认模版 |
| 174 | - $bSettingModel = new BSetting(); | 174 | + $bSettingModel = new Setting(); |
| 175 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); | 175 | $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]); |
| 176 | //获取模板详情 | 176 | //获取模板详情 |
| 177 | $bTemplateModel = new BTemplate(); | 177 | $bTemplateModel = new BTemplate(); |
| @@ -39,7 +39,7 @@ class Channel extends Model | @@ -39,7 +39,7 @@ class Channel extends Model | ||
| 39 | return []; | 39 | return []; |
| 40 | } | 40 | } |
| 41 | $userModel = new User(); | 41 | $userModel = new User(); |
| 42 | - $user = $userModel->read(['name'=>$sales]); | 42 | + $user = $userModel->read(['name'=>$sales,'channel_id'=>$channel['id']]); |
| 43 | if(!$user){ | 43 | if(!$user){ |
| 44 | $data = [ | 44 | $data = [ |
| 45 | 'channel_id' => $channel['id'] ?? 0, | 45 | 'channel_id' => $channel['id'] ?? 0, |
app/Models/Template/BSettingTemplate.php
0 → 100644
| 1 | +<?php | ||
| 2 | + | ||
| 3 | +namespace App\Models\Template; | ||
| 4 | + | ||
| 5 | +use App\Models\Base; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * @remark :默认主题 | ||
| 9 | + * @name :Setting | ||
| 10 | + * @author :lyh | ||
| 11 | + * @time :2023/6/28 16:51 | ||
| 12 | + */ | ||
| 13 | +class BSettingTemplate extends Base | ||
| 14 | +{ | ||
| 15 | + protected $table = 'gl_web_setting_template'; | ||
| 16 | + //连接数据库 | ||
| 17 | + protected $connection = 'custom_mysql'; | ||
| 18 | +} |
| @@ -6,11 +6,11 @@ use App\Models\Base; | @@ -6,11 +6,11 @@ use App\Models\Base; | ||
| 6 | 6 | ||
| 7 | /** | 7 | /** |
| 8 | * @remark :默认主题 | 8 | * @remark :默认主题 |
| 9 | - * @name :BSetting | 9 | + * @name :Setting |
| 10 | * @author :lyh | 10 | * @author :lyh |
| 11 | * @time :2023/6/28 16:51 | 11 | * @time :2023/6/28 16:51 |
| 12 | */ | 12 | */ |
| 13 | -class BSetting extends Base | 13 | +class Setting extends Base |
| 14 | { | 14 | { |
| 15 | protected $table = 'gl_web_setting_template'; | 15 | protected $table = 'gl_web_setting_template'; |
| 16 | } | 16 | } |
-
请 注册 或 登录 后发表评论