From a90ac240c499e686793744b25732b6ac6a57edfd Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 10:46:51 +0800
Subject: [PATCH] 1、商家端添加会员管理 2、修复分会绑定会长时获取获取会员信息报错 3、修复添加分会成员是没保存分会id问题 4、修复获取分会成员时获取的是所有的分会的成员
---
admin/app/api/controller/branch/admin/Activity.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/admin/app/api/controller/branch/admin/Activity.php b/admin/app/api/controller/branch/admin/Activity.php
index c89d2f5..0fc166d 100644
--- a/admin/app/api/controller/branch/admin/Activity.php
+++ b/admin/app/api/controller/branch/admin/Activity.php
@@ -48,7 +48,10 @@
$model = new ActivityModel;
//Vue要添加的数据
$data = json_decode($this->request->post('formData', '', null), true);
- if(empty($data['start_time']) || empty($data['end_time'])){
+ if(empty($data['register_start_time']) || empty($data['register_end_time'])){
+ return $this->renderError('请选择报名时间');
+ }
+ if(empty($data['activity_start_time']) || empty($data['activity_end_time'])){
return $this->renderError('请选择活动时间');
}
if (empty($data['latitude'])) {
@@ -70,9 +73,12 @@
// 活动分类
$category = CategoryModel::getAll();
$model = ActivityModel::detail($activity_id);
+ // 报名时间
+ $model['register_start_time'] = date("Y-m-d H:i:s", $model['register_start_time']);
+ $model['register_end_time'] = date("Y-m-d H:i:s", $model['register_end_time']);
//活动时间
- $model['start_time'] = date("Y-m-d H:i:s", $model['activity_start_time']);
- $model['end_time'] = date("Y-m-d H:i:s", $model['activity_end_time']);
+ $model['activity_start_time'] = date("Y-m-d H:i:s", $model['activity_start_time']);
+ $model['activity_end_time'] = date("Y-m-d H:i:s", $model['activity_end_time']);
return $this->renderSuccess('', compact('category', 'model'));
}
--
Gitblit v1.9.2