gx

@@ -32,7 +32,7 @@ class CustomModuleContentController extends BaseController
             'module_id.required' => 'module_id不能为空',
             'module_id.required' => 'module_id不能为空',
         ]);
         ]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $customModuleContent->lists($this->map,$this->page,$this->row,$this->order);
+        $lists = $customModuleContent->lists($this->map,$this->page,$this->row,$this->order = ['sort','id']);
         if(!empty($lists)){
         if(!empty($lists)){
             $data = $this->getAllCategoryName();
             $data = $this->getAllCategoryName();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
@@ -158,4 +158,21 @@ class CustomModuleContentController extends BaseController
         $logic->contentDel();
         $logic->contentDel();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/15 17:46
+     */
+    public function sort(CustomModuleContentLogic $logic){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $logic->contentSort();
+        $this->response('success');
+    }
 }
 }

@@ -83,13 +83,13 @@ class BTemplateLogic extends BaseLogic
             }
             }
             $mainInfo = $this->getCommonMain($source,$source_id,$is_custom);//获取中间部分代码
             $mainInfo = $this->getCommonMain($source,$source_id,$is_custom);//获取中间部分代码
         }else{
         }else{
-            $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
                 $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
                 $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
                 $commonInfo = $this->getCommonPage(0,$this->user['project_id'],$type);//获取定制头部
                 $commonInfo = $this->getCommonPage(0,$this->user['project_id'],$type);//获取定制头部
                 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
                 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
                 return $this->success(['html'=>$html,'template_id'=>$template_id]);
                 return $this->success(['html'=>$html,'template_id'=>$template_id]);
             }
             }
+            $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
         }
         }
         $commonInfo = $this->getCommonPage($source,$source_id,$template_id);//获取头部
         $commonInfo = $this->getCommonPage($source,$source_id,$template_id);//获取头部
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].

@@ -325,4 +325,16 @@ class CustomModuleContentLogic extends BaseLogic
         $this->curlDelRoute(['route'=>$info['route']]);
         $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :contentSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/15 17:47
+     */
+    public function contentSort(){
+        $this->model->edit(['sort' => $this->param['sort']], ['id'=>$this->param['id']]);
+        return $this->success();
+    }
 }
 }

@@ -445,6 +445,7 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/getCategoryList', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'getCategoryList'])->name('custom_content_getCategoryList');
             Route::any('/getCategoryList', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'getCategoryList'])->name('custom_content_getCategoryList');
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'info'])->name('custom_content_info');
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'info'])->name('custom_content_info');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'save'])->name('custom_content_save');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'save'])->name('custom_content_save');
+            Route::any('/sort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'sort'])->name('custom_content_sort');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'del'])->name('custom_content_del');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleContentController::class, 'del'])->name('custom_content_del');
         });
         });