From 32555f8668cd69cfd67fe8c661f503db2f45f2ce Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Sun, 16 Nov 2025 23:21:30 +0800
Subject: [PATCH] 1、小程序端分会管理可以添加会员； 2、后台可自定义连盟汇一些页面的的标题； 3、职务和电话增加是否显示的开关； 4、小程序端添加活动增加报名时间； 5、修复分会后台无法上传视频的问题。
---
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