From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/api/controller/branch/admin/Activity.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/app/api/controller/branch/admin/Activity.php b/admin/app/api/controller/branch/admin/Activity.php
index 0fc166d..68df352 100644
--- a/admin/app/api/controller/branch/admin/Activity.php
+++ b/admin/app/api/controller/branch/admin/Activity.php
@@ -73,19 +73,19 @@
// 活动分类
$category = CategoryModel::getAll();
$model = ActivityModel::detail($activity_id);
+ $model = $model->toArray();
// 报名时间
$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['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'));
}
// 活动详情
$model = ActivityModel::detail($activity_id);
$data = json_decode($this->request->post('formData', '', null), true);
- if(empty($data['start_time']) || empty($data['end_time'])){
+ if(empty($data['activity_start_time']) || empty($data['activity_end_time'])){
return $this->renderError('请选择活动时间');
}
if (empty($data['latitude'])) {
--
Gitblit v1.9.2