周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 f1e375a4ee28c52461689f3f646757b8099089e0 1 个父辈 52f00195

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 29 行增加 和 9 行删除
@@ -7,6 +7,7 @@ use App\Helper\Arr; @@ -7,6 +7,7 @@ use App\Helper\Arr;
7 use App\Helper\Common; 7 use App\Helper\Common;
8 use App\Http\Controllers\Bside\BaseController; 8 use App\Http\Controllers\Bside\BaseController;
9 use App\Http\Logic\Bside\User\UserLogic; 9 use App\Http\Logic\Bside\User\UserLogic;
  10 +use App\Models\CustomModule\CustomModule;
10 use App\Models\Project\DeployBuild; 11 use App\Models\Project\DeployBuild;
11 use App\Models\Project\Project; 12 use App\Models\Project\Project;
12 use App\Models\RouteMap\RouteMap; 13 use App\Models\RouteMap\RouteMap;
@@ -53,6 +54,24 @@ class ComController extends BaseController @@ -53,6 +54,24 @@ class ComController extends BaseController
53 $this->response('当前用户菜单列表',Code::SUCCESS,$menu); 54 $this->response('当前用户菜单列表',Code::SUCCESS,$menu);
54 } 55 }
55 56
  57 + /**
  58 + * @remark :获取当前菜单的自定义模块
  59 + * @name :getProjectCustomMenu
  60 + * @author :lyh
  61 + * @method :post
  62 + * @time :2023/12/13 16:48
  63 + */
  64 + public function getCustomMenu(){
  65 + $customModel = new CustomModule();
  66 + $list = $customModel->list(['status'=>0],['sort','id']);
  67 + if(!empty($list)){
  68 + foreach ($list as $k=>$v){
  69 + $v['sub'] = [$v['name'].'管理',$v['name'].'分类'];
  70 + $list[$k] = $v;
  71 + }
  72 + }
  73 + $this->response('success',Code::SUCCESS,$list);
  74 + }
56 75
57 /** 76 /**
58 * @name :获取当前项目详情 77 * @name :获取当前项目详情
@@ -78,23 +78,22 @@ class BTemplateLogic extends BaseLogic @@ -78,23 +78,22 @@ class BTemplateLogic extends BaseLogic
78 $templateInfo = $this->webTemplateInfo($settingInfo['template_id'],$source,$source_id,$is_custom); 78 $templateInfo = $this->webTemplateInfo($settingInfo['template_id'],$source,$source_id,$is_custom);
79 if($templateInfo === false){ 79 if($templateInfo === false){
80 if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//处理定制页面初始数据 80 if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//处理定制页面初始数据
81 - $resultCode = $this->isCustomizedPage($source,$source_id);//查看当前页面是否定制  
82 - if($resultCode !== true){  
83 - return ['html'=>$resultCode['html'],'template_id'=>$resultCode['template_id']]; 81 + $result = $this->isCustomizedPage($source,$source_id);//查看当前页面是否定制
  82 + if($result !== true){
  83 + return ['html'=>$result['html'],'template_id'=>$result['template_id']];
84 } 84 }
85 } 85 }
86 $mainInfo = $this->getCommonMain($source,$source_id);//获取中间部分代码 86 $mainInfo = $this->getCommonMain($source,$source_id);//获取中间部分代码
87 }else{ 87 }else{
88 - $mainInfo = [  
89 - 'main_html'=>$templateInfo['main_html'],  
90 - 'main_css'=>$templateInfo['main_css'],  
91 - ]; 88 + $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
92 } 89 }
93 - $commonInfo = $this->getCommonPage($source,$source_id,$settingInfo['template_id']);//获取头部  
94 if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码 90 if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
  91 + $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
  92 + $commonInfo = $this->getCommonPage(['template_id'=>0,'project_id'=>$this->user['project_id'],'type'=>$type]);//获取定制头部
95 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']); 93 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
96 return ['html'=>$html,'template_id'=>$settingInfo['template_id']]; 94 return ['html'=>$html,'template_id'=>$settingInfo['template_id']];
97 } 95 }
  96 + $commonInfo = $this->getCommonPage($source,$source_id,$settingInfo['template_id']);//获取头部
98 $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other']. 97 $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
99 $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html']; 98 $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
100 $html = $this->getHeadFooter($html); 99 $html = $this->getHeadFooter($html);
@@ -117,7 +116,7 @@ class BTemplateLogic extends BaseLogic @@ -117,7 +116,7 @@ class BTemplateLogic extends BaseLogic
117 } 116 }
118 117
119 /** 118 /**
120 - * @remark :页面是否为定制页面 119 + * @remark :页面是否为定制页面获取初始代码
121 * @name :watchProjectIsCustomized 120 * @name :watchProjectIsCustomized
122 * @author :lyh 121 * @author :lyh
123 * @method :post 122 * @method :post
@@ -13,6 +13,8 @@ Route::middleware(['bloginauth'])->group(function () { @@ -13,6 +13,8 @@ Route::middleware(['bloginauth'])->group(function () {
13 Route::any('/unbindWechat', [\App\Http\Controllers\Bside\BCom\ComController::class, 'unbindWechat'])->name('unbindWechat'); 13 Route::any('/unbindWechat', [\App\Http\Controllers\Bside\BCom\ComController::class, 'unbindWechat'])->name('unbindWechat');
14 //获取当前登录用户菜单 14 //获取当前登录用户菜单
15 Route::any('/get_menu', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_menu'])->name('get_menu'); 15 Route::any('/get_menu', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_menu'])->name('get_menu');
  16 + //自定义菜单
  17 + Route::any('/getCustomMenu', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getCustomMenu'])->name('get_getCustomMenu');
16 //获取当前登录用户项目详情 18 //获取当前登录用户项目详情
17 Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project'); 19 Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project');
18 Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken'); 20 Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken');