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/model/branch/Activity.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/app/api/model/branch/Activity.php b/admin/app/api/model/branch/Activity.php
index 603a5c9..d2d5afc 100644
--- a/admin/app/api/model/branch/Activity.php
+++ b/admin/app/api/model/branch/Activity.php
@@ -113,11 +113,11 @@
         $data['app_id'] = self::$app_id;
         $data['branch_id'] = $branch_id;
         //活动时间
-        $data['activity_start_time'] = strtotime($data['start_time']);
-        $data['activity_end_time'] = strtotime($data['end_time']);
+        $data['activity_start_time'] = strtotime($data['activity_start_time']);
+        $data['activity_end_time'] = strtotime($data['activity_end_time']);
         //报名时间
-        $data['register_start_time'] = time(); // 发布的时间即为报名开始时间(小程序端逻辑)
-        $data['register_end_time'] = $data['activity_end_time']; // 活动结束时间即为报名结束时间(小程序端逻辑)
+        $data['register_start_time'] = strtotime($data['register_start_time']);
+        $data['register_end_time'] = strtotime($data['register_end_time']);
         return $this->save($data);
     }
 
@@ -127,11 +127,11 @@
     public function edit($data)
     {
         //活动时间
-        $data['activity_start_time'] = strtotime($data['start_time']);
-        $data['activity_end_time'] = strtotime($data['end_time']);
+        $data['activity_start_time'] = strtotime($data['activity_start_time']);
+        $data['activity_end_time'] = strtotime($data['activity_end_time']);
         //报名时间
-        $data['register_start_time'] = time(); // 发布的时间即为报名开始时间(小程序端逻辑)
-        $data['register_end_time'] = $data['activity_end_time']; // 活动结束时间即为报名结束时间(小程序端逻辑)
+        $data['register_start_time'] = strtotime($data['register_start_time']);
+        $data['register_end_time'] = strtotime($data['register_end_time']);
         return $this->save($data);
     }
 

--
Gitblit v1.9.2