gx

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\User\UserLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
@@ -53,6 +54,24 @@ class ComController extends BaseController
         $this->response('当前用户菜单列表',Code::SUCCESS,$menu);
     }
 
+    /**
+     * @remark :获取当前菜单的自定义模块
+     * @name   :getProjectCustomMenu
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/13 16:48
+     */
+    public function getCustomMenu(){
+        $customModel = new CustomModule();
+        $list = $customModel->list(['status'=>0],['sort','id']);
+        if(!empty($list)){
+            foreach ($list as $k=>$v){
+                $v['sub'] = [$v['name'].'管理',$v['name'].'分类'];
+                $list[$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$list);
+    }
 
     /**
      * @name :获取当前项目详情

@@ -78,23 +78,22 @@ class BTemplateLogic extends BaseLogic
         $templateInfo = $this->webTemplateInfo($settingInfo['template_id'],$source,$source_id,$is_custom);
         if($templateInfo === false){
             if($this->user['is_customized'] == BTemplate::SOURCE_VISUALIZATION){//处理定制页面初始数据
-                $resultCode = $this->isCustomizedPage($source,$source_id);//查看当前页面是否定制
-                if($resultCode !== true){
-                    return ['html'=>$resultCode['html'],'template_id'=>$resultCode['template_id']];
+                $result = $this->isCustomizedPage($source,$source_id);//查看当前页面是否定制
+                if($result !== true){
+                    return ['html'=>$result['html'],'template_id'=>$result['template_id']];
                 }
             }
             $mainInfo = $this->getCommonMain($source,$source_id);//获取中间部分代码
         }else{
-            $mainInfo = [
-                'main_html'=>$templateInfo['main_html'],
-                'main_css'=>$templateInfo['main_css'],
-            ];
+            $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
         }
-        $commonInfo = $this->getCommonPage($source,$source_id,$settingInfo['template_id']);//获取头部
         if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
+            $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
+            $commonInfo = $this->getCommonPage(['template_id'=>0,'project_id'=>$this->user['project_id'],'type'=>$type]);//获取定制头部
             $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
             return ['html'=>$html,'template_id'=>$settingInfo['template_id']];
         }
+        $commonInfo = $this->getCommonPage($source,$source_id,$settingInfo['template_id']);//获取头部
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
             $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
         $html = $this->getHeadFooter($html);
@@ -117,7 +116,7 @@ class BTemplateLogic extends BaseLogic
     }
 
     /**
-     * @remark :页面是否为定制页面
+     * @remark :页面是否为定制页面获取初始代码
      * @name   :watchProjectIsCustomized
      * @author :lyh
      * @method :post

@@ -13,6 +13,8 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/unbindWechat', [\App\Http\Controllers\Bside\BCom\ComController::class, 'unbindWechat'])->name('unbindWechat');
     //获取当前登录用户菜单
     Route::any('/get_menu', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_menu'])->name('get_menu');
+    //自定义菜单
+    Route::any('/getCustomMenu', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getCustomMenu'])->name('get_getCustomMenu');
     //获取当前登录用户项目详情
     Route::any('/get_project', [\App\Http\Controllers\Bside\BCom\ComController::class, 'get_project'])->name('get_project');
     Route::any('/generateToken', [\App\Http\Controllers\Bside\BCom\ComController::class, 'generateToken'])->name('generateToken');