From 9f2b6dada7304026de555b3e751b17a5a65e6d7a Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 14:36:05 +0800
Subject: [PATCH] 1、修复会长小程序端编辑获取信息报错和选择了活动时间但还是提示请选择活动时间 2、修复小程序添加分会成员选择会员时无法下拉问题
---
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