From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/api/controller/branch/admin/Activity.php | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/admin/app/api/controller/branch/admin/Activity.php b/admin/app/api/controller/branch/admin/Activity.php
index c89d2f5..68df352 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,16 +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['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'));
}
// 活动详情
$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