周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 3dd2ea1096fa669a957dc7e72cf170fab5bd52bf 1 个父辈 a57cfec1

gx

内嵌 并排对比
正在显示 11 个修改的文件 包含 261 行增加 和 226 行删除
@@ -9,20 +9,13 @@ namespace App\Console\Commands\KeywordInVideo; @@ -9,20 +9,13 @@ namespace App\Console\Commands\KeywordInVideo;
9 9
10 use App\Console\Commands\Model; 10 use App\Console\Commands\Model;
11 use App\Console\Commands\TaskSub; 11 use App\Console\Commands\TaskSub;
12 -use App\Enums\Common\Code;  
13 use App\Models\Com\KeywordVideoTask; 12 use App\Models\Com\KeywordVideoTask;
14 use App\Models\Com\KeywordVideoTaskLog; 13 use App\Models\Com\KeywordVideoTaskLog;
15 use App\Models\Domain\DomainInfo; 14 use App\Models\Domain\DomainInfo;
16 use App\Models\Product\Keyword; 15 use App\Models\Product\Keyword;
17 use App\Models\Product\Product; 16 use App\Models\Product\Product;
18 -use App\Models\RouteMap\RouteMap;  
19 -use App\Models\Template\BSettingTemplate;  
20 -use App\Models\Template\BTemplateCommon;  
21 -use App\Models\Template\Setting;  
22 use App\Services\ProjectServer; 17 use App\Services\ProjectServer;
23 use Illuminate\Console\Command; 18 use Illuminate\Console\Command;
24 -use Illuminate\Support\Facades\Cache;  
25 -use Illuminate\Support\Facades\DB;  
26 use Illuminate\Support\Facades\Http; 19 use Illuminate\Support\Facades\Http;
27 use Illuminate\Support\Facades\Log; 20 use Illuminate\Support\Facades\Log;
28 21
@@ -34,7 +34,7 @@ class TranslateLogic extends BaseLogic @@ -34,7 +34,7 @@ class TranslateLogic extends BaseLogic
34 if($this->param['url'] == 'All'){ 34 if($this->param['url'] == 'All'){
35 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]); 35 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
36 if(!empty($info) && !empty($info['data'])){ 36 if(!empty($info) && !empty($info['data'])){
37 - $translateInfo = json_decode($info['data'],true); 37 + $translateInfo = json_decode($info['data'],JSON_UNESCAPED_UNICODE);
38 foreach ($translateInfo as $k => $v){ 38 foreach ($translateInfo as $k => $v){
39 $data[] = [$k=>$v]; 39 $data[] = [$k=>$v];
40 } 40 }
@@ -48,7 +48,7 @@ class TranslateLogic extends BaseLogic @@ -48,7 +48,7 @@ class TranslateLogic extends BaseLogic
48 // 原始校对内容 48 // 原始校对内容
49 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]); 49 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
50 if($info !== false){ 50 if($info !== false){
51 - $data_read = json_decode($info['data'],true); 51 + $data_read = json_decode($info['data'],JSON_UNESCAPED_UNICODE);
52 foreach ($data_read as $k => $v){ 52 foreach ($data_read as $k => $v){
53 $data[] = [$k => $v]; 53 $data[] = [$k => $v];
54 } 54 }
@@ -130,7 +130,7 @@ class TranslateLogic extends BaseLogic @@ -130,7 +130,7 @@ class TranslateLogic extends BaseLogic
130 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]); 130 $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
131 $data = []; 131 $data = [];
132 if(!empty($info) && !empty($info['data'])){ 132 if(!empty($info) && !empty($info['data'])){
133 - $translateInfo = json_decode($info['data'],true); 133 + $translateInfo = json_decode($info['data'],JSON_UNESCAPED_UNICODE);
134 foreach ($translateInfo as $k => $v){ 134 foreach ($translateInfo as $k => $v){
135 $data[] = [$k=>$v]; 135 $data[] = [$k=>$v];
136 } 136 }
@@ -151,7 +151,7 @@ class TranslateLogic extends BaseLogic @@ -151,7 +151,7 @@ class TranslateLogic extends BaseLogic
151 } 151 }
152 $new_list = $this->getUrlImageRead($url); 152 $new_list = $this->getUrlImageRead($url);
153 $old_list = []; 153 $old_list = [];
154 - $data_read = json_decode($info['data'],true); 154 + $data_read = json_decode($info['data'],JSON_UNESCAPED_UNICODE);
155 foreach ($data_read as $k=>$v){ 155 foreach ($data_read as $k=>$v){
156 $old_list[] = $k; 156 $old_list[] = $k;
157 $data[] = [ 157 $data[] = [
@@ -282,10 +282,10 @@ class TranslateLogic extends BaseLogic @@ -282,10 +282,10 @@ class TranslateLogic extends BaseLogic
282 'language_id'=>$this->param['language_id'], 282 'language_id'=>$this->param['language_id'],
283 'alias'=>$this->param['alias'], 283 'alias'=>$this->param['alias'],
284 ]; 284 ];
285 - $param['data'] = json_encode($data,true); 285 + $param['data'] = json_encode($data,JSON_UNESCAPED_UNICODE);
286 $this->model->add($param); 286 $this->model->add($param);
287 }else{ 287 }else{
288 - $data = json_encode($data,true); 288 + $data = json_encode($data,JSON_UNESCAPED_UNICODE);
289 $this->model->edit(['data'=>$data],['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>$this->param['type']]); 289 $this->model->edit(['data'=>$data],['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>$this->param['type']]);
290 } 290 }
291 }catch (\Exception $e){ 291 }catch (\Exception $e){
@@ -17,20 +17,4 @@ class CustomModule extends Base @@ -17,20 +17,4 @@ class CustomModule extends Base
17 protected $table = 'gl_custom_module'; 17 protected $table = 'gl_custom_module';
18 //连接数据库 18 //连接数据库
19 protected $connection = 'custom_mysql'; 19 protected $connection = 'custom_mysql';
20 - /**  
21 - * 根据模块查找自定义模块分类数据  
22 - */  
23 - public static function getModuleCategory($projectId,$modules)  
24 - {  
25 - $moduleCategoryInfo = null;  
26 - if (isset($modules->category_id) && !empty($modules->category_id) && $modules->category_id != ",,"){  
27 - $cateArr = explode(",",$modules->category_id);  
28 - $cateArr = array_filter($cateArr);  
29 - if (!empty($cateArr)){  
30 - $cateId = (int)array_shift($cateArr);  
31 - $moduleCategoryInfo = CustomModuleCategory::getModuleCategoryAndExtendById($projectId,$cateId);  
32 - }  
33 - }  
34 - return $moduleCategoryInfo;  
35 - }  
36 } 20 }
@@ -11,6 +11,9 @@ namespace App\Models\CustomModule; @@ -11,6 +11,9 @@ namespace App\Models\CustomModule;
11 11
12 use App\Helper\Arr; 12 use App\Helper\Arr;
13 use App\Models\Base; 13 use App\Models\Base;
  14 +use App\Models\Module\CustomModule;
  15 +use App\Models\Module\ModuleCategory;
  16 +use App\Services\Html\PageService;
14 17
15 class CustomModuleContent extends Base 18 class CustomModuleContent extends Base
16 { 19 {
@@ -18,8 +21,9 @@ class CustomModuleContent extends Base @@ -18,8 +21,9 @@ class CustomModuleContent extends Base
18 //连接数据库 21 //连接数据库
19 protected $connection = 'custom_mysql'; 22 protected $connection = 'custom_mysql';
20 23
21 - public function getCategoryIdAttribute($value){  
22 - return explode(',',trim($value,',')); 24 + public function getCategoryIdAttribute($value)
  25 + {
  26 + return explode(',', trim($value, ','));
23 } 27 }
24 28
25 /** 29 /**
@@ -29,10 +33,114 @@ class CustomModuleContent extends Base @@ -29,10 +33,114 @@ class CustomModuleContent extends Base
29 * @method :post 33 * @method :post
30 * @time :2024/1/23 14:31 34 * @time :2024/1/23 14:31
31 */ 35 */
32 - public function getVideoAttribute($value){  
33 - if(!empty($value)){ 36 + public function getVideoAttribute($value)
  37 + {
  38 + if (!empty($value)) {
34 $value = Arr::s2a($value); 39 $value = Arr::s2a($value);
35 } 40 }
36 return $value; 41 return $value;
37 } 42 }
  43 +
  44 + /**
  45 + * 根据路由获取模块信息
  46 + */
  47 + public static function getModuleAndExtendById($projectId, $id)
  48 + {
  49 + return self::with("getExtend")->where("project_id", $projectId)->where("id", $id)->where("status", 0)->first();
  50 + }
  51 +
  52 + /**
  53 + * 关联模块信息
  54 + */
  55 + public function getExtend(): \Illuminate\Database\Eloquent\Relations\HasOne
  56 + {
  57 + return $this->hasOne(CustomModule::class, 'id', 'module_id');
  58 + }
  59 +
  60 + /**
  61 + * module数据处理
  62 + */
  63 + public static function modulesListDataHandle($moduleCategoryInfo, $modules): array
  64 + {
  65 + $newT = [];
  66 + $pageService = new PageService();
  67 + if (!empty($modules)) {
  68 + foreach ($modules as $key => $item) {
  69 + if (!empty($item->remark)) {
  70 + $remark = $item->remark;
  71 + } else {
  72 + $text = strip_tags($item->content);
  73 + $remark = strlen($text) > 260 ? substr($text, 0, 260) . '...' : $text;
  74 + }
  75 + $newT[$key]["id"] = $item->id;
  76 + if (!empty($item->category_id)) {
  77 + $categoryIdArr = explode(",", $item->category_id);
  78 + if (!empty($categoryIdArr)) {
  79 + $categoryIdArr = array_filter($categoryIdArr);
  80 + $categoryId = (int)array_shift($categoryIdArr);
  81 + $newT[$key]["category_id"] = $categoryId;
  82 + }
  83 + }
  84 + //视频
  85 + $newT[$key]["video"] = !empty($item->video) ? json_decode($item->video) : null;
  86 + $newT[$key]["image"] = !empty($item->image) ? $pageService->getImageUrl($item->image) : "";
  87 + $newT[$key]["content"] = !empty($item->content) ? $item->content : "";
  88 + $newT[$key]["name"] = !empty($item->name) ? $item->name : "";
  89 + $newT[$key]["remark"] = $remark;
  90 + if (isset($item->release_at) && !empty(isset($item->release_at))) {
  91 + $newT[$key]["created_at"] = $item->release_at;
  92 + } else {
  93 + $time = !empty($item->created_at) ? $item->created_at->toArray()['formatted'] : "";
  94 + $newT[$key]["created_at"] = $time;
  95 + }
  96 + $newT[$key]["created_at"] = strtotime($newT[$key]["created_at"]);
  97 + $newT[$key]["created_at"] = date("Y-m-d", $newT[$key]["created_at"]);
  98 +
  99 + if (isset($newT[$key]["category_id"]) && !empty($newT[$key]["category_id"])) {
  100 + $categoryInfo = CustomModuleCategory::getModuleCategoryAndExtendById($item->project_id, $newT[$key]["category_id"]);
  101 + $newT[$key]["aUrl"] = !empty($categoryInfo) ? $categoryInfo->route . "/" . $item->route : "";
  102 + } else {
  103 + $newT[$key]["aUrl"] = !empty($item->route) ? $moduleCategoryInfo->route . "/" . $item->route : "";
  104 + }
  105 + }
  106 + }
  107 + return $newT;
  108 + }
  109 +
  110 + /**
  111 + * 根据模块查找自定义模块分类数据
  112 + */
  113 + public static function getModuleCategory($projectId, $modules)
  114 + {
  115 + $moduleCategoryInfo = null;
  116 + if (isset($modules->category_id) && !empty($modules->category_id) && $modules->category_id != ",,") {
  117 + $cateArr = explode(",", $modules->category_id);
  118 + $cateArr = array_filter($cateArr);
  119 + if (!empty($cateArr)) {
  120 + $cateId = (int)array_shift($cateArr);
  121 + $moduleCategoryInfo = CustomModuleCategory::getModuleCategoryAndExtendById($projectId, $cateId);
  122 + }
  123 + }
  124 + return $moduleCategoryInfo;
  125 + }
  126 +
  127 + /**
  128 + * 是否是自定义扩展模块
  129 + */
  130 + public static function isModule($moduleDataModule)
  131 + {
  132 + $moduleDataModuleArr = explode("-", $moduleDataModule);
  133 + if (count($moduleDataModuleArr) == 2) {
  134 + $moduleArr = $moduleDataModuleArr;
  135 + if (!empty($moduleArr)) {
  136 + $moduleArr[0] = isset($moduleArr[0]) && !empty($moduleArr[0]) ? $moduleArr[0] : null;
  137 + $moduleArr[1] = isset($moduleArr[1]) && !empty($moduleArr[1]) ? (int)$moduleArr[1] : null;
  138 + }
  139 + return $moduleArr;
  140 + } else {
  141 +// return $moduleDataModule;
  142 + return null;
  143 + }
  144 +
  145 + }
38 } 146 }
@@ -3,8 +3,29 @@ @@ -3,8 +3,29 @@
3 namespace App\Models\Project; 3 namespace App\Models\Project;
4 4
5 use App\Models\Base; 5 use App\Models\Base;
  6 +use App\Models\WebSetting\WebLanguage;
  7 +use App\Models\WebSetting\WebSetting;
  8 +use Illuminate\Support\Facades\Redis;
