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/Activity.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index ba42607..9b16ab1 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -55,7 +55,7 @@
         // 用户是否已报名
         $detail['is_reg'] = ActivityUserModel::isReg($user['user_id'], $activity_id);
         // 用户是否已加入分会
-        $detail['is_member'] = MemberModel::isMember($user['user_id']);
+        $detail['is_member'] =/*MemberModel::isMember($user['user_id'])*/false;
         // 用户是否已签到
         $detail['is_verify'] = ActivityUserModel::isVerify($user['user_id'], $activity_id);
         $store = SettingModel::getItem('store');
@@ -63,7 +63,7 @@
         $points = SettingModel::getItem('points');
         $detail['points_ratio'] = $points['discount']['discount_ratio']; // 积分抵扣比例
         // 获取报名用户列表
-        $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 8);
+        $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 7);
         return $this->renderSuccess('', compact('detail', 'userList'));
     }
 

--
Gitblit v1.9.2