gx

@@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\BTemplateModuleLogic;
 use App\Http\Logic\Bside\BTemplate\BTemplateModuleLogic;
 use App\Http\Logic\Bside\BTemplate\BTemplateModuleProjectLogic;
 use App\Http\Logic\Bside\BTemplate\BTemplateModuleProjectLogic;
 use App\Models\Template\BModuleProject;
 use App\Models\Template\BModuleProject;
+use App\Models\Template\TemplateLabel;
 
 
 /**
 /**
  * @remark :左侧模块管理
  * @remark :左侧模块管理

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Bside\BTemplate;
 namespace App\Http\Logic\Bside\BTemplate;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Template\TemplateLabel;
 use App\Models\Template\TemplateModule;
 use App\Models\Template\TemplateModule;
 use App\Models\Template\TemplateType;
 use App\Models\Template\TemplateType;
 
 
@@ -25,8 +26,13 @@ class BTemplateModuleLogic extends BaseLogic
     public function ModuleList($map,$order = 'created_at',$filed = ['id','name','type','sort','status','image','test_model']){
     public function ModuleList($map,$order = 'created_at',$filed = ['id','name','type','sort','status','image','test_model']){
         $map['deleted_status'] = 0;
         $map['deleted_status'] = 0;
         $map['status'] = 0;
         $map['status'] = 0;
-        $lists = $this->model->list($map,$order,$filed);
-        return $this->success($lists);
+        $list = $this->model->list($map,$order,$filed);
+        $templateLabel = new TemplateLabel();
+        foreach ($list as $k => $v){
+            $v['label'] = $templateLabel->list(['template_id'=>$v['id'],'type'=>2],'id',['id','name'],'desc',5);
+            $list[$k] = $v;
+        }
+        return $this->success($list);
     }
     }
 
 
     /**
     /**

@@ -539,6 +539,7 @@ Route::middleware(['bloginauth'])->group(function () {
     });
     });
     //oa教程
     //oa教程
     Route::prefix('template_label')->group(function () {
     Route::prefix('template_label')->group(function () {
+        Route::any('/getUserLists', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'getUserLists'])->name('template_label_getUserLists');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'save'])->name('template_label_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'save'])->name('template_label_save');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'del'])->name('template_label_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'del'])->name('template_label_del');
     });
     });