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/branch/controller/activity/Activity.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/admin/app/branch/controller/activity/Activity.php b/admin/app/branch/controller/activity/Activity.php
index c0aa703..7ebae95 100644
--- a/admin/app/branch/controller/activity/Activity.php
+++ b/admin/app/branch/controller/activity/Activity.php
@@ -7,7 +7,7 @@
use app\branch\model\category\Category as CategoryModel;
use app\shop\model\user\User as UserModel;
use app\common\service\qrcode\BranchActivityService;
-use app\branch\model\activityProduct\ActivityProduct as ActivityProductModel;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
/**
* 活动控制器
@@ -59,8 +59,9 @@
*/
public function detail($activity_id)
{
- $model = new ActivityModel;
- return $this->renderSuccess('', $model->detail($activity_id));
+ $model = (new ActivityModel)->detail($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+ return $this->renderSuccess('', $model);
}
/**
@@ -86,7 +87,7 @@
// if ($model['verify_user_ids']) {
// $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
// }
- $model['product_list'] = (new ActivityProductModel())->getProductPricelist($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
$product_ids = [];
if(!empty($model['product_list'])){
$product_ids = array_column($model['product_list'], 'product_id');
--
Gitblit v1.9.2