6 9
7 class Country extends Base 10 class Country extends Base
8 { 11 {
9 protected $table = 'gl_project_country'; 12 protected $table = 'gl_project_country';
  13 +
  14 + public static function getProjectCountry($projectId)
  15 + {
  16 + if (Redis::get("project_" . $projectId . "_country") == null) {
  17 + $country = Country::where("project_id", $projectId)->first();
  18 + if (!empty($country)) {
  19 +// $webCountry = WebLanguage::with("countryCustom")->whereIn("id", explode(",", $country->country_lists))->get();
  20 + $webCountry = WebLanguage::with(["countryCustom" => function($query) use ($projectId) {
  21 + $query->where('project_id', $projectId);
  22 + }])->whereIn("id", explode(",", $country->country_lists))->orderByRaw(DB::raw("FIND_IN_SET(id,'" . $country->country_lists. "'" . ')'))->get();
  23 + } else {
  24 + $webCountry = null;
  25 + }
  26 + Redis::set("project_" . $projectId . "_country", json_encode($webCountry));
  27 + Redis::expire("project_" . $projectId . "_country", WebSetting::$redisExpireTime);
  28 + }
  29 + return json_decode(Redis::get("project_".$projectId."_country"));
  30 + }
10 } 31 }
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 -}  
1 -<?php  
2 -/**  
3 - * @remark :  
4 - * @name :TemplateProject.php  
5 - * @author :lyh  
6 - * @method :post  
7 - * @time :2023/11/15 14:38  
8 - */  
9 -  
10 -namespace App\Models\Template;  
11 -  
12 -use App\Models\Base;  
13 -  
14 -class TemplateProject extends Base  
15 -{  
16 - protected $table = 'gl_web_setting_template';  
17 - //连接数据库  
18 - protected $connection = 'custom_mysql';  
19 -}  
@@ -10,13 +10,30 @@ @@ -10,13 +10,30 @@
10 namespace App\Models\WebSetting; 10 namespace App\Models\WebSetting;
11 11
12 use App\Models\Base; 12 use App\Models\Base;
  13 +use App\Models\Project\CountryCustom;
