gx

@@ -834,7 +834,10 @@ class ProjectController extends BaseController
             $channel_list = $channelModel->list(['zone_id'=>$v['id']]);
             $channel_list = $channelModel->list(['zone_id'=>$v['id']]);
             foreach ($channel_list as $k1 => $v1){
             foreach ($channel_list as $k1 => $v1){
                 $user_list = $channelUserModel->list(['channel_id'=>$v1['id']]);
                 $user_list = $channelUserModel->list(['channel_id'=>$v1['id']]);
+                $channel_list[$k1]['user_list'] = $user_list;
             }
             }
+            $zone_list[$k] = $channel_list;
         }
         }
+        $this->response('success',Code::SUCCESS,$zone_list);
     }
     }
 }
 }

@@ -47,8 +47,8 @@ class BTemplateLogic extends BaseLogic
      */
      */
     public function publicTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['id','name','image','url','created_at','status','deleted_status']){
     public function publicTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['id','name','image','url','created_at','status','deleted_status']){
         $templateModel = new Template();
         $templateModel = new Template();
-        $map['deleted_status'] = 0;
-        $map['status'] = 0;
+        $map['deleted_status'] = BTemplate::STATUS;
+        $map['status'] = BTemplate::STATUS;
         $lists = $templateModel->lists($map,$page,$row,$order,$filed);
         $lists = $templateModel->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
         return $this->success($lists);
     }
     }

@@ -13,7 +13,12 @@ use App\Models\Base;
 class BTemplate extends Base
 class BTemplate extends Base
 {
 {
     const SOURCE_HOME = 1;//首页
     const SOURCE_HOME = 1;//首页
-    const SOURCE_PRODUCT = 2;//产品页
+    const SOURCE_PRODUCT = 2;//产品
+    const SOURCE_BLOG = 3;//博客
+    const SOURCE_NEWS = 4;//新闻详情页
+
+
+    const STATUS = 0;
 
 
     protected $table = 'gl_web_template';
     protected $table = 'gl_web_template';
     //连接数据库
     //连接数据库

@@ -172,6 +172,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/copyProject', [Aside\Project\ProjectController::class, 'copyProject'])->name('admin.project_copyProject');
         Route::any('/copyProject', [Aside\Project\ProjectController::class, 'copyProject'])->name('admin.project_copyProject');
         Route::any('/site_token', [Aside\Project\ProjectController::class, 'site_token'])->name('admin.project_site_token');
         Route::any('/site_token', [Aside\Project\ProjectController::class, 'site_token'])->name('admin.project_site_token');
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
         Route::any('/saveOtherProject', [Aside\Project\ProjectController::class, 'saveOtherProject'])->name('admin.project_saveOtherProject');//其他项目设置
+        Route::any('/getChannel', [Aside\Project\ProjectController::class, 'getChannel'])->name('admin.project_getChannel');//其他项目设置
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');