From ca425b889f3c1b5847ffc26a0229307f7f8ef43e Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Tue, 09 Dec 2025 16:11:31 +0800
Subject: [PATCH] 添加消费券 商户端添加页面diy

---
 admin/app/api/controller/branch/ActivityProduct.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/admin/app/api/controller/branch/ActivityProduct.php b/admin/app/api/controller/branch/ActivityProduct.php
index 776669c..2beb443 100644
--- a/admin/app/api/controller/branch/ActivityProduct.php
+++ b/admin/app/api/controller/branch/ActivityProduct.php
@@ -6,6 +6,7 @@
 use app\api\model\branch\Activity as ActivityModel;
 use app\api\model\branch\ActivityProduct as ActivityProductModel;
 use app\api\model\branch\ActivityCart as ActivityCartModel; // 活动购物车
+use app\common\model\branch\Setting as SettingModel;
 
 /**
  * 活动商品控制器
@@ -33,6 +34,7 @@
         $model = new ActivityProductModel();
         $list = $model->getList($activity_id);
         $cart_total_num = (new ActivityCartModel())->where(['activity_id'=>$activity_id,'user_id'=>$user['user_id']])->count();
-        return $this->renderSuccess('', compact('list', 'cart_total_num', 'activityDetail'));
+        $words = SettingModel::getItem('words');
+        return $this->renderSuccess('', compact('list', 'cart_total_num', 'activityDetail', 'words'));
     }
 }
\ No newline at end of file

--
Gitblit v1.9.2