From 898043fc97d2ab8b793fd317a049b874ed207c6d Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 10 Dec 2025 20:12:31 +0800
Subject: [PATCH] 商户添加分类

---
 admin/app/api/controller/branch/Activity.php |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index 4762e9c..bc20541 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -39,7 +39,8 @@
     {
         $model = new ActivityModel;
         $list = $model->getList($category_id, $this->postData(), $this->getUser());
-        return $this->renderSuccess('', compact('list'));
+        $words = BranchSettingModel::getItem('words');
+        return $this->renderSuccess('', compact('list', 'words'));
     }
 
     /**
@@ -96,7 +97,14 @@
             return $this->renderSuccess('', compact('order_id'));
         }
     }
-
+    public function getRegistrationInformation($user_id = 0)
+    {
+        // 生成报名用户
+        $model = new ActivityUserModel();
+        $userId = $user_id!=0?$user_id:$this->getUser()['user_id'];
+        $registrationInformation = $model->getRegistrationInformation($userId);
+        return $this->renderSuccess('', compact('registrationInformation'));
+    }
     /**
      * 生成活动海报
      */

--
Gitblit v1.9.2