From 0f7fa35d76a063691ca523954213d34964ab0a8c Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 16 Jul 2021 15:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=88=97=E8=A1=A8=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E5=9B=BE=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v1/activity/StoreCombinationController.php           | 9 +++++++++
 crmeb/app/api/route/v1.php                               | 1 +
 crmeb/public/install/crmeb.sql                           | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/api/controller/v1/activity/StoreCombinationController.php b/crmeb/app/api/controller/v1/activity/StoreCombinationController.php
index 6ca2803e0..8971d6281 100644
--- a/crmeb/app/api/controller/v1/activity/StoreCombinationController.php
+++ b/crmeb/app/api/controller/v1/activity/StoreCombinationController.php
@@ -119,4 +119,13 @@ class StoreCombinationController
             return app('json')->success(['code' => '']);
         }
     }
+
+    /**
+     * 获取拼团列表轮播图
+     */
+    public function banner_list()
+    {
+        $banner = sys_data('combination_banner') ?? [];
+        return app('json')->success($banner);
+    }
 }
diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php
index d79ffdcd8..f032757ac 100644
--- a/crmeb/app/api/route/v1.php
+++ b/crmeb/app/api/route/v1.php
@@ -236,6 +236,7 @@ Route::group(function () {
     Route::get('bargain/list', 'v1.activity.StoreBargainController/lst')->name('bargainList');//砍价商品列表
     //活动---拼团
     Route::get('combination/list', 'v1.activity.StoreCombinationController/lst')->name('combinationList');//拼团商品列表
+    Route::get('combination/banner_list', 'v1.activity.StoreCombinationController/banner_list')->name('banner_list');//拼团轮播图
     Route::get('combination/detail/:id', 'v1.activity.StoreCombinationController/detail')->name('combinationDetail');//拼团商品详情
     //用户类
     Route::get('user/activity', 'v1.user.UserController/activity')->name('userActivity');//活动状态
diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql
index ce446a73f..0c979ef83 100644
--- a/crmeb/public/install/crmeb.sql
+++ b/crmeb/public/install/crmeb.sql
@@ -6509,8 +6509,8 @@ INSERT INTO `eb_system_group` (`id`, `cate_id`, `name`, `info`, `config_name`, `
 (59, 1, '促销单品推荐图片', '促销单品推荐图片', 'routine_home_benefit_banner', '[{"name":"\\u56fe\\u7247","title":"img","type":"upload","param":""},{"name":"\\u63cf\\u8ff0","title":"comment","type":"input","param":""},{"name":"\\u8df3\\u8f6c\\u94fe\\u63a5","title":"link","type":"input","param":""}]'),
 (62, 1, '充值金额设置', '设置充值金额额度选择', 'user_recharge_quota', '[{"name":"\\u552e\\u4ef7","title":"price","type":"input","param":""},{"name":"\\u8d60\\u9001","title":"give_money","type":"input","param":""}]'),
 (65, 1, '后台登录页面幻灯片', '后台登录页面幻灯片', 'admin_login_slide', '[{"name":"\\u5e7b\\u706f\\u7247","title":"slide","type":"upload","param":""}]'),
-(66, 1, '前端页面链接', '前端页面链接', 'uni_app_link', '[{"name":"\\u540d\\u79f0","title":"name","type":"input","param":""},{"name":"\\u5730\\u5740","title":"link","type":"input","param":""},{"name":"\\u53c2\\u6570","title":"param","type":"input","param":""},{"name":"\\u4e8b\\u4f8b","title":"example","type":"input","param":""}]');
-
+(66, 1, '前端页面链接', '前端页面链接', 'uni_app_link', '[{"name":"\\u540d\\u79f0","title":"name","type":"input","param":""},{"name":"\\u5730\\u5740","title":"link","type":"input","param":""},{"name":"\\u53c2\\u6570","title":"param","type":"input","param":""},{"name":"\\u4e8b\\u4f8b","title":"example","type":"input","param":""}]'),
+(67, 1, '拼团列表轮播图', '拼团列表轮播图', 'combination_banner', '[{"name":"\\u56fe\\u7247","title":"img","type":"upload","param":""},{"name":"\\u63cf\\u8ff0","title":"comment","type":"input","param":""},{"name":"\\u8df3\\u8f6c\\u94fe\\u63a5","title":"link","type":"input","param":""}]');
 -- --------------------------------------------------------
 
 --