13 use Illuminate\Support\Facades\Cache; 14 use Illuminate\Support\Facades\Cache;
14 15
15 class WebLanguage extends Base 16 class WebLanguage extends Base
16 { 17 {
17 protected $table = 'gl_web_language'; 18 protected $table = 'gl_web_language';
18 19
19 - 20 + /**
  21 + * 关键词17种语种
  22 + */
  23 + public static function getKeywordsCountry($project = null)
  24 + {
  25 + $languageIds = [1,4,5,6,7,8,9,10,11,14,15,18,22,26,40,68,78,95,99];
  26 + //加入项目主语种
  27 + if (!empty($project)){
  28 + $mainLangId = $project->main_lang_id;
  29 + array_unshift($languageIds,(int)$mainLangId);
  30 + }
  31 + $projectId = $project->id;
  32 + $languageIds=array_unique($languageIds);
  33 + return WebLanguage::with(["countryCustom" => function($query) use ($projectId) {
  34 + $query->where('project_id', $projectId);
  35 + }])->whereIn("id",$languageIds)->get();
  36 + }
20 /** 37 /**
21 * @param $id 38 * @param $id
22 * @return mixed 39 * @return mixed
@@ -75,4 +92,12 @@ class WebLanguage extends Base @@ -75,4 +92,12 @@ class WebLanguage extends Base
75 return array_unique($languageIds); 92 return array_unique($languageIds);
76 } 93 }
77 94
  95 + /**
  96 + * 关联语种自定义跳转设置
  97 + */
  98 + public function countryCustom(): \Illuminate\Database\Eloquent\Relations\HasOne
  99 + {
  100 + return $this->hasOne(CountryCustom::class, 'language_id', 'id');
  101 + }
  102 +
78 } 103 }
@@ -8,7 +8,7 @@ use App\Models\Collect\CollectTask; @@ -8,7 +8,7 @@ use App\Models\Collect\CollectTask;
8 use App\Models\Com\Notify; 8 use App\Models\Com\Notify;
9 use App\Models\Com\UpdateNotify; 9 use App\Models\Com\UpdateNotify;
10 use App\Models\Com\UpdateProgress; 10 use App\Models\Com\UpdateProgress;
11 -use App\Models\CustomModule\CustomModule; 11 +use App\Models\CustomModule\CustomModuleContent;
12 use App\Models\CustomModule\CustomModuleCategory; 12 use App\Models\CustomModule\CustomModuleCategory;
13 use App\Models\News\News; 13 use App\Models\News\News;
14 use App\Models\News\NewsCategory; 14 use App\Models\News\NewsCategory;
@@ -472,7 +472,7 @@ class CreatePageService{ @@ -472,7 +472,7 @@ class CreatePageService{
472 $tdkService = new TdkService(); 472 $tdkService = new TdkService();
473 //页面路由 473 //页面路由
474 $routePath = $routerMap->route; 474 $routePath = $routerMap->route;
475 - $module_detail = CustomModule::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first(); 475 + $module_detail = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
476 if (!empty($module_detail)){ 476 if (!empty($module_detail)){
477 if($project['update_info']['is_update'] && $module_detail->six_read){ 477 if($project['update_info']['is_update'] && $module_detail->six_read){
478 return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang); 478 return $this->getOldHtml($project,$routerMap,$project['update_info']['old_domain_test'],$project['update_info']['old_domain_online'],$lang);
@@ -481,7 +481,7 @@ class CreatePageService{ @@ -481,7 +481,7 @@ class CreatePageService{
481 $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_MODULE,$routerMap); 481 $webCustomHtml = $pageService->publicMontagePage($project,RouteMap::SOURCE_MODULE,$routerMap);
482 //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页 482 //公共面包屑导航，左侧导航处理，内页banner背景图，列表页分页
483 $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_MODULE,$routerMap,null); 483 $webCustomHtml = $pageService->publicMdAndLeftNavInnerImageListDetailsDataHandle($webCustomHtml,$project,RouteMap::SOURCE_MODULE,$routerMap,null);
484 - $moduleCategoryInfo = CustomModule::getModuleCategory($project->id,$module_detail); 484 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$module_detail);
485 if (isset($moduleCategoryInfo->getExtend->detail_visualization) && $moduleCategoryInfo->getExtend->detail_visualization == 1){ 485 if (isset($moduleCategoryInfo->getExtend->detail_visualization) && $moduleCategoryInfo->getExtend->detail_visualization == 1){
486 //产品，产品分类，新闻，博客（section模板通用数据模块处理） 486 //产品，产品分类，新闻，博客（section模板通用数据模块处理）
487 $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id); 487 $webCustomHtml = $pageService->generalTemplateProcessingForDataModules($webCustomHtml,$project->id);
@@ -957,8 +957,8 @@ class CreatePageService{ @@ -957,8 +957,8 @@ class CreatePageService{
957 }elseif($routerMap->source == "blog"){ 957 }elseif($routerMap->source == "blog"){
958 $route = "/blogs/".$route; 958 $route = "/blogs/".$route;
959 }elseif($routerMap->source == "module"){ 959 }elseif($routerMap->source == "module"){
960 - $modules = CustomModule::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();  
961 - $moduleCategoryInfo = CustomModule::getModuleCategory($project->id,$modules); 960 + $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
  961 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
962 if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){ 962 if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){
963 $route = "/".$moduleCategoryInfo->route."/".$route; 963 $route = "/".$moduleCategoryInfo->route."/".$route;
964 } 964 }
@@ -1021,8 +1021,8 @@ class CreatePageService{ @@ -1021,8 +1021,8 @@ class CreatePageService{
1021 $route = "/".$moduleCategory->route."/page"; 1021 $route = "/".$moduleCategory->route."/page";
1022 } 1022 }
1023 }elseif ($routerMap->source == "module"){ 1023 }elseif ($routerMap->source == "module"){
1024 - $modules = CustomModule::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();  
1025 - $moduleCategoryInfo = CustomModule::getModuleCategory($project->id,$modules); 1024 + $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
  1025 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
1026 if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){ 1026 if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){
1027 $route = "/".$moduleCategoryInfo->route."/".$modules->route; 1027 $route = "/".$moduleCategoryInfo->route."/".$modules->route;
1028 }else{ 1028 }else{
@@ -1109,8 +1109,8 @@ class CreatePageService{ @@ -1109,8 +1109,8 @@ class CreatePageService{
1109 }elseif($routerMap->source == "blog"){ 1109 }elseif($routerMap->source == "blog"){
1110 $route = "/blogs/".$route; 1110 $route = "/blogs/".$route;
1111 }elseif($routerMap->source == "module"){ 1111 }elseif($routerMap->source == "module"){
1112 - $modules = CustomModule::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();  
1113 - $moduleCategoryInfo = CustomModule::getModuleCategory($project->id,$modules); 1112 + $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
  1113 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
1114 if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){ 1114 if (isset($moduleCategoryInfo->route) && !empty($moduleCategoryInfo->route)){
1115 $route = "/".$moduleCategoryInfo->route."/".$route; 1115 $route = "/".$moduleCategoryInfo->route."/".$route;
1116 } 1116 }
@@ -1153,8 +1153,8 @@ class CreatePageService{ @@ -1153,8 +1153,8 @@ class CreatePageService{
1153 }elseif ($routerMap->source == "product_category"){ 1153 }elseif ($routerMap->source == "product_category"){
1154 $route = "/".$route."/page"; 1154 $route = "/".$route."/page";
1155 }elseif ($routerMap->source == "module"){ 1155 }elseif ($routerMap->source == "module"){
1156 - $modules = CustomModule::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();  
1157 - $moduleCategoryInfo = CustomModule::getModuleCategory($project->id,$modules); 1156 + $modules = CustomModuleContent::where("project_id",$project->id)->where("id",$routerMap->source_id)->where("status",0)->first();
  1157 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
1158 if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){ 1158 if (isset($moduleCategoryInfo->getExtend->route) && !empty($moduleCategoryInfo->getExtend->route)){
1159 $route = "/".$moduleCategoryInfo->getExtend->route."_catalog/".$moduleCategoryInfo->route."/page"; 1159 $route = "/".$moduleCategoryInfo->getExtend->route."_catalog/".$moduleCategoryInfo->route."/page";
1160 }else{ 1160 }else{
@@ -5,6 +5,7 @@ namespace App\Services\Html; @@ -5,6 +5,7 @@ namespace App\Services\Html;
5 5
6 use App\Models\Blog\Blog; 6 use App\Models\Blog\Blog;
7 use App\Models\CustomModule\CustomModule; 7 use App\Models\CustomModule\CustomModule;
  8 +use App\Models\CustomModule\CustomModuleContent;
8 use App\Models\Domain\DomainInfo; 9 use App\Models\Domain\DomainInfo;
9 use App\Models\Module\Module; 10 use App\Models\Module\Module;
10 use App\Models\News\News; 11 use App\Models\News\News;
@@ -807,7 +808,7 @@ tr.stripe { background-color:#f7f7f7; } @@ -807,7 +808,7 @@ tr.stripe { background-color:#f7f7f7; }
807 $botNum = $outerNum+1 == 1 ? "" : "_".($outerNum+1); 808 $botNum = $outerNum+1 == 1 ? "" : "_".($outerNum+1);
808 $moduleCategoryUrlItem = ''; 809 $moduleCategoryUrlItem = '';
809 foreach ($moduleCategory as $moduleCategoryItem){ 810 foreach ($moduleCategory as $moduleCategoryItem){
810 - $count = CustomModule::where("project_id",$item["project_id"])->where("category_id","like","%,".(string)$moduleCategoryItem->source_id.",%")->where("status",0)->count(); 811 + $count = CustomModuleContent::where("project_id",$item["project_id"])->where("category_id","like","%,".(string)$moduleCategoryItem->source_id.",%")->where("status",0)->count();
811 $innerNum++; 812 $innerNum++;
812 if ($count >= 1){ 813 if ($count >= 1){
813 $webSettingNum = SettingNum::where("project_id",$item["project_id"])->where("type",SettingNum::$newsListType)->orderBy("id","desc")->first(); 814 $webSettingNum = SettingNum::where("project_id",$item["project_id"])->where("type",SettingNum::$newsListType)->orderBy("id","desc")->first();
@@ -1093,8 +1094,8 @@ tr.stripe { background-color:#f7f7f7; } @@ -1093,8 +1094,8 @@ tr.stripe { background-color:#f7f7f7; }
1093 $data = RouteMap::where("project_id",$item["project_id"])->where("source","module")->offset($offset)->limit($perPage)->get(); 1094 $data = RouteMap::where("project_id",$item["project_id"])->where("source","module")->offset($offset)->limit($perPage)->get();
1094 if (!empty($data)){ 1095 if (!empty($data)){
1095 foreach ($data as $j){ 1096 foreach ($data as $j){
1096 - $module_detail = CustomModule::where("project_id",$item["project_id"])->where("id",$j->source_id)->where("status",0)->first();  
1097 - $moduleAndCategoryInfo = CustomModule::getModuleCategory($item["project_id"],$module_detail); 1097 + $module_detail = CustomModuleContent::where("project_id",$item["project_id"])->where("id",$j->source_id)->where("status",0)->first();
  1098 + $moduleAndCategoryInfo = CustomModuleContent::getModuleCategory($item["project_id"],$module_detail);
1098 if (!empty($module_detail) && !empty($moduleAndCategoryInfo)){ 1099 if (!empty($module_detail) && !empty($moduleAndCategoryInfo)){
1099 $isExistFile = $this->isExistHtmlFile($item['domain'],"",$j,$j->route,null); 1100 $isExistFile = $this->isExistHtmlFile($item['domain'],"",$j,$j->route,null);
1100 if ($isExistFile){ 1101 if ($isExistFile){
@@ -6,10 +6,14 @@ namespace App\Services\Html; @@ -6,10 +6,14 @@ namespace App\Services\Html;
6 use App\Helper\Translate; 6 use App\Helper\Translate;
7 use App\Models\Blog\Blog; 7 use App\Models\Blog\Blog;
8 use App\Models\Blog\BlogCategory; 8 use App\Models\Blog\BlogCategory;
  9 +use App\Models\CustomModule\CustomModule;
  10 +use App\Models\CustomModule\CustomModuleCategory;
  11 +use App\Models\CustomModule\CustomModuleContent;
9 use App\Models\Module\CustomModuleExtendContent; 12 use App\Models\Module\CustomModuleExtendContent;
10 use App\Models\Module\Module; 13 use App\Models\Module\Module;
11 use App\Models\Module\ModuleCategory; 14 use App\Models\Module\ModuleCategory;
12 use App\Models\Nav\BNav; 15 use App\Models\Nav\BNav;
  16 +use App\Models\News\News;
13 use App\Models\News\NewsCategory; 17 use App\Models\News\NewsCategory;
14 use App\Models\Product\Category; 18 use App\Models\Product\Category;
15 use App\Models\Product\CategoryRelated; 19 use App\Models\Product\CategoryRelated;
@@ -19,15 +23,20 @@ use App\Models\Product\ProductExtend; @@ -19,15 +23,20 @@ use App\Models\Product\ProductExtend;
19 use App\Models\Product\ProductExtendInfo; 23 use App\Models\Product\ProductExtendInfo;
20 use App\Models\Project\Country; 24 use App\Models\Project\Country;
21 use App\Models\Project\DeployBuild; 25 use App\Models\Project\DeployBuild;
  26 +use App\Models\Project\PageSetting;
22 use App\Models\Project\Project; 27 use App\Models\Project\Project;
23 use App\Models\Project\ProjectPageSetting; 28 use App\Models\Project\ProjectPageSetting;
24 use App\Models\Project\VisualizationHtml; 29 use App\Models\Project\VisualizationHtml;
25 use App\Models\RouteMap\RouteMap; 30 use App\Models\RouteMap\RouteMap;
26 use App\Models\Service\Service; 31 use App\Models\Service\Service;
27 -use App\Models\Template\BSetting; 32 +use App\Models\Template\BTemplate;
  33 +use App\Models\Template\BTemplateCommon;
  34 +use App\Models\Template\Setting;
28 use App\Models\Template\TemplateTypeMain; 35 use App\Models\Template\TemplateTypeMain;
29 use App\Models\Template\WebTemplateMain; 36 use App\Models\Template\WebTemplateMain;
  37 +use App\Models\Visualization\Visualization;
30 use App\Models\WebSetting\AggregationSetting; 38 use App\Models\WebSetting\AggregationSetting;
  39 +use App\Models\WebSetting\SettingNum;
31 use App\Models\WebSetting\WebCustom; 40 use App\Models\WebSetting\WebCustom;
32 use App\Models\WebSetting\WebLanguage; 41 use App\Models\WebSetting\WebLanguage;
33 use App\Models\WebSetting\WebSetting; 42 use App\Models\WebSetting\WebSetting;
@@ -147,8 +156,6 @@ class PageService{ @@ -147,8 +156,6 @@ class PageService{
147 if (count($blockItemOuterDom) != 0){ 156 if (count($blockItemOuterDom) != 0){
148 $nav = BNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->where("status",1)->get(); 157 $nav = BNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->where("status",1)->get();
149 if (!empty($nav)){ 158 if (!empty($nav)){
150 - //菜单第一种递归  
151 -// $nav = $this->tree($nav->toArray());  
152 //菜单第二种递归 159 //菜单第二种递归
153 $nav = $this->treeLevel($nav->toArray()); 160 $nav = $this->treeLevel($nav->toArray());
154 // dd($nav); 161 // dd($nav);
@@ -187,7 +194,6 @@ class PageService{ @@ -187,7 +194,6 @@ class PageService{
187 $phpQueryDom=phpQuery::newDocument($content); 194 $phpQueryDom=phpQuery::newDocument($content);
188 $navModule = $phpQueryDom["header [data-module=1]"]; 195 $navModule = $phpQueryDom["header [data-module=1]"];
189 $blockItemOuterDom = $navModule->find("[blockitem]")->eq(0); 196 $blockItemOuterDom = $navModule->find("[blockitem]")->eq(0);
190 -  
191 $blockItemOuterDom->find("[blocklink]")->attr("href","hrefReplace"); 197 $blockItemOuterDom->find("[blocklink]")->attr("href","hrefReplace");
192 $blockItemOuterDom->find("[blocklink]")->attr("title","hrefTitleReplace"); 198 $blockItemOuterDom->find("[blocklink]")->attr("title","hrefTitleReplace");
193 $blockItemOuterDom->find("[blocklink]")->attr("target","hrefTargetReplace"); 199 $blockItemOuterDom->find("[blocklink]")->attr("target","hrefTargetReplace");
@@ -287,7 +293,6 @@ class PageService{ @@ -287,7 +293,6 @@ class PageService{
287 if (!empty($products)){ 293 if (!empty($products)){
288 $pageService = new PageService(); 294 $pageService = new PageService();
289 foreach ($products as $key => $item){ 295 foreach ($products as $key => $item){
290 -  
291 if ($item->icon == null || $item->icon == ""){ 296 if ($item->icon == null || $item->icon == ""){
292 $productNews[$key]["icon"] =$item->icon; 297 $productNews[$key]["icon"] =$item->icon;
293 }else{ 298 }else{
@@ -319,7 +324,6 @@ class PageService{ @@ -319,7 +324,6 @@ class PageService{
319 if ($item->extendInfo->key == "pd_extended_field_1"){ 324 if ($item->extendInfo->key == "pd_extended_field_1"){
320 $productNews[$key]["product_model"] =$item->extendInfo->values; 325 $productNews[$key]["product_model"] =$item->extendInfo->values;
321 } 326 }
322 -  
323 } 327 }
324 } 328 }
325 } 329 }
@@ -347,14 +351,12 @@ class PageService{ @@ -347,14 +351,12 @@ class PageService{
347 }else{ 351 }else{
348 $blockItemOuterDom->attr("class",""); 352 $blockItemOuterDom->attr("class","");
349 } 353 }
350 -  
351 if (isset($item->show)){ 354 if (isset($item->show)){
352 if ($item->show != 0){ 355 if ($item->show != 0){
353 $blockItemOuterDom->attr("data-sub-type",(string)$item->show); 356 $blockItemOuterDom->attr("data-sub-type",(string)$item->show);
354 $blockItemOuterDom->attr("class","nav-li-".(string)$item->show); 357 $blockItemOuterDom->attr("class","nav-li-".(string)$item->show);
355 } 358 }
356 } 359 }
357 -  
358 //a标签当前页和新页面跳转 360 //a标签当前页和新页面跳转
359 if (isset($item->target)){ 361 if (isset($item->target)){
360 if ($item->target == 0) { 362 if ($item->target == 0) {
@@ -365,7 +367,6 @@ class PageService{ @@ -365,7 +367,6 @@ class PageService{
365 $blockItemOuterDom->find("a")->attr("href","javascript:;"); 367 $blockItemOuterDom->find("a")->attr("href","javascript:;");
366 } 368 }
367 } 369 }
368 -  
369 //1205项目定制导航新增产品 370 //1205项目定制导航新增产品
370 if ($item->level == 3 && $item->project_id == 1205){ 371 if ($item->level == 3 && $item->project_id == 1205){
371 $routeMap = RouteMap::where("route",$item->url)->first(); 372 $routeMap = RouteMap::where("route",$item->url)->first();
@@ -390,10 +391,8 @@ class PageService{ @@ -390,10 +391,8 @@ class PageService{
390 } 391 }
391 } 392 }
392 } 393 }
393 -  
394 $outerHtml = $blockItemOuterDom->htmlOuter(); 394 $outerHtml = $blockItemOuterDom->htmlOuter();
395 $blockItemOuterDom->find("ul")->remove(); 395 $blockItemOuterDom->find("ul")->remove();
396 -  
397 return $outerHtml; 396 return $outerHtml;
398 } 397 }
399 398
@@ -452,7 +451,7 @@ class PageService{ @@ -452,7 +451,7 @@ class PageService{
452 */ 451 */
453 public function assembleIndexPage($project,$webTemplate): string 452 public function assembleIndexPage($project,$webTemplate): string
454 { 453 {
455 - $webTemplateCommon = WebTemplateCommon::where("project_id",$project->id)->where("template_id",$webTemplate->template_id)->where("type",1)->first(); 454 + $webTemplateCommon = BTemplateCommon::where("project_id",$project->id)->where("template_id",$webTemplate->template_id)->where("type",1)->first();
456 if (!empty($webTemplateCommon)){ 455 if (!empty($webTemplateCommon)){
457 $html = $webTemplateCommon->head_css.$webTemplate->main_css.$webTemplateCommon->footer_css.$webTemplateCommon->other.$webTemplateCommon->head_html.$webTemplate->main_html.$webTemplateCommon->footer_html; 456 $html = $webTemplateCommon->head_css.$webTemplate->main_css.$webTemplateCommon->footer_css.$webTemplateCommon->other.$webTemplateCommon->head_html.$webTemplate->main_html.$webTemplateCommon->footer_html;
458 $html = $this->getHeadFooter($html,$project->id); 457 $html = $this->getHeadFooter($html,$project->id);
@@ -475,7 +474,6 @@ class PageService{ @@ -475,7 +474,6 @@ class PageService{
475 Redis::set($projectId."_project_origin_head_footer", json_encode($list->toArray())); 474 Redis::set($projectId."_project_origin_head_footer", json_encode($list->toArray()));
476 Redis::expire($projectId."_project_origin_head_footer", WebSetting::$redisExpireTime); 475 Redis::expire($projectId."_project_origin_head_footer", WebSetting::$redisExpireTime);
477 } 476 }
478 -  
479 $contentHeader = ""; 477 $contentHeader = "";
480 $contentFooter = ""; 478 $contentFooter = "";
481 //拼接html 479 //拼接html
@@ -491,7 +489,6 @@ class PageService{ @@ -491,7 +489,6 @@ class PageService{
491 } 489 }
492 } 490 }
493 } 491 }
494 -  
495 return $contentFooter; 492 return $contentFooter;
496 } 493 }
497 494
@@ -503,13 +500,12 @@ class PageService{ @@ -503,13 +500,12 @@ class PageService{
503 { 500 {
504 $projectId = $project->id; 501 $projectId = $project->id;
505 $publicTemplate = null; 502 $publicTemplate = null;
506 - $info = BSetting::where("project_id", $projectId)->first(); 503 + $info = Setting::where("project_id", $projectId)->first();
507 if (!empty($info)) { 504 if (!empty($info)) {
508 - $webTemplate = WebTemplate::where("project_id", $projectId)->where("template_id", $info->template_id)->where("source", 1)->first(); 505 + $webTemplate = BTemplate::where("project_id", $projectId)->where("template_id", $info->template_id)->where("source", 1)->first();
509 if (!empty($webTemplate)) { 506 if (!empty($webTemplate)) {
510 - $webTemplateCommon = WebTemplateCommon::where("project_id", $projectId)->where("template_id", $info->template_id)->where("type",1)->first(); 507 + $webTemplateCommon = BTemplateCommon::where("project_id", $projectId)->where("template_id", $info->template_id)->where("type",1)->first();
511 if (!empty($webTemplateCommon)){ 508 if (!empty($webTemplateCommon)){
512 -// $html = $webTemplateCommon->head_css.$webTemplate->main_css.$webTemplateCommon->footer_css.$webTemplateCommon->other.$webTemplateCommon->head_html.$webTemplate->main_html.$webTemplateCommon->footer_html;  
513 $html = $webTemplateCommon->head_css."<style id='globalsojs-styles'></style>".$webTemplateCommon->footer_css.$webTemplateCommon->other.$webTemplateCommon->head_html.$webTemplate->main_html.$webTemplateCommon->footer_html; 509 $html = $webTemplateCommon->head_css."<style id='globalsojs-styles'></style>".$webTemplateCommon->footer_css.$webTemplateCommon->other.$webTemplateCommon->head_html.$webTemplate->main_html.$webTemplateCommon->footer_html;
514 }else{ 510 }else{
515 $html = $webTemplate->html; 511 $html = $webTemplate->html;
@@ -560,28 +556,6 @@ class PageService{ @@ -560,28 +556,6 @@ class PageService{
560 $countryDom->find(".change-language-title b")->attr("class","country-flag language-flag-".$mainLang->short); 556 $countryDom->find(".change-language-title b")->attr("class","country-flag language-flag-".$mainLang->short);
561 $countryDom->find(".change-language-title span")->text($mainLang->english); 557 $countryDom->find(".change-language-title span")->text($mainLang->english);
562 } 558 }
563 -  
564 - //取消根据翻译状态，翻译tag状态显示主站小语种列表功能（2024.02.27）  
565 -// if ($project->id != 614){  
566 -// try {  
567 -// //判断翻译状态，翻译tag状态  
568 -// $keywordModel = new Keyword();  
569 -// if ((isset($routeMap->source) && $routeMap->source == WebTemplateCommon::$productKeywordName) || in_array($route,$keywordModel->product_keyword_route)){  
570 -// $isTranslateTag = $project->is_translate_tag != 0 ? $project->is_translate_tag : 0;  
571 -// if ($isTranslateTag == 0){  
572 -// $countryDom->find(".change-language-cont")->attr("style","display:none;");  
573 -// }  
574 -// }else{  
575 -// $isTranslate = $project->is_translate != 0 ? $project->is_translate : 0;  
576 -// if ($isTranslate == 0){  
577 -// $countryDom->find(".change-language-cont")->attr("style","display:none;");  
578 -// }  
579 -// }  
580 -// } catch (\Exception $e) {  
581 -// return $content;  
582 -// }  
583 -// }  
584 -  
585 $block = ""; 559 $block = "";
586 $blockItem = $countryDom->find("[blockitem]")->eq(0); 560 $blockItem = $countryDom->find("[blockitem]")->eq(0);
587 if (count($blockItem) < 1){ 561 if (count($blockItem) < 1){
@@ -592,7 +566,7 @@ class PageService{ @@ -592,7 +566,7 @@ class PageService{
592 //关键词17种默认小语种 566 //关键词17种默认小语种
593 $keywordCountry = WebLanguage::getKeywordsCountry($project); 567 $keywordCountry = WebLanguage::getKeywordsCountry($project);
594 if (!empty($routeMap)){ 568 if (!empty($routeMap)){
595 - if ($routeMap->source == WebTemplateCommon::$productKeywordName || $routeMap->source == WebTemplateCommon::$productKeywordListName){ 569 + if ($routeMap->source == RouteMap::SOURCE_PRODUCT_KEYWORD || $routeMap->source == 'product_keyword_list'){
596 $webCountry = $keywordCountry; 570 $webCountry = $keywordCountry;
597 }else{ 571 }else{
598 $webCountry = $projectCountry; 572 $webCountry = $projectCountry;
@@ -606,7 +580,6 @@ class PageService{ @@ -606,7 +580,6 @@ class PageService{
606 $webCountry = $projectCountry; 580 $webCountry = $projectCountry;
607 } 581 }
608 } 582 }
609 -  
610 //判断当前项目是二级域名还是二级目录 583 //判断当前项目是二级域名还是二级目录
611 $projectBuild = DeployBuild::where("project_id",$project->id)->first(); 584 $projectBuild = DeployBuild::where("project_id",$project->id)->first();
612 $linkingFormat = 1; 585 $linkingFormat = 1;
@@ -619,8 +592,6 @@ class PageService{ @@ -619,8 +592,6 @@ class PageService{
619 //语言列表 592 //语言列表
620 $domainEndStr = $project->domain_end == Project::$domainEndSlash ? "/" : ""; 593 $domainEndStr = $project->domain_end == Project::$domainEndSlash ? "/" : "";
621 if (!empty($webCountry)){ 594 if (!empty($webCountry)){
622 - //$routeMap = RouteMap::where("project_id",$project->id)->where("route",$route)->first();  
623 - $newRoute = "";  
624 if (!empty($routeMap)){ 595 if (!empty($routeMap)){
625 if ($route == "index" || $route == ""){ 596 if ($route == "index" || $route == ""){
626 $newRoute = "/" ; 597 $newRoute = "/" ;
@@ -672,7 +643,6 @@ class PageService{ @@ -672,7 +643,6 @@ class PageService{
672 $blockItem->attr("href","http://".$domainNow.$newRoute); 643 $blockItem->attr("href","http://".$domainNow.$newRoute);
673 } 644 }
674 } 645 }
675 -  
676 $blockItem->attr("title",$v->english); 646 $blockItem->attr("title",$v->english);
677 $shortLang = $v->short == "zh-ct" ? "zh-TW" : $v->short; 647 $shortLang = $v->short == "zh-ct" ? "zh-TW" : $v->short;
678 $blockItem->find("[blockicotype]")->eq(0)->attr("class","country-flag language-flag-".$shortLang); 648 $blockItem->find("[blockicotype]")->eq(0)->attr("class","country-flag language-flag-".$shortLang);
@@ -706,7 +676,7 @@ class PageService{ @@ -706,7 +676,7 @@ class PageService{
706 if((int)$dataNavModule != 0){ 676 if((int)$dataNavModule != 0){
707 $dataNavType = $countryDom->eq($i)->attr("data-nav-type"); 677 $dataNavType = $countryDom->eq($i)->attr("data-nav-type");
708 $dataNavType = $dataNavType == null || $dataNavType=="" || $dataNavType=="default" ? 2 : (int)$dataNavType; 678 $dataNavType = $dataNavType == null || $dataNavType=="" || $dataNavType=="default" ? 2 : (int)$dataNavType;
709 - $navData = WebNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->get(); 679 + $navData = BNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->get();
710 680
711 if (!empty($navData)){ 681 if (!empty($navData)){
712 $navData = $this->tree($navData->toArray()); 682 $navData = $this->tree($navData->toArray());
@@ -1154,20 +1124,6 @@ class PageService{ @@ -1154,20 +1124,6 @@ class PageService{
1154 if ($product_category) { 1124 if ($product_category) {
1155 $relatedProduct = CategoryRelated::where(['cate_id' => $product_category->cate_id])->where('product_id', '<>', $data->id)->inRandomOrder()->take(10)->pluck('product_id')->toArray(); 1125 $relatedProduct = CategoryRelated::where(['cate_id' => $product_category->cate_id])->where('product_id', '<>', $data->id)->inRandomOrder()->take(10)->pluck('product_id')->toArray();
1156 } 1126 }
1157 -// $categoryIdArr = !empty($data->category_id) ? explode(",",$data->category_id) : null;  
1158 -// if (!empty($categoryIdArr)){  
1159 -// $categoryIdArr = array_filter($categoryIdArr);  
1160 -// if (!empty($categoryIdArr)){  
1161 -// $categoryIdArr = array_map('intval', $categoryIdArr);  
1162 -// $categoryIdArr=array_reverse($categoryIdArr);  
1163 -// $productIdsList = CategoryRelated::whereIn("cate_id",$categoryIdArr)->orderByRaw(DB::raw("FIELD(cate_id,".implode(',',$categoryIdArr).")"))->get();  
1164 -// if (!empty($productIdsList)){  
1165 -// foreach ($productIdsList as $productIdsListItem){  
1166 -// $relatedProduct[] = $productIdsListItem->product_id;  
1167 -// }  
1168 -// }  
1169 -// }  
1170 -// }  
1171 if (!empty($relatedProduct)){ 1127 if (!empty($relatedProduct)){
1172 $relatedProduct = array_filter($relatedProduct); 1128 $relatedProduct = array_filter($relatedProduct);
1173 $relatedProduct = array_map('intval', $relatedProduct); 1129 $relatedProduct = array_map('intval', $relatedProduct);
@@ -1272,7 +1228,7 @@ class PageService{ @@ -1272,7 +1228,7 @@ class PageService{
1272 if (!empty($nesCategoryArr)){ 1228 if (!empty($nesCategoryArr)){
1273 $routerNewsMap = RouteMap::where("project_id",$projectId)->where("source",$source)->where("source_id",reset($nesCategoryArr))->first(); 1229 $routerNewsMap = RouteMap::where("project_id",$projectId)->where("source",$source)->where("source_id",reset($nesCategoryArr))->first();
1274 if (!empty($routerNewsMap)){ 1230 if (!empty($routerNewsMap)){
1275 - $newsCategoryInfo = WebNav::where("project_id",$projectId)->where("location","header")->where("status",1)->where("url",$routerNewsMap->route)->first(); 1231 + $newsCategoryInfo = BNav::where("project_id",$projectId)->where("location","header")->where("status",1)->where("url",$routerNewsMap->route)->first();
1276 if (!empty($newsCategoryInfo)){ 1232 if (!empty($newsCategoryInfo)){
1277 return $newsCategoryInfo; 1233 return $newsCategoryInfo;
1278 } 1234 }
@@ -1325,7 +1281,7 @@ class PageService{ @@ -1325,7 +1281,7 @@ class PageService{
1325 public function getInnerPageBanner($projectId,$route,$type) 1281 public function getInnerPageBanner($projectId,$route,$type)
1326 { 1282 {
1327 $banners = []; 1283 $banners = [];
1328 - if ($type == WebTemplateCommon::$productCategoryName){ 1284 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
1329 $category = Category::where("project_id",$projectId)->where("status",1)->where("route",$route)->first(); 1285 $category = Category::where("project_id",$projectId)->where("status",1)->where("route",$route)->first();
1330 if (!empty($category)){ 1286 if (!empty($category)){
1331 if (isset($category->image) && !empty($category->image)){ 1287 if (isset($category->image) && !empty($category->image)){
@@ -1347,7 +1303,7 @@ class PageService{ @@ -1347,7 +1303,7 @@ class PageService{
1347 } 1303 }
1348 } 1304 }
1349 } 1305 }
1350 - if ($type == WebTemplateCommon::$productName){ 1306 + if ($type == RouteMap::SOURCE_PRODUCT){
1351 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",1)->first(); 1307 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",1)->first();
1352 if (!empty($innerPageBanner)){ 1308 if (!empty($innerPageBanner)){
1353 $banners["product_banner"] = $innerPageBanner->image; 1309 $banners["product_banner"] = $innerPageBanner->image;
@@ -1355,7 +1311,7 @@ class PageService{ @@ -1355,7 +1311,7 @@ class PageService{
1355 $banners["product_banner"] = ""; 1311 $banners["product_banner"] = "";
1356 } 1312 }
1357 } 1313 }
1358 - if ($type == WebTemplateCommon::$newsCategoryName || $type == WebTemplateCommon::$newsName || $type == WebTemplateCommon::$extendCategoryName || $type == WebTemplateCommon::$extendName){ 1314 + if ($type == RouteMap::SOURCE_NEWS_CATE || $type == RouteMap::SOURCE_NEWS || $type == RouteMap::SOURCE_MODULE_CATE || $type == RouteMap::SOURCE_MODULE){
1359 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",3)->first(); 1315 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",3)->first();
1360 if (!empty($innerPageBanner)){ 1316 if (!empty($innerPageBanner)){
1361 $banners["news_banner"] = $innerPageBanner->image; 1317 $banners["news_banner"] = $innerPageBanner->image;
@@ -1363,7 +1319,7 @@ class PageService{ @@ -1363,7 +1319,7 @@ class PageService{
1363 $banners["news_banner"] = ""; 1319 $banners["news_banner"] = "";
1364 } 1320 }
1365 } 1321 }
1366 - if ($type == WebTemplateCommon::$blogCategoryName || $type == WebTemplateCommon::$blogName){ 1322 + if ($type == RouteMap::SOURCE_BLOG_CATE || $type == RouteMap::SOURCE_BLOG){
1367 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",2)->first(); 1323 $innerPageBanner = WebSettingImage::where("project_id",$projectId)->where("type",2)->first();
1368 if (!empty($innerPageBanner)){ 1324 if (!empty($innerPageBanner)){
1369 $banners["blog_banner"] = $innerPageBanner->image; 1325 $banners["blog_banner"] = $innerPageBanner->image;
@@ -1402,7 +1358,7 @@ class PageService{ @@ -1402,7 +1358,7 @@ class PageService{
1402 public function getNewsCategoryInfoByRoute($projectId,$newRoute) 1358 public function getNewsCategoryInfoByRoute($projectId,$newRoute)
1403 { 1359 {
1404 if ($newRoute != ''){ 1360 if ($newRoute != ''){
1405 - $newsCategoryInfo = WebNav::where("project_id",$projectId)->where("location","header")->where("status",1)->where("url",$newRoute)->first(); 1361 + $newsCategoryInfo = BNav::where("project_id",$projectId)->where("location","header")->where("status",1)->where("url",$newRoute)->first();
1406 if (!empty($newsCategoryInfo)){ 1362 if (!empty($newsCategoryInfo)){
1407 return $newsCategoryInfo; 1363 return $newsCategoryInfo;
1408 } 1364 }
@@ -1468,22 +1424,22 @@ class PageService{ @@ -1468,22 +1424,22 @@ class PageService{
1468 $page = (int)$page; 1424 $page = (int)$page;
1469 } 1425 }
1470 $count = 0; 1426 $count = 0;
1471 - if ($type == WebTemplateCommon::$productCategoryName){  
1472 - $webSettingNum = WebSettingNum::where("project_id",$projectId)->where("type",WebSettingNum::$productListType)->orderBy("id","desc")->first(); 1427 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
  1428 + $webSettingNum = SettingNum::where("project_id",$projectId)->where("type",SettingNum::$productListType)->orderBy("id","desc")->first();
1473 if (!empty($webSettingNum)){ 1429 if (!empty($webSettingNum)){
1474 $perPage = (int)$webSettingNum->num; 1430 $perPage = (int)$webSettingNum->num;
1475 }else{ 1431 }else{
1476 $perPage = Category::$productCategoryPagePercent; //产品每页条数 1432 $perPage = Category::$productCategoryPagePercent; //产品每页条数
1477 } 1433 }
1478 - }elseif($type == WebTemplateCommon::$newsCategoryName || $type == WebTemplateCommon::$extendCategoryName){  
1479 - $webSettingNum = WebSettingNum::where("project_id",$projectId)->where("type",WebSettingNum::$newsListType)->orderBy("id","desc")->first(); 1434 + }elseif($type == RouteMap::SOURCE_NEWS_CATE || $type == RouteMap::SOURCE_MODULE_CATE){
  1435 + $webSettingNum = SettingNum::where("project_id",$projectId)->where("type",SettingNum::$newsListType)->orderBy("id","desc")->first();
1480 if (!empty($webSettingNum)){ 1436 if (!empty($webSettingNum)){
1481 $perPage = (int)$webSettingNum->num; 1437 $perPage = (int)$webSettingNum->num;
1482 }else{ 1438 }else{
1483 $perPage = NewsCategory::$newsCategoryPagePercent; //新闻每页条数 1439 $perPage = NewsCategory::$newsCategoryPagePercent; //新闻每页条数
1484 } 1440 }
1485 }else{ 1441 }else{
1486 - $webSettingNum = WebSettingNum::where("project_id",$projectId)->where("type",WebSettingNum::$blogListType)->orderBy("id","desc")->first(); 1442 + $webSettingNum = SettingNum::where("project_id",$projectId)->where("type",SettingNum::$blogListType)->orderBy("id","desc")->first();
1487 if (!empty($webSettingNum)){ 1443 if (!empty($webSettingNum)){
1488 $perPage = (int)$webSettingNum->num; 1444 $perPage = (int)$webSettingNum->num;
1489 }else{ 1445 }else{
@@ -1493,26 +1449,26 @@ class PageService{ @@ -1493,26 +1449,26 @@ class PageService{
1493 1449
1494 $offset = ($page - 1) * $perPage; 1450 $offset = ($page - 1) * $perPage;
1495 //总条数 1451 //总条数
1496 - if ($type == WebTemplateCommon::$newsCategoryName){ 1452 + if ($type == RouteMap::SOURCE_NEWS_CATE){
1497 if ($routerMap->route == "news" || $routerMap->source_id == 0){ 1453 if ($routerMap->route == "news" || $routerMap->source_id == 0){
1498 $count = News::where("project_id",$projectId)->select("id")->where("status",1)->orderBy("id","DESC")->count(); 1454 $count = News::where("project_id",$projectId)->select("id")->where("status",1)->orderBy("id","DESC")->count();
1499 }else{ 1455 }else{
1500 $count = News::where("project_id",$projectId)->select("id")->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",1)->orderBy("id","DESC")->count(); 1456 $count = News::where("project_id",$projectId)->select("id")->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",1)->orderBy("id","DESC")->count();
1501 } 1457 }
1502 } 1458 }
1503 - if ($type == WebTemplateCommon::$blogCategoryName){ 1459 + if ($type == RouteMap::SOURCE_BLOG_CATE){
1504 if ($routerMap->route == "blog" && $routerMap->source_id == 0){ 1460 if ($routerMap->route == "blog" && $routerMap->source_id == 0){
1505 $count = Blog::where("project_id",$projectId)->where("status",1)->orderBy("id","DESC")->count(); 1461 $count = Blog::where("project_id",$projectId)->where("status",1)->orderBy("id","DESC")->count();
1506 }else{ 1462 }else{
1507 $count = Blog::where("project_id",$projectId)->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",1)->orderBy("id","DESC")->count(); 1463 $count = Blog::where("project_id",$projectId)->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",1)->orderBy("id","DESC")->count();
1508 } 1464 }
1509 } 1465 }
1510 - if ($type == WebTemplateCommon::$extendCategoryName){ 1466 + if ($type == RouteMap::SOURCE_MODULE_CATE){
1511 $moduleCategoryInfo = ModuleCategory::getModuleCategoryAndExtendById($projectId,$routerMap->source_id); 1467 $moduleCategoryInfo = ModuleCategory::getModuleCategoryAndExtendById($projectId,$routerMap->source_id);
1512 $count = Module::where("project_id",$projectId)->select("id")->where("module_id",$moduleCategoryInfo->module_id)->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",0)->orderBy("id","DESC")->count(); 1468 $count = Module::where("project_id",$projectId)->select("id")->where("module_id",$moduleCategoryInfo->module_id)->where("category_id","like","%".",".$routerMap->source_id.","."%")->where("status",0)->orderBy("id","DESC")->count();
1513 } 1469 }
1514 //临时改成这种，之后调整 1470 //临时改成这种，之后调整
1515 - if ($type == WebTemplateCommon::$productCategoryName){ 1471 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
1516 $productModel = Product::where("project_id",$projectId); 1472 $productModel = Product::where("project_id",$projectId);
1517 if ($routerMap->route != "products"){ 1473 if ($routerMap->route != "products"){
1518 $categoryArr = $this->getProductListByCategoryId($routerMap,$projectId); 1474 $categoryArr = $this->getProductListByCategoryId($routerMap,$projectId);
@@ -1600,7 +1556,7 @@ class PageService{ @@ -1600,7 +1556,7 @@ class PageService{
1600 }else{ 1556 }else{
1601 $page = (int)$page; 1557 $page = (int)$page;
1602 } 1558 }
1603 - $webSettingNum = WebSettingNum::where("project_id",$project->id)->where("type",WebSettingNum::$productListType)->orderBy("id","desc")->first(); 1559 + $webSettingNum = SettingNum::where("project_id",$project->id)->where("type",SettingNum::$productListType)->orderBy("id","desc")->first();
1604 if (!empty($webSettingNum)){ 1560 if (!empty($webSettingNum)){
1605 $perPage = (int)$webSettingNum->num; 1561 $perPage = (int)$webSettingNum->num;
1606 }else{ 1562 }else{
@@ -1864,23 +1820,14 @@ class PageService{ @@ -1864,23 +1820,14 @@ class PageService{
1864 } 1820 }
1865 if (count($productIds)<7){ 1821 if (count($productIds)<7){
1866 $randomData = Product::where("project_id", $project->id)->where("status",1)->whereNotIn('id', $productIds)->inRandomOrder()->take(13-count($productIds))->get(); 1822 $randomData = Product::where("project_id", $project->id)->where("status",1)->whereNotIn('id', $productIds)->inRandomOrder()->take(13-count($productIds))->get();
1867 - //优化  
1868 -// $product_all_id = Product::where("project_id", $project->id)->whereNotIn('id', $productIds)->where("status",1)->pluck('id')->toArray();  
1869 -// $product_id = array_rand($product_all_id, 13-count($productIds));  
1870 -// $randomData = Product::where("project_id", $project->id)->whereIn("id", $product_id)->get();  
1871 $finalData = $productsQuery->merge($randomData); 1823 $finalData = $productsQuery->merge($randomData);
1872 }else{ 1824 }else{
1873 $finalData = $productsQuery; 1825 $finalData = $productsQuery;
1874 } 1826 }
1875 }else{ 1827 }else{
1876 $finalData = Product::where("project_id", $project->id)->where("status",1)->inRandomOrder()->take(13)->get(); 1828 $finalData = Product::where("project_id", $project->id)->where("status",1)->inRandomOrder()->take(13)->get();
1877 - //优化  
1878 -// $product_all_id = Product::where("project_id", $project->id)->where("status",1)->pluck('id')->toArray();  
1879 -// $product_id = array_rand($product_all_id, 13);  
1880 -// $finalData = Product::where("project_id", $project->id)->whereIn("id", $product_id)->get();  
1881 } 1829 }
1882 } 1830 }
1883 -  
1884 if (!empty($finalData)) { 1831 if (!empty($finalData)) {
1885 $finalData = $this->productListDataHandle($finalData); 1832 $finalData = $this->productListDataHandle($finalData);
1886 if (!empty($finalData)){ 1833 if (!empty($finalData)){
@@ -2075,7 +2022,7 @@ class PageService{ @@ -2075,7 +2022,7 @@ class PageService{
2075 default: 2022 default:
2076 //是否是自定义模块 2023 //是否是自定义模块
2077 if (!empty($moduleDataModule)){ 2024 if (!empty($moduleDataModule)){
2078 - $moduleArr = Module::isModule($moduleDataModule); 2025 + $moduleArr = CustomModuleContent::isModule($moduleDataModule);
2079 if (!empty($moduleArr)){ 2026 if (!empty($moduleArr)){
2080 if (isset($moduleArr[0]) && $moduleArr[1] && !empty($moduleArr[0]) && !empty($moduleArr[1]) && $moduleArr[0] == "custom"){ 2027 if (isset($moduleArr[0]) && $moduleArr[1] && !empty($moduleArr[0]) && !empty($moduleArr[1]) && $moduleArr[0] == "custom"){
2081 $query = Module::where("project_id",$projectId)->where("module_id",$moduleArr[1])->where("status",0); 2028 $query = Module::where("project_id",$projectId)->where("module_id",$moduleArr[1])->where("status",0);
@@ -2111,7 +2058,7 @@ class PageService{ @@ -2111,7 +2058,7 @@ class PageService{
2111 if ((int)$moduleDataModule == 4){ 2058 if ((int)$moduleDataModule == 4){
2112 $query = $query->where("pid",$dataType); 2059 $query = $query->where("pid",$dataType);
2113 }else{ 2060 }else{
2114 - $isModule = Module::isModule($moduleDataModule); 2061 + $isModule = CustomModuleContent::isModule($moduleDataModule);
2115 if (!is_array($isModule)){ 2062 if (!is_array($isModule)){
2116 //产品处理 2063 //产品处理
2117 if ((int)$moduleDataModule == 1){ 2064 if ((int)$moduleDataModule == 1){
@@ -2463,7 +2410,7 @@ class PageService{ @@ -2463,7 +2410,7 @@ class PageService{
2463 $moduleCategory = array_filter($moduleCategory); 2410 $moduleCategory = array_filter($moduleCategory);
2464 if (!empty($moduleCategory)){ 2411 if (!empty($moduleCategory)){
2465 $moduleCategoryId = (int)array_shift($moduleCategory); 2412 $moduleCategoryId = (int)array_shift($moduleCategory);
2466 - $moduleCategoryInfo = ModuleCategory::where("project_id",$projectId)->where("id",$moduleCategoryId)->first(); 2413 + $moduleCategoryInfo = CustomModuleCategory::where("project_id",$projectId)->where("id",$moduleCategoryId)->first();
2467 if (!empty($moduleCategoryInfo)){ 2414 if (!empty($moduleCategoryInfo)){
2468 $categoryRoute = $moduleCategoryInfo->route . "/"; 2415 $categoryRoute = $moduleCategoryInfo->route . "/";
2469 } 2416 }
@@ -2518,7 +2465,7 @@ class PageService{ @@ -2518,7 +2465,7 @@ class PageService{
2518 2465
2519 public function blokItemDatahandle($projectId,$moduleDataModule,$blockDom,$queryItem,$key,$moduleDataImageType=null,$moduleDataIcoType=null,$dataTitleCharLength=0,$dataDescCharLength=0,$blockContentVideo=null) 2466 public function blokItemDatahandle($projectId,$moduleDataModule,$blockDom,$queryItem,$key,$moduleDataImageType=null,$moduleDataIcoType=null,$dataTitleCharLength=0,$dataDescCharLength=0,$blockContentVideo=null)
2520 { 2467 {
2521 - $isModule = Module::isModule($moduleDataModule); 2468 + $isModule = CustomModuleContent::isModule($moduleDataModule);
2522 if (is_array($isModule)){ 2469 if (is_array($isModule)){
2523 //自定义扩展模块 2470 //自定义扩展模块
2524 $this->moduleBlockHandle($projectId,$moduleDataModule,$blockDom,$queryItem,$dataTitleCharLength,$dataDescCharLength,$moduleDataImageType,$moduleDataIcoType,$key,$blockContentVideo); 2471 $this->moduleBlockHandle($projectId,$moduleDataModule,$blockDom,$queryItem,$dataTitleCharLength,$dataDescCharLength,$moduleDataImageType,$moduleDataIcoType,$key,$blockContentVideo);
@@ -2579,13 +2526,13 @@ class PageService{ @@ -2579,13 +2526,13 @@ class PageService{
2579 $li.=$this->singLeftNavHandle($project,$v,$type,$categoryInfo); 2526 $li.=$this->singLeftNavHandle($project,$v,$type,$categoryInfo);
2580 } 2527 }
2581 } 2528 }
2582 - if ($type == WebTemplateCommon::$productCategoryName){ 2529 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
2583 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) { 2530 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) {
2584 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["title"].'</a><ul>'.$li.'</ul></li>'; 2531 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["title"].'</a><ul>'.$li.'</ul></li>';
2585 }else{ 2532 }else{
2586 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'">'.$nav["title"].'</a><ul>'.$li.'</ul></li>'; 2533 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'">'.$nav["title"].'</a><ul>'.$li.'</ul></li>';
2587 } 2534 }
2588 - }elseif($type == WebTemplateCommon::$newsCategoryName){ 2535 + }elseif($type == RouteMap::SOURCE_NEWS_CATE){
2589 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) { 2536 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) {
2590 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>'; 2537 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>';
2591 }else{ 2538 }else{
@@ -2599,7 +2546,7 @@ class PageService{ @@ -2599,7 +2546,7 @@ class PageService{
2599 return '<li data-page="'.$nav["alias"].'"><a href="/'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>'; 2546 return '<li data-page="'.$nav["alias"].'"><a href="/'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>';
2600 } 2547 }
2601 } 2548 }
2602 - }elseif($type == WebTemplateCommon::$extendCategoryName){ 2549 + }elseif($type == RouteMap::SOURCE_MODULE_CATE){
2603 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) { 2550 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) {
2604 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>'; 2551 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>';
2605 }else{ 2552 }else{
@@ -2613,7 +2560,7 @@ class PageService{ @@ -2613,7 +2560,7 @@ class PageService{
2613 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'/">'.$nav["name"].'</a></li>'; 2560 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'/">'.$nav["name"].'</a></li>';
2614 } 2561 }
2615 } 2562 }
2616 - }elseif($type == WebTemplateCommon::$blogCategoryName){ 2563 + }elseif($type == RouteMap::SOURCE_BLOG_CATE){
2617 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) { 2564 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) {
2618 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>'; 2565 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a><ul>'.$li.'</ul></li>';
2619 }else{ 2566 }else{
@@ -2656,13 +2603,13 @@ class PageService{ @@ -2656,13 +2603,13 @@ class PageService{
2656 */ 2603 */
2657 public function singLeftNavHandle($project,$nav,$type,$categoryInfo=null): string 2604 public function singLeftNavHandle($project,$nav,$type,$categoryInfo=null): string
2658 { 2605 {
2659 - if ($type == WebTemplateCommon::$productCategoryName){ 2606 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
2660 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) { 2607 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) {
2661 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["title"].'</a></li>'; 2608 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["title"].'</a></li>';
2662 }else{ 2609 }else{
2663 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'">'.$nav["title"].'</a></li>'; 2610 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'">'.$nav["title"].'</a></li>';
2664 } 2611 }
2665 - }elseif($type == WebTemplateCommon::$newsCategoryName){ 2612 + }elseif($type == RouteMap::SOURCE_NEWS_CATE){
2666 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) { 2613 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) {
2667 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a></li>'; 2614 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a></li>';
2668 }else{ 2615 }else{
@@ -2676,7 +2623,7 @@ class PageService{ @@ -2676,7 +2623,7 @@ class PageService{
2676 return '<li data-page="'.$nav["alias"].'"><a href="/'.$nav["alias"].'/">'.$nav["name"].'</a></li>'; 2623 return '<li data-page="'.$nav["alias"].'"><a href="/'.$nav["alias"].'/">'.$nav["name"].'</a></li>';
2677 } 2624 }
2678 } 2625 }
2679 - }elseif($type == WebTemplateCommon::$extendCategoryName){ 2626 + }elseif($type == RouteMap::SOURCE_MODULE_CATE){
2680 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) { 2627 if (strpos($nav["route"], 'http://') !== false || strpos($nav["route"], 'https://') !== false) {
2681 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["name"].'</a></li>'; 2628 return '<li data-page="'.$nav["route"].'"><a href="'.$nav["route"].'">'.$nav["name"].'</a></li>';
2682 }else{ 2629 }else{
@@ -2690,7 +2637,7 @@ class PageService{ @@ -2690,7 +2637,7 @@ class PageService{
2690 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'/">'.$nav["name"].'</a></li>'; 2637 return '<li data-page="'.$nav["route"].'"><a href="/'.$nav["route"].'/">'.$nav["name"].'</a></li>';
2691 } 2638 }
2692 } 2639 }
2693 - }elseif($type == WebTemplateCommon::$blogCategoryName){ 2640 + }elseif($type == RouteMap::SOURCE_BLOG_CATE){
2694 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) { 2641 if (strpos($nav["alias"], 'http://') !== false || strpos($nav["alias"], 'https://') !== false) {
2695 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a></li>'; 2642 return '<li data-page="'.$nav["alias"].'"><a href="'.$nav["alias"].'">'.$nav["name"].'</a></li>';
2696 }else{ 2643 }else{
@@ -3036,9 +2983,9 @@ class PageService{ @@ -3036,9 +2983,9 @@ class PageService{
3036 { 2983 {
3037 $relatedProductDom = $phpQueryDom->find("[productparameters]")->eq(0); 2984 $relatedProductDom = $phpQueryDom->find("[productparameters]")->eq(0);
3038 if (count($relatedProductDom) >= 1){ 2985 if (count($relatedProductDom) >= 1){
3039 - $templateInfo= BSetting::where("project_id",$project->id)->first(); 2986 + $templateInfo= Setting::where("project_id",$project->id)->first();
3040 if (!empty($templateInfo)){ 2987 if (!empty($templateInfo)){
3041 - $webTemplateQuery = WebTemplate::where("project_id",$project->id)->where("status",0)->where("template_id",$templateInfo->template_id)->where("source",WebTemplateCommon::$productSource)->where("source_id",$data["id"])->first(); 2988 + $webTemplateQuery = BTemplate::where("project_id",$project->id)->where("status",0)->where("template_id",$templateInfo->template_id)->where("source",WebTemplateCommon::$productSource)->where("source_id",$data["id"])->first();
3042 if (empty($webTemplateQuery)){ 2989 if (empty($webTemplateQuery)){
3043 //tab切换 2990 //tab切换
3044 $blockTab = ""; 2991 $blockTab = "";
@@ -3213,14 +3160,7 @@ class PageService{ @@ -3213,14 +3160,7 @@ class PageService{
3213 $navItemHtml = $nabHtml; 3160 $navItemHtml = $nabHtml;
3214 3161
3215 if ($dataNavType >= 1){ 3162 if ($dataNavType >= 1){
3216 -// $nav = null;  
3217 -// $flattenedArray = WebNavGroup::getNavGroupSortListByID($projectId,$dataNavType);  
3218 -// if (!empty($flattenedArray)){  
3219 -// $nav = WebNav::where("project_id",$projectId)->whereIn('id', $flattenedArray)->orderByRaw(DB::raw("FIELD(id, " . implode(",", $flattenedArray) . ")"))->where("group_id",$dataNavType)->where("status",1)->get();  
3220 -// }else{  
3221 -// $nav = WebNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","desc")->orderBy("id","desc")->where("status",1)->get();  
3222 -// }  
3223 - $nav = WebNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->where("status",1)->get(); 3163 + $nav = BNav::where("project_id",$projectId)->where("group_id",$dataNavType)->orderBy("sort","asc")->orderBy("id","asc")->where("status",1)->get();
3224 if (!empty($nav)){ 3164 if (!empty($nav)){
3225 $nav = $this->tree($nav->toArray()); 3165 $nav = $this->tree($nav->toArray());
3226 $nav = json_decode(json_encode($nav)); 3166 $nav = json_decode(json_encode($nav));
@@ -3406,32 +3346,32 @@ class PageService{ @@ -3406,32 +3346,32 @@ class PageService{
3406 */ 3346 */
3407 public function visualizationHtmlHeaderHandle($html,$project,$type,$routerMap) 3347 public function visualizationHtmlHeaderHandle($html,$project,$type,$routerMap)
3408 { 3348 {
3409 - $webTemplateCommon = WebTemplateCommon::where("project_id",$project->id)->where("template_id",0);  
3410 - if ($type == WebTemplateCommon::$indexName){ 3349 + $webTemplateCommon = BTemplateCommon::where("project_id",$project->id)->where("template_id",0);
  3350 + if ($type == RouteMap::SOURCE_INDEX){
3411 $webTemplateCommon = $webTemplateCommon->where("type",1)->where("is_custom",0)->first(); 3351 $webTemplateCommon = $webTemplateCommon->where("type",1)->where("is_custom",0)->first();
3412 } 3352 }
3413 - if ($type == WebTemplateCommon::$productName){ 3353 + if ($type == RouteMap::SOURCE_PRODUCT){
3414 $webTemplateCommon = $webTemplateCommon->where("type",2)->where("is_custom",0)->first(); 3354 $webTemplateCommon = $webTemplateCommon->where("type",2)->where("is_custom",0)->first();
3415 } 3355 }
3416 - if ($type == WebTemplateCommon::$productCategoryName){ 3356 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
3417 $webTemplateCommon = $webTemplateCommon->where("type",3)->where("is_custom",0)->first(); 3357 $webTemplateCommon = $webTemplateCommon->where("type",3)->where("is_custom",0)->first();
3418 } 3358 }
3419 - if ($type == WebTemplateCommon::$blogName){ 3359 + if ($type == RouteMap::SOURCE_BLOG){
3420 $webTemplateCommon = $webTemplateCommon->where("type",4)->where("is_custom",0)->first(); 3360 $webTemplateCommon = $webTemplateCommon->where("type",4)->where("is_custom",0)->first();
3421 } 3361 }
3422 - if ($type == WebTemplateCommon::$blogCategoryName){ 3362 + if ($type == RouteMap::SOURCE_PRODUCT_CATE){
3423 $webTemplateCommon = $webTemplateCommon->where("type",5)->where("is_custom",0)->first(); 3363 $webTemplateCommon = $webTemplateCommon->where("type",5)->where("is_custom",0)->first();
3424 } 3364 }
3425 - if ($type == WebTemplateCommon::$newsName){ 3365 + if ($type == RouteMap::SOURCE_NEWS){
3426 $webTemplateCommon = $webTemplateCommon->where("type",6)->where("is_custom",0)->first(); 3366 $webTemplateCommon = $webTemplateCommon->where("type",6)->where("is_custom",0)->first();
3427 } 3367 }
3428 - if ($type == WebTemplateCommon::$newsCategoryName){ 3368 + if ($type == RouteMap::SOURCE_NEWS_CATE){
3429 $webTemplateCommon = $webTemplateCommon->where("type",7)->where("is_custom",0)->first(); 3369 $webTemplateCommon = $webTemplateCommon->where("type",7)->where("is_custom",0)->first();
3430 } 3370 }
3431 - if ($type == WebTemplateCommon::$extendName){  
3432 - $modules = Module::where("project_id",$project->id)->where("status",0)->where("id",$routerMap->source_id)->first(); 3371 + if ($type == RouteMap::SOURCE_MODULE){
  3372 + $modules = CustomModuleContent::where("project_id",$project->id)->where("status",0)->where("id",$routerMap->source_id)->first();
3433 if (!empty($modules)){ 3373 if (!empty($modules)){
3434 - $moduleCategoryInfo = Module::getModuleCategory($project->id,$modules); 3374 + $moduleCategoryInfo = CustomModuleContent::getModuleCategory($project->id,$modules);
3435 if (isset($moduleCategoryInfo->getExtend->id)){ 3375 if (isset($moduleCategoryInfo->getExtend->id)){
3436 $webTemplateCommon = $webTemplateCommon->where("type",$moduleCategoryInfo->getExtend->id)->where("is_custom",1)->where("is_list",0)->first(); 3376 $webTemplateCommon = $webTemplateCommon->where("type",$moduleCategoryInfo->getExtend->id)->where("is_custom",1)->where("is_list",0)->first();
3437 }else{ 3377 }else{
@@ -3441,8 +3381,8 @@ class PageService{ @@ -3441,8 +3381,8 @@ class PageService{
3441 $webTemplateCommon = null; 3381 $webTemplateCommon = null;
3442 } 3382 }
3443 } 3383 }
3444 - if ($type == WebTemplateCommon::$extendCategoryName){  
3445 - $moduleInfo = ModuleCategory::getModuleCategoryAndExtendById($project->id,$routerMap->source_id); 3384 + if ($type == RouteMap::SOURCE_MODULE_CATE){
  3385 + $moduleInfo = CustomModuleCategory::getModuleCategoryAndExtendById($project->id,$routerMap->source_id);
3446 if (isset($moduleInfo->getExtend->id)){ 3386 if (isset($moduleInfo->getExtend->id)){
3447 $webTemplateCommon = $webTemplateCommon->where("type",$moduleInfo->getExtend->id)->where("is_custom",1)->where("is_list",1)->first(); 3387 $webTemplateCommon = $webTemplateCommon->where("type",$moduleInfo->getExtend->id)->where("is_custom",1)->where("is_list",1)->first();
3448 }else{ 3388 }else{
@@ -3450,7 +3390,7 @@ class PageService{ @@ -3450,7 +3390,7 @@ class PageService{
3450 } 3390 }
3451 } 3391 }
3452 3392
3453 - if (!empty($webTemplateCommon) && $type != WebTemplateCommon::$pageName && $type != WebTemplateCommon::$productKeywordName){ 3393 + if (!empty($webTemplateCommon) && $type != RouteMap::SOURCE_PAGE && $type != RouteMap::SOURCE_PRODUCT_KEYWORD){
3454 $html = $this->handleAllHtml($webTemplateCommon,$html); 3394 $html = $this->handleAllHtml($webTemplateCommon,$html);
3455 } 3395 }
3456 $content = $html; 3396 $content = $html;
@@ -3477,19 +3417,19 @@ class PageService{ @@ -3477,19 +3417,19 @@ class PageService{
3477 $html = $this->isAndGetVisualizationHtml($project,$type,$routerMap); 3417 $html = $this->isAndGetVisualizationHtml($project,$type,$routerMap);
3478 if ($html == ""){ 3418 if ($html == ""){
3479 //查看项目所属模板信息 3419 //查看项目所属模板信息
3480 - $templateInfo= BSetting::where("project_id",$project->id)->first(); 3420 + $templateInfo= Setting::where("project_id",$project->id)->first();
3481 if ($templateInfo == null){ 3421 if ($templateInfo == null){
3482 return $this->response("error",WebSetting::$errStatus,"No homepage template set"); 3422 return $this->response("error",WebSetting::$errStatus,"No homepage template set");
3483 } 3423 }
3484 3424
3485 //取头部数据,查看是否开启页面独立头部 3425 //取头部数据,查看是否开启页面独立头部
3486 $webTemplateHeaderFooterIndependence = null; 3426 $webTemplateHeaderFooterIndependence = null;
3487 - $webTemplateCommonOuterQuery = WebTemplateCommon::where("project_id",$project->id)->where("template_id",$templateInfo->template_id); 3427 + $webTemplateCommonOuterQuery = BTemplateCommon::where("project_id",$project->id)->where("template_id",$templateInfo->template_id);
3488 $projectBuild = DeployBuild::where("project_id",$project->id)->first(); 3428 $projectBuild = DeployBuild::where("project_id",$project->id)->first();
3489 if (!empty($projectBuild)){ 3429 if (!empty($projectBuild)){
3490 $configuration = json_decode($projectBuild->configuration); 3430 $configuration = json_decode($projectBuild->configuration);
3491 if (isset($configuration->is_head) && $configuration->is_head == 1){ 3431 if (isset($configuration->is_head) && $configuration->is_head == 1){
3492 - $projectPageSetting = ProjectPageSetting::where("project_id",$project->id)->first(); 3432 + $projectPageSetting = PageSetting::where("project_id",$project->id)->first();
3493 if (!empty($projectPageSetting)){ 3433 if (!empty($projectPageSetting)){
3494 //有独立头部,取 gl_web_template_common 表对应的头部底部(html+css) 3434 //有独立头部,取 gl_web_template_common 表对应的头部底部(html+css)
3495 $webTemplateHeaderFooterIndependence = $this->getPageHeadDataByType($project,$projectPageSetting,$type,$templateInfo,$routerMap); 3435 $webTemplateHeaderFooterIndependence = $this->getPageHeadDataByType($project,$projectPageSetting,$type,$templateInfo,$routerMap);
@@ -3528,43 +3468,43 @@ class PageService{ @@ -3528,43 +3468,43 @@ class PageService{
3528 } 3468 }
3529 } 3469 }
3530 switch ($type) { 3470 switch ($type) {
3531 - case WebTemplateCommon::$productName:  
3532 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$productSource,$isVisualizationArr)){ 3471 + case RouteMap::SOURCE_PRODUCT:
  3472 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_PRODUCT_DETAIL,$isVisualizationArr)){
3533 return true; 3473 return true;
3534 } 3474 }
3535 break; 3475 break;
3536 - case WebTemplateCommon::$productCategoryName:  
3537 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$productCategory,$isVisualizationArr)){ 3476 + case RouteMap::SOURCE_PRODUCT_CATE:
  3477 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_PRODUCT_LIST,$isVisualizationArr)){
3538 return true; 3478 return true;
3539 } 3479 }
3540 break; 3480 break;
3541 - case WebTemplateCommon::$blogName:  
3542 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$blog,$isVisualizationArr)){ 3481 + case RouteMap::SOURCE_BLOG:
  3482 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_BLOG_DETAIL,$isVisualizationArr)){
3543 return true; 3483 return true;
3544 } 3484 }
3545 break; 3485 break;
3546 - case WebTemplateCommon::$blogCategoryName:  
3547 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$blogCategory,$isVisualizationArr)){ 3486 + case RouteMap::SOURCE_BLOG_CATE:
  3487 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_BLOG_LIST,$isVisualizationArr)){
3548 return true; 3488 return true;
3549 } 3489 }
3550 break; 3490 break;
3551 - case WebTemplateCommon::$newsName:  
3552 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$news,$isVisualizationArr)){ 3491 + case RouteMap::SOURCE_NEWS:
  3492 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_NEWS_DETAIL,$isVisualizationArr)){
3553 return true; 3493 return true;
3554 } 3494 }
3555 break; 3495 break;
3556 - case WebTemplateCommon::$newsCategoryName:  
3557 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$newsCategory,$isVisualizationArr)){ 3496 + case RouteMap::SOURCE_NEWS_CATE:
  3497 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_NEWS_LIST,$isVisualizationArr)){
3558 return true; 3498 return true;
3559 } 3499 }
3560 break; 3500 break;
3561 - case WebTemplateCommon::$indexName:  
3562 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$index,$isVisualizationArr)){ 3501 + case RouteMap::SOURCE_INDEX:
  3502 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_HOME,$isVisualizationArr)){
3563 return true; 3503 return true;
3564 } 3504 }
3565 break; 3505 break;
3566 - case WebTemplateCommon::$pageName:  
3567 - if (!empty($isVisualizationArr) && in_array((string)WebTemplateCommon::$pageIsVisualization,$isVisualizationArr)){ 3506 + case RouteMap::SOURCE_PAGE:
  3507 + if (!empty($isVisualizationArr) && in_array((string)BTemplate::TYPE_CUSTOM_PAGE,$isVisualizationArr)){
3568 return true; 3508 return true;
3569 } 3509 }
3570 break; 3510 break;
@@ -3581,7 +3521,7 @@ class PageService{ @@ -3581,7 +3521,7 @@ class PageService{
3581 { 3521 {
3582 $html = ""; 3522 $html = "";
3583 $isVisualizationArr = []; 3523 $isVisualizationArr = [];
3584 - $visualizationHtmlQuery = VisualizationHtml::where("project_id",$project->id); 3524 + $visualizationHtmlQuery = Visualization::where("project_id",$project->id);
3585 if (isset($project->is_visualization) && !empty($project->is_visualization)){ 3525 if (isset($project->is_visualization) && !empty($project->is_visualization)){
3586 $isVisualization = json_decode($project->is_visualization); 3526 $isVisualization = json_decode($project->is_visualization);
3587 if (isset($isVisualization->page_array) && !empty($isVisualization->page_array)){ 3527 if (isset($isVisualization->page_array) && !empty($isVisualization->page_array)){