From 084351b651fd0abbc50ce3a7de82b986d1330b5d Mon Sep 17 00:00:00 2001
From: liy <1492230202@qq.com>
Date: Tue, 26 Nov 2024 13:21:20 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/api/couponmanagement/capitalpool.js        |  34 +++++++++++++++++++++++++++++++---
 admin-web-master/src/api/couponmanagement/couponlist.js         |  53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/api/couponmanagement/marketing.js          | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/layout/components/Sidebar/index.vue        |   2 +-
 admin-web-master/src/layout/index.vue                           |   4 ++--
 admin-web-master/src/router/index.js                            |  32 +++++++++++++++++++++++++++++++-
 admin-web-master/src/utils/request.js                           |   6 ++++--
 admin-web-master/src/views/couponmanagement/capitalpool.vue     | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/couponmanagement/coupon.vue          | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/couponmanagement/couponinfo.vue      | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/couponmanagement/couponlist.vue      | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 2159 insertions(+), 134 deletions(-)
 create mode 100644 admin-web-master/src/api/couponmanagement/couponlist.js
 create mode 100644 admin-web-master/src/api/couponmanagement/marketing.js
 create mode 100644 admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
 create mode 100644 admin-web-master/src/views/couponmanagement/couponinfo.vue
 create mode 100644 admin-web-master/src/views/couponmanagement/couponlist.vue

diff --git a/admin-web-master/src/api/couponmanagement/capitalpool.js b/admin-web-master/src/api/couponmanagement/capitalpool.js
index 524ecfd..d918350 100644
--- a/admin-web-master/src/api/couponmanagement/capitalpool.js
+++ b/admin-web-master/src/api/couponmanagement/capitalpool.js
@@ -1,8 +1,15 @@
 import request from '@/utils/request'
-
+// 查询剩余金额
+export function totalCapitalBalance(data) {
+  return request({
+    url: '/cereCouponMainTable/totalCapitalBalance',
+    method: 'post',
+    data
+  })
+}
 export function getcereFundsPoolData(data) {
   return request({
-    url: '/cereFundsPool',
+    url: '/cereFundsPool/queryByPage',
     method: 'post',
     data
   })
@@ -29,4 +36,25 @@ export function addcereFundsPool(data) {
     data
   })
 }
-
+export function delPool(data) {
+  return request({
+    url: '/cereFundsPool/deleteById ',
+    method: 'post',
+    data
+  })
+}
+export function editPool(data) {
+  return request({
+    url: '/cereFundsPool/edit ',
+    method: 'post',
+    data
+  })
+}
+//添加优惠券
+export function cereCouponMainTable(data) {
+  return request({
+    url: '/cereCouponMainTable/add ',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/admin-web-master/src/api/couponmanagement/couponlist.js b/admin-web-master/src/api/couponmanagement/couponlist.js
new file mode 100644
index 0000000..1c4539b
--- /dev/null
+++ b/admin-web-master/src/api/couponmanagement/couponlist.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+// 批量生成优惠券
+export function batchGenerateCoupons(data) {
+  return request({
+    url: '/cereCouponUsage/batchGenerateCoupons',
+    method: 'post',
+    data
+  })
+}
+export function getcereFundsPoolData(data) {
+  return request({
+    url: '/cereCouponMainTable/queryByPage',
+    method: 'post',
+    data
+  })
+}
+
+/**
+{
+	"activityId": 0
+}
+ */
+export function getcereFundsPoolDetail(data) {
+  return request({
+    url: '/cereCouponMainTable/getById',
+    method: 'post',
+    data
+  })
+}
+
+
+export function addcereFundsPool(data) {
+  return request({
+    url: '/cereCouponMainTable/add ',
+    method: 'post',
+    data
+  })
+}
+export function delPool(data) {
+  return request({
+    url: '/cereCouponMainTable/deleteById ',
+    method: 'post',
+    data
+  })
+}
+export function editPool(data) {
+  return request({
+    url: '/cereCouponMainTable/edit ',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/admin-web-master/src/api/couponmanagement/marketing.js b/admin-web-master/src/api/couponmanagement/marketing.js
new file mode 100644
index 0000000..00d7e30
--- /dev/null
+++ b/admin-web-master/src/api/couponmanagement/marketing.js
@@ -0,0 +1,449 @@
+import request from '@/utils/request'
+
+//* ******************** 待处理订单  *********************
+// 订单管理查询
+export function getCoupon(data) {
+  return request({
+    url: '/coupon/getAll',
+    method: 'post',
+    data
+  })
+}
+// 新增优惠券
+export function addCoupon(data) {
+  return request({
+    url: '/coupon/save',
+    method: 'post',
+    data
+  })
+}
+// 优惠券数据效果查询
+export function getCouponData(data) {
+  return request({
+    url: '/coupon/getData',
+    method: 'post',
+    data
+  })
+}
+// 获取可选中商品
+export function getProducts(data) {
+  return request({
+    url: '/coupon/getProducts',
+    method: 'post',
+    data
+  })
+}
+// 删除满减券
+export function delCoupon(data) {
+  return request({
+    url: '/coupon/delete',
+    method: 'post',
+    data
+  })
+}
+// 修改满减券/折扣券
+export function updateCoupon(data) {
+  return request({
+    url: '/coupon/update',
+    method: 'post',
+    data
+  })
+}
+// 获取优惠券详情
+export function couponDetail(data) {
+  return request({
+    url: '/coupon/getById',
+    method: 'post',
+    data
+  })
+}
+// 停止优惠券
+export function stopCoupon(data) {
+  return request({
+    url: '/coupon/stop',
+    method: 'post',
+    data
+  })
+}
+// 拼团数据查询
+export function groupBuyList(data) {
+  return request({
+    url: '/work/getAll',
+    method: 'post',
+    data
+  })
+}
+// 拼团数据删除
+export function deleteGroup(data) {
+  return request({
+    url: '/work/delete',
+    method: 'post',
+    data
+  })
+}
+// 拼团活动详情查询
+export function groupDetail(data) {
+  return request({
+    url: '/work/getById',
+    method: 'post',
+    data
+  })
+}
+// 拼团数据效果查询
+export function getGroupData(data) {
+  return request({
+    url: '/work/getData',
+    method: 'post',
+    data
+  })
+}
+// 拼团选择商品查询
+export function getGroupButPro(data) {
+  return request({
+    url: '/work/getProducts',
+    method: 'post',
+    data
+  })
+}
+// 新增拼团活动
+export function addGroupBuy(data) {
+  return request({
+    url: '/work/save',
+    method: 'post',
+    data
+  })
+}
+// 停止拼团活动
+export function stopGroupBuy(data) {
+  return request({
+    url: '/work/stop',
+    method: 'post',
+    data
+  })
+}
+// 修改拼团活动
+export function groupUpdate(data) {
+  return request({
+    url: '/work/update',
+    method: 'post',
+    data
+  })
+}
+// 秒杀活动管理查询
+export function getSeckillList(data) {
+  return request({
+    url: '/seckill/getAll',
+    method: 'post',
+    data
+  })
+}
+// 新增秒杀活动
+export function addSeckill(data) {
+  return request({
+    url: '/seckill/save',
+    method: 'post',
+    data
+  })
+}
+// 修改秒杀活动
+export function seckillUpdate(data) {
+  return request({
+    url: '/seckill/update',
+    method: 'post',
+    data
+  })
+}
+// 删除秒杀活动
+export function deleteSeckill(data) {
+  return request({
+    url: '/seckill/delete',
+    method: 'post',
+    data
+  })
+}
+// 秒杀数据效果查询
+export function getSeckillData(data) {
+  return request({
+    url: '/seckill/getData',
+    method: 'post',
+    data
+  })
+}
+// 秒杀选择商品查询
+export function getSpikeList(data) {
+  return request({
+    url: '/seckill/getProducts',
+    method: 'post',
+    data
+  })
+}
+// 秒杀商品详情
+export function seckillDetail(data) {
+  return request({
+    url: '/seckill/getById',
+    method: 'post',
+    data
+  })
+}
+// 秒杀商品停止活动
+export function seckillStop(data) {
+  return request({
+    url: '/seckill/stop',
+    method: 'post',
+    data
+  })
+}
+// 限时折扣活动详情查询
+export function getSeckillDetail(data) {
+  return request({
+    url: '/seckill/getById',
+    method: 'post',
+    data
+  })
+}
+// 限时折扣活动管理查询
+export function getDiscountData(data) {
+  return request({
+    url: '/discount/getAll',
+    method: 'post',
+    data
+  })
+}
+// 删除限时折扣活动
+export function deleteDiscount(data) {
+  return request({
+    url: '/discount/delete',
+    method: 'post',
+    data
+  })
+}
+// 限时折扣活动详情查询
+export function getDiscountDetail(data) {
+  return request({
+    url: '/discount/getById',
+    method: 'post',
+    data
+  })
+}
+// 限时折扣效果数据查询
+export function getDiscountInfo(data) {
+  return request({
+    url: '/discount/getData',
+    method: 'post',
+    data
+  })
+}
+// 选择商品查询
+export function getDisProList(data) {
+  return request({
+    url: '/discount/getProducts',
+    method: 'post',
+    data
+  })
+}
+// 新增限时折扣活动
+export function addDiscount(data) {
+  return request({
+    url: '/discount/save',
+    method: 'post',
+    data
+  })
+}
+// 停止限时折扣活动
+export function stopDiscount(data) {
+  return request({
+    url: '/discount/stop',
+    method: 'post',
+    data
+  })
+}
+// 修改限时折扣活动
+export function discountUpdate(data) {
+  return request({
+    url: '/discount/update',
+    method: 'post',
+    data
+  })
+}
+
+// 场景营销列表查询
+export function getSceneInfo(data) {
+  return request({
+    url: '/scene/getAll',
+    method: 'post',
+    data
+  })
+}
+// 添加场景营销
+export function sceneAdd(data) {
+  return request({
+    url: '/scene/save',
+    method: 'post',
+    data
+  })
+}
+// 启动场景营销
+export function sceneStart(data) {
+  return request({
+    url: '/scene/start',
+    method: 'post',
+    data
+  })
+}
+// 停止场景营销
+export function sceneStop(data) {
+  return request({
+    url: '/scene/stop',
+    method: 'post',
+    data
+  })
+}
+// 删除场景营销
+export function sceneDelete(data) {
+  return request({
+    url: '/scene/delete',
+    method: 'post',
+    data
+  })
+}
+// 编辑场景营销
+export function sceneUpate(data) {
+  return request({
+    url: '/scene/update',
+    method: 'post',
+    data
+  })
+}
+// 场景营销详情查询
+export function getSceneDetail(data) {
+  return request({
+    url: '/scene/getById',
+    method: 'post',
+    data
+  })
+}
+// 查询会员等级数据
+export function getMemberLevels(data) {
+  return request({
+    url: '/scene/getMemberLevels',
+    method: 'post',
+    data
+  })
+}
+
+// 定价捆绑列表查询
+export function getPriceList(data) {
+  return request({
+    url: '/price/getAll',
+    method: 'post',
+    data
+  })
+}
+// 添加定价捆绑
+export function priceAdd(data) {
+  return request({
+    url: '/price/save',
+    method: 'post',
+    data
+  })
+}
+// 启停用定价捆绑
+export function priceStart(data) {
+  return request({
+    url: '/price/start',
+    method: 'post',
+    data
+  })
+}
+// 删除定价捆绑
+export function priceDelete(data) {
+  return request({
+    url: '/price/delete',
+    method: 'post',
+    data
+  })
+}
+// 编辑定价捆绑
+export function priceUpate(data) {
+  return request({
+    url: '/price/update',
+    method: 'post',
+    data
+  })
+}
+// 定价捆绑详情查询
+export function getPriceDetail(data) {
+  return request({
+    url: '/price/getById',
+    method: 'post',
+    data
+  })
+}
+
+// 组合捆绑列表查询
+export function getComposeList(data) {
+  return request({
+    url: '/compose/getAll',
+    method: 'post',
+    data
+  })
+}
+// 添加组合捆绑
+export function composeAdd(data) {
+  return request({
+    url: '/compose/save',
+    method: 'post',
+    data
+  })
+}
+// 启停用组合捆绑
+export function composeStart(data) {
+  return request({
+    url: '/compose/start',
+    method: 'post',
+    data
+  })
+}
+// 删除组合捆绑
+export function composeDelete(data) {
+  return request({
+    url: '/compose/delete',
+    method: 'post',
+    data
+  })
+}
+// 编辑组合捆绑
+export function composeUpate(data) {
+  return request({
+    url: '/compose/update',
+    method: 'post',
+    data
+  })
+}
+// 组合捆绑详情查询
+export function getComposeDetail(data) {
+  return request({
+    url: '/compose/getById',
+    method: 'post',
+    data
+  })
+}
+// 定价捆绑和组合捆绑选择商品查询
+export function getComposeSelectProduct(data) {
+  return request({
+    url: '/compose/selectProduct',
+    method: 'post',
+    data
+  })
+}
+
+
+// //* ******************** 售后订单  *********************
+// // 售后管理查询
+// export function aftersaleGetAll(data) {
+//   return request({
+//     url: '/after/getAll',
+//     method: 'post',
+//     data
+//   })
+// }
diff --git a/admin-web-master/src/layout/components/Sidebar/index.vue b/admin-web-master/src/layout/components/Sidebar/index.vue
index 19adfb0..de8a77f 100644
--- a/admin-web-master/src/layout/components/Sidebar/index.vue
+++ b/admin-web-master/src/layout/components/Sidebar/index.vue
@@ -61,7 +61,7 @@ export default {
      $route(to, from) {
         // 这里可以添加逻辑来处理路由变化时的行为
         // 例如，更新 activeMenu
-        this.activeMenu = to.meta.activeMenu || to.path;
+        // this.activeMenu = to.meta.activeMenu || to.path;
       }
     // mes(newVal, oldVal) {
     //   console.log(this.routers)
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 74826a4..e9a7ca0 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -190,13 +190,13 @@
           </div>
         </div> -->
 
-      <sidebar-item
+      <!-- <sidebar-item
          v-for="(route, index) in routers"
          :key="index"
          class="tabLink"
          :item="route"
          :base-path="route.path"
-       />
+       /> -->
 <!--    <sidebar-item
         v-for="(route, index) in routers"
         :key="index"
diff --git a/admin-web-master/src/router/index.js b/admin-web-master/src/router/index.js
index 277efbe..6a8007d 100644
--- a/admin-web-master/src/router/index.js
+++ b/admin-web-master/src/router/index.js
@@ -746,7 +746,37 @@ export const mainRoutes = [
   },
 
 
-
+  {
+    path: '/other',
+    component: Layout,
+    redirect: '/other/coupon',
+    hidden: true,
+    name: 'setup',
+    meta: {
+      title: '优惠券管理',
+      icon: 'el-icon-s-help'
+    },
+    children: [
+    {
+      path: 'coupon',
+      name: 'coupon',
+      component: () => import('@/views/couponmanagement/couponinfo'),
+      meta: {
+        title: '优惠券详情',
+        icon: 'tree'
+      }
+    },
+    {
+      path: 'capitalpoolinfo',
+      name: 'capitalpoolinfo',
+      component: () => import('@/views/couponmanagement/capitalpoolinfo'),
+      meta: {
+        title: '资金池详情',
+        icon: 'tree'
+      }
+    }
+  ]
+  },
   {
     path: '/setup',
     component: Layout,
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index bf5eaf8..59716ce 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -20,9 +20,11 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.
  // PREFIX = 'http://172.16.61.48/meserver/admin-server';
   // PREFIX = 'http://192.168.2.98:9003';
   // PREFIX = 'http://8.130.38.56:8019/admin-server';
- PREFIX = 'http://192.168.8.106:9003';
-   // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+//  PREFIX = 'http://192.168.2.213:9003';
+  //  PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
    // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
+    // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
+    PREFIX = 'http://8.130.38.56:9003'
 
 }else{
   PREFIX = '/admin-server';
diff --git a/admin-web-master/src/views/couponmanagement/capitalpool.vue b/admin-web-master/src/views/couponmanagement/capitalpool.vue
index 63bff02..38a2cc7 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpool.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpool.vue
@@ -1,122 +1,170 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="couponPage">
-      <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">资金池</span></div>
-      </div>
-      <!-- 搜索 -->
-      <div class="formSearch">
-        <!-- 搜索条件 -->
-        <el-form :inline="true" :model="query" class="demo-form-inline">
-          <el-form-item label="名称">
-            <el-input v-model="query.activityName" placeholder="请输入名称" />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select v-model="query.state" placeholder="请选择状态">
-              <el-option
-                v-for="item in activityStatusSelect"
-                :key="item.index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div>
-          <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
-          <el-button  class="buttonHover"
-              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
+    <div class="couponPage" v-show="type == '1'">
+      <div>
+        <div style="height:58px;line-height:58px;">
+          <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">资金池</span></div>
         </div>
-      </div>
-      <div style="margin: 0  0 20px 0;">
-        <el-button icon="el-icon-circle-plus-outline"
-          style="background-color: #3F9B6A;color: #fff;" @click="addActivity">新建活动</el-button>
-      </div>
-      <!-- 表格 -->
-      <div class="tableBox">
-        <el-table
-          ref="multipleTable"
-          :data="tableData"
-         :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          tooltip-effect="dark"
-        >
-          <el-table-column label="资金池名称" width="220">
-            <template slot-scope="scope">{{ scope.row.poolName }}</template>
-          </el-table-column>
-          <el-table-column label="出资方" width="220">
-            <template slot-scope="scope">{{ scope.row.contributor }}</template>
-          </el-table-column>
-          <el-table-column label="总金额" width="220">
-            <template slot-scope="scope">{{ scope.row.totalAmount }}</template>
-          </el-table-column>
-          <el-table-column label="状态">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fundsStatus == '0'">未启用</span>
-              <span v-if="scope.row.fundsStatus == '1'">启用中</span>
-              <span v-if="scope.row.fundsStatus == '2'">已关闭</span>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="操作" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <div class="btnList">
-                <div class="tableBtn greens" @click="details(scope.row)">详情</div>
-                <div v-if="scope.row.state != 4" class="tableBtn greens" @click="editActivity(scope.row)">编辑</div>
-                <div v-if="scope.row.state != 4" class="tableBtn greens" @click="endActivity(scope.row)">结束</div>
-                <div v-if="scope.row.state == 4" class="tableBtn greens" @click="delActivity(scope.row)">删除</div>
-              </div>
-            </template>
-          </el-table-column> -->
-        </el-table>
-        <div class="fenye">
-          <el-pagination
-            :current-page="query.pageNumber"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="10"
-           background
-           small
-           layout="prev, pager, next,total"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <!-- 搜索 -->
+        <div class="formSearch">
+          <!-- 搜索条件 -->
+          <el-form :inline="true" :model="query" class="demo-form-inline">
+            <el-form-item label="名称">
+              <el-input v-model="query.poolName" placeholder="请输入名称" />
+            </el-form-item>
+            <el-form-item label="状态">
+              <el-select v-model="query.fundsStatus" placeholder="请选择状态">
+                <el-option
+                  v-for="item in activityStatusSelect"
+                  :key="item.index"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <div>
+            <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+            <el-button  class="buttonHover"
+                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
+          </div>
+        </div>
+        <div style="margin: 0  0 20px 0;">
+          <el-button icon="el-icon-circle-plus-outline"
+            style="background-color: #3F9B6A;color: #fff;" @click="addActivity">新增</el-button>
+        </div>
+        <!-- 表格 -->
+        <div class="tableBox">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+            tooltip-effect="light"
+          > 
+            <el-table-column label="编号" >
+              <template slot-scope="scope">{{ scope.row.poolId }}</template>
+            </el-table-column>
+            <el-table-column label="资金池名称" >
+              <template slot-scope="scope">{{ scope.row.poolName }}</template>
+            </el-table-column>
+            <el-table-column label="出资方" >
+              <template slot-scope="scope">{{ scope.row.contributor }}</template>
+            </el-table-column>
+            <el-table-column label="总金额">
+              <template slot-scope="scope">{{ scope.row.totalAmount }}</template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                <span v-if="scope.row.fundsStatus == '1'">启用中</span>
+                <span v-else-if="scope.row.fundsStatus == '2'">已关闭</span>
+                <span v-else>未启用</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right">
+              <template slot-scope="scope">
+                <div class="btnList">
+                  <!-- <div class="tableBtn greens" @click="editActivity(scope.row)">编辑</div> -->
+                  <div v-if="scope.row.fundsStatus == '1'" class="tableBtn greens" @click="xq(scope.row)">查看详情</div>
+                  <div v-if="scope.row.fundsStatus == '1'" class="tableBtn greens" @click="addcoupon(scope.row)">创建优惠券</div>
+                  <div v-if="scope.row.fundsStatus == '1'" class="tableBtn greens" @click="endActivityeditPool(scope.row,'2')">禁用</div>
+                  <div v-else-if="scope.row.fundsStatus == '2'" class="tableBtn greens" @click="delActivity(scope.row)">删除</div>
+                  <div v-else class="tableBtn greens" @click="endActivityeditPool(scope.row,'1')">开启</div>
+                  <!-- <div class="tableBtn greens" @click="delActivity(scope.row)">删除</div> -->
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div style="display: flex;justify-content: space-between;" class="bom">
+            <div style="font-size: 14px;">共  <span style="color: #3F9B6A;">{{total}}</span>  项数据</div>
+            <el-pagination
+              :current-page="query.pageNumber"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="10"
+              background
+              small
+              layout="prev, pager, next"
+              :total="total"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange">
+            </el-pagination>
+          </div>
         </div>
-      </div>
 
-      <el-dialog
-        :title="editForm ? '修改资金池' : '新增资金池'"
-        :visible.sync="activityVisible"
-        width="500px"
-        center
-        :close-on-click-modal="false"
-        @close="closeModal">
-        <el-form  ref="activityForm" :model="activityForm" label-width="100px">
-          <el-form-item label="资金池名称:">
-            <el-input v-model="activityForm.poolName" placeholder="请输入资金池名称" />
-          </el-form-item>
-          <el-form-item label="出资方:">
-            <el-input v-model="activityForm.contributor" placeholder="请输入出资方" />
-          </el-form-item>
-          <el-form-item label="总金额:">
-            <el-input v-model="activityForm.activityName" placeholder="请输入总金额" />
-          </el-form-item>
-        </el-form>
-        <div class="footer">
-          <div class="btn_list">
-            <span @click="cancel" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</span>
-            <span @click="save" style="background-color: #3F9B6A;color: #fff">保存</span>
+        <el-dialog
+          :title="editForm ? '修改资金池' : '新增资金池'"
+          :visible.sync="activityVisible"
+          width="500px"
+          center
+          :close-on-click-modal="false"
+          @close="activityVisible">
+          <el-form  ref="form" :model="form" label-width="100px">
+            <el-form-item label="资金池名称:">
+              <el-input v-model="form.poolName" placeholder="请输入资金池名称" />
+            </el-form-item>
+            <el-form-item label="出资方:">
+              <el-input v-model="form.contributor" placeholder="请输入出资方" />
+            </el-form-item>
+            <el-form-item label="总金额:">
+              <el-input v-model="form.totalAmount" placeholder="请输入总金额" />
+            </el-form-item>
+          </el-form>
+          <div class="footer">
+            <div class="btn_list">
+              <span @click="cancel" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</span>
+              <span @click="save" style="background-color: #3F9B6A;color: #fff">保存</span>
+            </div>
           </div>
+        </el-dialog>
+      </div>
+    </div>
+    <div class="couponPage" v-show="type == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">创建优惠券</span></div>
+      </div>
+      <div style="display: flex;margin-bottom: 10px;">
+        <div>资金池名称:{{ coupoobj.poolName }}</div>
+        <div style="margin-left: 30px;font-weight: bold;">总金额:{{ coupoobj.symon }}</div>
+      </div>
+      <coupon :couponfrom="couponfrom" :coupoobj="coupoobj"/>
+      <div class="footer">
+      <div class="btn_list" style="margin-top: 30px;">
+          <span @click="qxcoupon" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</span>
+          <span @click="savecoupon" style="background-color: #3F9B6A;color: #fff">保存</span>
         </div>
-      </el-dialog>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getcereFundsPoolData,addcereFundsPool,}from '@/api/couponmanagement/capitalpool.js'
-export default {
+import { getcereFundsPoolData,addcereFundsPool,delPool,editPool,cereCouponMainTable,totalCapitalBalance}from '@/api/couponmanagement/capitalpool.js'
+import router from '@/router';
+import coupon from './coupon.vue';
 
+export default {
+  
+  components:{
+    coupon
+  },
   data () {
     return {
+      couponfrom:{
+        usedMerchants:'全平台',
+        couponName: '',
+        remark: '',
+        couponType: '1', // 默认值
+        useCategory: '全部',
+        maxDiscountAmount: null,
+        usageThreshold: null,//使用门槛不用
+        discountContent: null,
+        pointsRequired: 0,
+        startTime: '',
+        endTime: '',
+        totalCoupons: null,
+        totalFunds: null,
+      },
+      coupoobj:{},
+      type:'1',
       query: {
         activityName: '', // 活动名称
         // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
@@ -124,7 +172,7 @@ export default {
         pageNumber: 1,
         pageSize: 10
       },
-      total: 1,
+      total: 0,
       tableData: [],
       activityStatusSelect: [
         {
@@ -146,23 +194,181 @@ export default {
       activityVisible: false,
       editForm: false,
       activityDetailVisible: false,
-      activityForm: {}
+      form: {
+        poolName:'',
+        contributor:'',
+        totalAmount:null,
+        fundsStatus:'0'
+      }
     }
   },
   created () {
     this.getAll()
   },
   methods: {
+    xq(e) {
+        // 跳转路由
+        router.push({
+          path: '/other/capitalpoolinfo',
+          query: {
+            id: e.id
+          }
+        })
+    },
+    savecoupon(){
+      let that = this
+      let c1 = this.changecouponfrom()
+      console.error(c1)
+      console.error(this.coupoobj)
+      let from = this.couponfrom
+      from.fundPoolId = this.coupoobj.poolId
+      from.totalFunds = c1
+      if(c1 > this.coupoobj.symon) {
+        that.$message({
+          message: '金额不足',
+          error: 'error'
+        });
+        return
+      }
+      from.maxDiscountAmount = Number(from.maxDiscountAmount)
+      from.discountContent = Number(from.discountContent)
+      from.pointsRequired = Number(from.pointsRequired)
+      from.totalCoupons = Number(from.totalCoupons)
+      console.error({...from})
+      console.error( JSON.stringify(from))
+      cereCouponMainTable(from).then(res=>{
+          console.error(res)
+          if(res.data) {
+            that.$message({
+              message: '提交成功',
+              type: 'success'
+            });
+          } else{
+            that.$message({
+              message: '提交失败',
+              error: 'success'
+            });
+          }
+          setTimeout(()=>{
+            that.type = '1'
+          },2000)
+        })
+    },
+    changecouponfrom() {
+      let num = 0
+      if(this.couponfrom.couponType == '1') {
+          num = (this.couponfrom.discountContent?Number(this.couponfrom.discountContent):0) * (this.couponfrom.totalCoupons?Number(this.couponfrom.totalCoupons):0)
+      } else if(this.couponfrom.couponType == '2') {
+          num = (this.couponfrom.maxDiscountAmount?Number(this.couponfrom.maxDiscountAmount):0) * (this.couponfrom.totalCoupons?Number(this.couponfrom.totalCoupons):0)
+      }
+      return num
+    },
+    qxcoupon() {
+      this.type = '1'
+    },
+     async addcoupon(e) {
+      let that = this
+     
+      let c1 = {
+        symon:0,
+        ...e
+      }
+      await totalCapitalBalance({poolId:e.poolId}).then(res=>{
+        console.error(res)
+        c1.symon = res.data
+      })
+      this.type = '2'
+      this.coupoobj= c1
+      console.error(this.coupoobj)
+    },
+    endActivityeditPool(item,type){
+      let that = this
+      let form = item
+      form.totalAmount = Number(form.totalAmount)
+      form.fundsStatus = type
+      editPool(form).then(res=>{
+          console.error(res)
+          if(res.data) {
+            that.$message({
+              message: '修改成功',
+              type: 'success'
+            });
+          } else{
+            that.$message({
+              message: '修改失败',
+              error: 'success'
+            });
+          }
+          that.search()
+      })
+    },
     save( ){
+      let that = this
+      console.error(this.form)
+      let form = this.form
+      form.totalAmount = Number(form.totalAmount)
+      if(this.editForm) {
+        editPool(form).then(res=>{
+          console.error(res)
+          if(res.data) {
+            that.$message({
+              message: '修改成功',
+              type: 'success'
+            });
+          } else{
+            that.$message({
+              message: '修改失败',
+              error: 'success'
+            });
+          }
+          that.search()
+          that.activityVisible =false
+          that.form = {
+            poolName:'',
+            contributor:'',
+            totalAmount:null,
+            fundsStatus:'0'
+          }
+        })
+      } else {
+        addcereFundsPool(form).then(res=>{
+          console.error(res)
+          if(res.data) {
+            that.$message({
+              message: '提交成功',
+              type: 'success'
+            });
+          } else{
+            that.$message({
+              message: '提交失败',
+              error: 'success'
+            });
+          }
+          that.search()
+          that.activityVisible =false
+          that.form = {
+            poolName:'',
+            contributor:'',
+            totalAmount:null,
+            fundsStatus:'0'
+          }
+        })
+      }
 
     },
     cancel() {
-
+      this.activityVisible =false
+      this.form = {
+        poolName:'',
+        contributor:'',
+        totalAmount:null,
+        fundsStatus:'0'
+      }
     },
     async getAll () {
       const res = await getcereFundsPoolData(this.query)
-      this.tableData = res.data.list
-      this.total = res.data.total
+      this.tableData = res.data.content
+      this.total = res.data.numberOfElements
     },
     handleSizeChange (val) {
       this.query.pageSize = val
@@ -189,7 +395,7 @@ export default {
     },
     // 活动详情
     details (row) {
-      this.activityForm = row
+      this.form = row
       this.activityDetailVisible = true
     },
     // 添加活动
@@ -200,7 +406,7 @@ export default {
     // 编辑
     editActivity (row) {
       this.editForm = true
-      this.activityForm = row
+      this.form = row
       this.activityVisible = true
     },
     async endActivity (row) {
@@ -219,19 +425,33 @@ export default {
       this.getAll()
     },
     async delActivity (row) {
-      const res = await delCoupon({ activityId: row.activityId })
-      if (res.code === '') {
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-      } else {
-        this.$message({
-          message: res.message,
-          type: 'error'
-        })
-      }
-      this.getAll()
+      let that = this
+      this.$confirm('此作将永久操删除该文件, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delPool({poolId:row.poolId}).then(res=>{
+            console.error(res)
+            if(res.data) {
+              that.$message({
+                message: '删除成功',
+                type: 'success'
+              });
+            } else{
+              that.$message({
+                message: '删除失败',
+                error: 'success'
+              });
+            }
+            that.search()
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
     },
 
   }
@@ -239,6 +459,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
+    .el-table{
+     height: calc(100vh - 330px);
+    }
+    .bom {
+      margin-top: 40px;
+    }
+    .el-form-item {
+      margin-bottom: 0;
+    }
   ::v-deep .el-dialog__header{
     border-bottom: 2px solid #eee;
     background-color: #fff;
@@ -287,8 +516,9 @@ export default {
 
 
   .tableBox{
+    text-align: center;
     .fenye{
-      margin: 20px;
+      // margin: 20px;
     }
   }
 }
diff --git a/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
new file mode 100644
index 0000000..bdf05e4
--- /dev/null
+++ b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
@@ -0,0 +1,282 @@
+<template>
+    <div style="background-color:#f7f7f7;padding:10px 10px;">
+      <div class="couponPage" >
+        <div>
+          <div style="height:58px;line-height:58px;">
+            <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span>资金池</span>   <span style="padding:0 5px;">></span><span style="color:#000000e6">详情</span></div>
+          </div>
+          <div style="display: flex;margin-bottom: 10px;">
+            <div  v-for="item in typelist" style="width: 30%;margin-right: 3%;text-align: center;padding: 20px 0;border-radius: 3px;border: 2px solid #eee;">
+              <div style="font-size: 14px;color: #a8abb2;">{{item.type}}</div>
+              <div style="font-size: 22px;margin-top: 10px;color: rgb(63, 155, 106);">{{item.num}}</div>
+            </div>
+          </div>
+            <!-- 搜索 -->
+          <div class="formSearch">
+            <!-- 搜索条件 -->
+            <el-form :inline="true" :model="query" class="demo-form-inline">
+              <el-form-item label="名称">
+                <el-input v-model="query.couponName" placeholder="请输入名称" />
+              </el-form-item>
+            </el-form>
+            <div>
+              <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+              <el-button  class="buttonHover"
+                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
+            </div>
+          </div>
+          <!-- 表格 -->
+          <div class="tableBox">
+            <el-table
+              ref="multipleTable"
+              :data="tableData"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+              tooltip-effect="light"
+              border
+            >
+              <el-table-column label="编号" >
+                <template slot-scope="scope">{{ scope.row.id }}</template>
+              </el-table-column>
+              <el-table-column label="优惠券名称" >
+                <template slot-scope="scope">{{ scope.row.couponName }}</template>
+              </el-table-column>
+              <el-table-column label="类型">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满减券</span>
+                  <span v-else-if="scope.row.couponType == '2'">折扣券</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="优惠内容">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满{{ scope.row.maxDiscountAmount }}减{{ scope.row.discountContent }}</span>
+                  <span v-else-if="scope.row.couponType == '2'">{{ scope.row.discountContent }}折 最高减{{ scope.row.maxDiscountAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <div class="btnList">
+                    <div class="tableBtn greens" @click="xq(scope.row)">查看详情</div>
+                    <!-- <div class="tableBtn greens"  @click="addcoupon(scope.row)">生成优惠券</div> -->
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div style="display: flex;justify-content: space-between;margin: 20px 0;">
+              <div style="font-size: 14px;">共  <span style="color: #3F9B6A;">{{total}}</span>  项数据</div>
+              <el-pagination
+                :current-page="query.pageNumber"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="10"
+                background
+                small
+                layout="prev, pager, next"
+                :total="total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </template>
+
+  <script>
+  import { getcereFundsPoolData,addcereFundsPool,delPool,editPool,batchGenerateCoupons}from '@/api/couponmanagement/couponlist.js'
+  import router from '@/router';
+  import coupon from './coupon.vue';
+
+  export default {
+
+    components:{
+      coupon
+    },
+    data () {
+      return {
+       activeName: 'second',
+        typelist:[
+          {
+            num:100,
+            type:'资金池总金额',
+            color:'#ff5e5e'
+          },
+          {
+            num:100,
+            type:'资金池可用金额',
+            color:'#ff883a'
+          },
+          {
+            num:100,
+            type:'剩余金额',
+            color:'#ffc461'
+          },
+          {
+            num:100,
+            type:'待核销金额',
+            color:'#a467f0'
+          },
+        ],
+        query: {
+          activityName: '', // 活动名称
+          // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        },
+        total: 0,
+        tableData: [],
+      }
+    },
+    created () {
+      this.getAll()
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event);
+      },
+      xq(e) {
+        // 跳转路由
+        router.push({
+          path: '/other/coupon',
+          query: {
+            id: e.id
+          }
+        })
+      },
+      async getAll () {
+        const res = await getcereFundsPoolData(this.query)
+        console.error(res.data.content)
+        this.tableData = res.data.content
+        this.total = res.data.numberOfElements
+      },
+      handleSizeChange (val) {
+        this.query.pageSize = val
+        this.getAll()
+      },
+      handleCurrentChange (val) {
+        this.query.pageNumber = val
+        this.getAll()
+      },
+      search () {
+        this.total = 1
+        this.query.pageNumber = 1
+        this.getAll()
+      },
+      // 重置
+      clear () {
+        this.query = {
+          activityName: '',
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        }
+        this.getAll()
+      },
+
+    }
+  }
+  </script>
+
+  <style scoped lang="scss">
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
+  ::v-deep .el-tabs__content {
+    display: none;
+  }
+    ::v-deep .el-tabs__item{
+      font-size: 16px;
+      font-family: "Alibaba PuHuiTi 2.0-55 Regular";
+    }
+    ::v-deep .el-dialog__header{
+      border-bottom: 2px solid #eee;
+      background-color: #fff;
+    }
+    ::v-deep .el-dialog__title {
+      color: #303133;
+    }
+    .footer{
+      font-size: 24px;
+      .btn_list {
+        display: flex;
+        flex-direction: row-reverse;
+        span {
+          padding: 0;
+          margin: 0;
+          width: 100px;
+          height:32px;
+          line-height:32px;
+          text-align: center;
+          display: inline-block;
+          font-size: 16px;
+          border-radius: 4px;
+          box-sizing: border-box;
+          &:hover {
+            cursor: pointer;
+          }
+          &:nth-child(1) {
+            background: rgba(255, 255, 255, 1);
+            order: 1px solid rgba(224, 229, 235, 1);
+
+            border: 1px solid rgba(224, 229, 235, 1);
+          }
+          &:nth-child(2) {
+            background: #3f9b6a;
+            color: #fff;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+  .couponPage{
+
+     padding: 0  20px 20px 20px;
+     min-height: calc(100vh - 50px - 20px);
+     background-color: #Fff;
+
+
+    .tableBox{
+      text-align: center;
+      .fenye{
+        // margin: 20px;
+      }
+    }
+  }
+  .couponDialogBox {
+    max-height: 600px;
+    overflow-y: auto;
+  }
+  .formSearch{
+
+      display: flex;
+      width: 100%;
+      font-size: 14px;
+      justify-content: space-between;
+      // padding-bottom: 10px;
+      align-items: center;
+      margin: 20px 0;
+
+  }
+    .tableBtn {
+      display: inline-block;
+      margin-right: 10px;
+    }
+
+  .greens {
+      color: #3F9B6A;
+    }
+    ::v-deep .buttonHover:hover{
+      color:#3f9b6a !important;
+      border-color: #c5e1d2 !important;
+      background-color: #ecf5f0 !important;
+      outline: none;
+    }
+    ::v-deep .el-pagination__total {
+      position: absolute;
+      left: 10px;
+    }
+    ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active{
+      background-color:#3f9b6a;
+    }
+  </style>
diff --git a/admin-web-master/src/views/couponmanagement/coupon.vue b/admin-web-master/src/views/couponmanagement/coupon.vue
index e69de29..29243a0 100644
--- a/admin-web-master/src/views/couponmanagement/coupon.vue
+++ b/admin-web-master/src/views/couponmanagement/coupon.vue
@@ -0,0 +1,344 @@
+<template>
+    <div class="addCoupon">
+      <!-- 新增优惠券 -->
+      <div class="addCouponBox" style="border: 2px solid #eee;padding-right: 30px;padding-top: 30px;padding-bottom: 30px;">
+        <div style="padding-bottom: 15px;padding-right: 30px;padding-left: 80px;font-weight: bold;">
+            所需金额：{{ changecouponfrom() }} 元
+        </div>
+        <el-form ref="ruleForm" class="formBox" :model="couponfrom" label-width="150px" :rules="couponRules">
+            <el-form-item label="优惠券名称" prop="couponName">
+                <el-input v-model="couponfrom.couponName" placeholder="请输入优惠券名称" onblur="value=value.replace(/(^\s*)|(\s*$)/g, '')"  />
+            </el-form-item>
+            <el-form-item label="优惠券类型">
+                <el-radio v-model="couponfrom.couponType" label="1">满减券</el-radio>
+                <el-radio v-model="couponfrom.couponType" label="2">折扣券</el-radio>
+            </el-form-item>
+            <el-form-item v-if="couponfrom.couponType === '1'" class="inputW" label="优惠内容" prop="couponContent">
+                订单满 <el-input-number v-model="couponfrom.maxDiscountAmount" :controls="false" :min="0" :precision="2" :step="0.01" /> 元 减 <el-input-number v-model="couponfrom.discountContent" :controls="false" :min="0" :precision="2" :step="0.01"  /> 元
+            </el-form-item>
+            <el-form-item v-else class="inputW discount" label="优惠内容" prop="discountContent">
+                <span v-if="couponfrom.couponType === '2'" style="margin-right: 10px;">
+                    最高优惠金额
+                    <el-input-number  v-model="couponfrom.maxDiscountAmount" :controls="false" :min="0" :precision="2" :step="0.01"  /> 元
+                </span>
+                打 <el-input-number v-model="couponfrom.discountContent" :controls="false" :min="0" :max="9.9" :precision="1" :step="0.1"  /> 折
+                <label>输入值要大于0 小于10，可保留一位小数</label>
+
+            </el-form-item>
+            <!-- <el-form-item v-if="couponfrom.couponType === '2'" class="inputW" label="最高优惠金额" prop="maxDiscountAmount">
+                <el-input-number v-model="couponfrom.maxDiscountAmount" :controls="false" :min="0" :precision="2" :step="0.01"  /> 元
+            </el-form-item> -->
+            <el-form-item label="可用商品类别:">
+                <el-radio-group v-model="useCategory" @change="changeType">
+                    <el-radio :label="1" >全部</el-radio>
+                    <el-radio :label="2" >选择类别</el-radio>     
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="选择商品类别:" v-if="useCategory === 2">
+                <el-select style="width: 100%;"  multiple v-model="couponfrom.useCategory" placeholder="请选择">
+                    <el-option
+                        v-for="item in classList"
+                        :key="item.classifyId"
+                        :label="item.classifyName"
+                        :value="item.classifyId"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="使用范围:">
+                <el-radio-group v-model="usedMerchants" >
+                    <el-radio :label="1" >全平台</el-radio>
+                    <!-- <el-radio :label="2" >自营</el-radio> -->
+                    <el-radio :label="3" >部分商家</el-radio>    
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="选择商家:" v-if="usedMerchants === 3">
+                <el-select 
+                    style="width: 100%;" 
+                    multiple 
+                    v-model="couponfrom.usedMerchants" 
+                    placeholder="请选择" 
+                    filterable
+                >
+                    <el-option
+                    v-for="item in shopList"
+                    :key="item.shopId"
+                    :label="item.shopName"
+                    :value="item.shopId"
+                    />
+                </el-select>
+            </el-form-item>
+            <div style="display: flex;">
+                <el-form-item label="是否开启积分兑换:">
+                <el-radio-group v-model="pointsRequired">
+                    <el-radio :label="1" >是</el-radio>
+                    <el-radio :label="0" >否</el-radio>
+                </el-radio-group>
+                </el-form-item>
+                <el-form-item v-if="pointsRequired" label="所需积分:">
+                <el-input v-model="couponfrom.pointsRequired" type="number" style="width: 150px" /> 分
+                </el-form-item>
+            </div>
+            <el-form-item class="timeDataBox" label="用券时间">
+                <el-date-picker
+                    v-model="dateInfo"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    @change="changeDate"
+                />
+            </el-form-item>
+            <el-form-item class="boxWidth" label="数量" prop="totalCoupons">
+                <el-input v-model="couponfrom.totalCoupons" type="number" oninput="value=value.replace(/[^\d]/g,'')"  />张 <span v-if="coupoobj.symon && changecouponfrom()!=0">(最大：{{ (coupoobj.symon/changecouponfrom()).toFixed(0) }} 张)</span>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input rows="4" v-model="couponfrom.remark" placeholder="请输入备注" type="textarea" />
+            </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import { commdityClassGetAll } from '@/api/renovation';
+  import {
+  businessListGetAll,
+} from '@/api/business'
+  export default {
+    name: 'AddCoupon',
+    props: {
+        couponfrom: {
+        type: Object,
+        default: {},
+
+      },
+      coupoobj: {
+        type: Object,
+        default: {
+          symon:0
+        },
+
+      },
+    },
+    data() {
+      return {
+        monys:0,
+        usedMerchants:1,
+        pointsRequired:0,
+        dateInfo: null,
+        isThreshold: true,
+        useCategory:1,
+        useCategory2:1,
+        classList:[],
+        shopList:[],
+        couponRules: {
+            couponName: [
+          { required: true, message: '请输入优惠券名称', trigger: 'blur' }
+        ],
+        // couponContent: [{ required: true, message: '请输入优惠金额' }],
+        dateInfo: [{ type: 'date', required: true, message: '请选择时间' }],
+        totalCoupons: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+        },
+      }
+    },
+    watch: {
+      'couponfrom.couponType'(val) {
+        this.couponfrom.maxDiscountAmount = 0
+        this.couponfrom.discountContent = 0
+      },
+      useCategory(val) {
+        if(val == '1') {
+          this.couponfrom.useCategory = '全部'
+        } else {
+          this.couponfrom.useCategory = ''
+        } 
+      },
+      usedMerchants(val) {
+        this.couponfrom.usedMerchants = ''
+        if(val == '1') {
+          this.couponfrom.useCategory = '全平台'
+        } else if(val == '2') {
+          this.couponfrom.useCategory = '自营'
+        } else {
+          this.couponfrom.useCategory = ''
+        } 
+      },
+      pointsRequired(val) {
+        if(val == '1') {
+          this.couponfrom.pointsRequired = ''
+        } else {
+          this.couponfrom.pointsRequired = 0
+        } 
+      },
+    },
+    mounted() {
+        this.getAll()
+    },
+    methods: {
+      changeDate(e){
+        console.error(e)
+        if(e && e.length>0) {
+          this.couponfrom.startTime = e[0]
+          this.couponfrom.endTime = e[0]
+        } else {
+          this.couponfrom.startTime = ''
+          this.couponfrom.endTime = ''
+        }
+        
+      },
+        changecouponfrom() {
+            let num = 0
+            if(this.couponfrom.couponType == '1') {
+                num = (this.couponfrom.discountContent?Number(this.couponfrom.discountContent):0) * (this.couponfrom.totalCoupons?Number(this.couponfrom.totalCoupons):0)
+            } else if(this.couponfrom.couponType == '2') {
+                num = (this.couponfrom.maxDiscountAmount?Number(this.couponfrom.maxDiscountAmount):0) * (this.couponfrom.totalCoupons?Number(this.couponfrom.totalCoupons):0)
+            }
+            console.log(num)
+            return num
+        },
+            // 获取类别
+    async getAll () {
+      const res = await commdityClassGetAll({
+        page: 1,
+        pageSize: 100
+      })
+      this.classList = res.data.list
+
+      const res1 = await businessListGetAll ({
+        page: 1,
+        pageSize: 400
+      })
+      this.shopList = res1.data.list
+    },
+        changeThreshold(val) { // 输入框值改变
+            if (val) {
+                this.couponfrom.threshold = 0
+            }
+        },
+        changeType () {
+        }
+    }
+  }
+  </script>
+  <style lang='scss' scoped>
+  //@import url(); 引入公共css类
+  @import url("../../styles/elDialog.scss");
+  .addCoupon {
+    background: #FFFFFF;
+    .dialog-footer {
+    //   margin-left: 300px;
+    }
+    .formBox {
+      .flexBox {
+        display: flex;
+      }
+      .applyType {
+        span {
+          width: 100px;
+          height: 30px;
+          line-height: 30px;
+          background: #3F9B6A;
+          color: #FFFFFF;
+          text-align: center;
+          display: inline-block;
+          font-size: 14px;
+          margin-right: 30px;
+          border-radius: 4px;
+          cursor: pointer;
+          position: relative;
+          i {
+            position: absolute;
+            right: -10px;
+            top: -10px;
+            width: 25px;
+            height: 25px;
+            line-height: 25px;
+            background: #FFFFFF;
+            border-radius: 50%;
+            border: 1px solid #3F9B6A;
+            text-align: center;
+            color: #3F9B6A;
+            font-style: normal;
+            font-size: 12px;
+          }
+        }
+      }
+    }
+  .footBtnBox {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    margin-top: 50px;
+  }
+    .dateBox {
+      display: flex;
+      align-items: center;
+      .description {
+        width: 59px;
+        text-align: center;
+        display: block;
+        font-size: 14px;
+        color: #999999;
+      }
+    }
+    .discount label {
+      color: #cccccc;
+      font-weight: 500;
+      padding-left: 30px;
+    }
+  }
+  
+  </style>
+  <style scoped>
+  .flexBox /deep/ .el-input {
+    width: 300px;
+  }
+  .inputW /deep/ .el-input, .el-input-number {
+    width: 100px;
+    /* margin: 0 8px; */
+  }
+  .inputW /deep/ .el-input .el-input__inner {
+    text-align: center;
+  }
+  .inputW /deep/ .el-form-item__error {
+    padding-left: 25px;
+  }
+  .inputW /deep/ .el-checkbox {
+    margin-left: 20px;
+  }
+  .inputW /deep/ .el-radio {
+    margin-left: 30px;
+  }
+  .boxWidth /deep/ .el-input {
+    width: 100px;
+    margin-right: 15px;
+  }
+  .boxWidth /deep/ .el-input .el-input__inner {
+    text-align: center;
+  }
+  .addCoupon /deep/ .el-button--primary {
+    background: #3F9B6A;
+    border-color: #3F9B6A;
+  }
+  .addCoupon /deep/ .el-dialog__header {
+    background-color: #3F9B6A;
+  }
+  .addCoupon /deep/ .el-dialog__headerbtn .el-dialog__close {
+    color: #FFFFFF;
+  }
+  .addCoupon .timeDataBox /deep/ .el-form-item__content {
+    display: flex;
+    align-items: center;
+  }
+  .addCoupon .timeDataBox /deep/ .el-form-item__label {}
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+  input[type="number"]{
+    -moz-appearance: textfield;
+  }
+  
+  </style>
+  
\ No newline at end of file
diff --git a/admin-web-master/src/views/couponmanagement/couponinfo.vue b/admin-web-master/src/views/couponmanagement/couponinfo.vue
new file mode 100644
index 0000000..0a29690
--- /dev/null
+++ b/admin-web-master/src/views/couponmanagement/couponinfo.vue
@@ -0,0 +1,288 @@
+<template>
+    <div style="background-color:#f7f7f7;padding:10px 10px;">
+      <div class="couponPage" >
+        <div>
+          <div style="height:58px;line-height:58px;">
+            <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span>优惠券列表</span>   <span style="padding:0 5px;">></span><span style="color:#000000e6">详情</span></div>
+          </div>
+          <div style="display: flex;margin-bottom: 10px;">
+            <div  v-for="item in typelist" style="width: 30%;margin-right: 3%;text-align: center;padding: 20px 0;border-radius: 3px;border: 2px solid #eee;">
+              <div style="font-size: 14px;color: #a8abb2;">{{item.type}}</div>
+              <div style="font-size: 22px;margin-top: 10px;color: rgb(63, 155, 106);">{{item.num}}</div>
+            </div>
+          </div>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="渠道领用" name="first">渠道领用</el-tab-pane>
+            <el-tab-pane label="用户领取" name="second">用户领取</el-tab-pane>
+            <el-tab-pane label="用户使用" name="third">用户使用</el-tab-pane>
+            <el-tab-pane label="商家补贴" name="fourth">商家补贴</el-tab-pane>
+          </el-tabs>
+            <!-- 搜索 -->
+          <div class="formSearch">
+            <!-- 搜索条件 -->
+            <el-form :inline="true" :model="query" class="demo-form-inline">
+              <el-form-item label="名称">
+                <el-input v-model="query.couponName" placeholder="请输入名称" />
+              </el-form-item>
+            </el-form>
+            <div>
+              <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+              <el-button  class="buttonHover"
+                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
+            </div>
+          </div>
+          <!-- 表格 -->
+          <div class="tableBox">
+            <el-table
+              ref="multipleTable"
+              :data="tableData"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+              tooltip-effect="light"
+              border
+            >
+              <el-table-column label="编号" >
+                <template slot-scope="scope">{{ scope.row.id }}</template>
+              </el-table-column>
+              <el-table-column label="优惠券名称" >
+                <template slot-scope="scope">{{ scope.row.couponName }}</template>
+              </el-table-column>
+              <el-table-column label="类型">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满减券</span>
+                  <span v-else-if="scope.row.couponType == '2'">折扣券</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="优惠内容">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满{{ scope.row.maxDiscountAmount }}减{{ scope.row.discountContent }}</span>
+                  <span v-else-if="scope.row.couponType == '2'">{{ scope.row.discountContent }}折 最高减{{ scope.row.maxDiscountAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <div class="btnList">
+                    <div class="tableBtn greens" @click="xq(scope.row)">查看详情</div>
+                    <!-- <div class="tableBtn greens"  @click="addcoupon(scope.row)">生成优惠券</div> -->
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div style="display: flex;justify-content: space-between;margin: 20px 0;">
+              <div style="font-size: 14px;">共  <span style="color: #3F9B6A;">{{total}}</span>  项数据</div>
+              <el-pagination
+                :current-page="query.pageNumber"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="10"
+                background
+                small
+                layout="prev, pager, next"
+                :total="total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </template>
+
+  <script>
+  import { getcereFundsPoolData,addcereFundsPool,delPool,editPool,batchGenerateCoupons}from '@/api/couponmanagement/couponlist.js'
+  import router from '@/router';
+  import coupon from './coupon.vue';
+
+  export default {
+
+    components:{
+      coupon
+    },
+    data () {
+      return {
+       activeName: 'second',
+        typelist:[
+          {
+            num:100,
+            type:'渠道领用',
+            color:'#ff5e5e'
+          },
+          {
+            num:100,
+            type:'用户领取',
+            color:'#ff883a'
+          },
+          {
+            num:100,
+            type:'用户使用',
+            color:'#ffc461'
+          },
+          {
+            num:100,
+            type:'商家补贴',
+            color:'#a467f0'
+          },
+        ],
+        query: {
+          activityName: '', // 活动名称
+          // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        },
+        total: 0,
+        tableData: [],
+      }
+    },
+    created () {
+      this.getAll()
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event);
+      },
+      xq(e) {
+        // 跳转路由
+        router.push({
+          path: '/other/coupon',
+          query: {
+            id: e.id
+          }
+        })
+      },
+      async getAll () {
+        const res = await getcereFundsPoolData(this.query)
+        console.error(res.data.content)
+        this.tableData = res.data.content
+        this.total = res.data.numberOfElements
+      },
+      handleSizeChange (val) {
+        this.query.pageSize = val
+        this.getAll()
+      },
+      handleCurrentChange (val) {
+        this.query.pageNumber = val
+        this.getAll()
+      },
+      search () {
+        this.total = 1
+        this.query.pageNumber = 1
+        this.getAll()
+      },
+      // 重置
+      clear () {
+        this.query = {
+          activityName: '',
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        }
+        this.getAll()
+      },
+
+    }
+  }
+  </script>
+
+  <style scoped lang="scss">
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
+  ::v-deep .el-tabs__content {
+    display: none;
+  }
+    ::v-deep .el-tabs__item{
+      font-size: 16px;
+      font-family: "Alibaba PuHuiTi 2.0-55 Regular";
+    }
+    ::v-deep .el-dialog__header{
+      border-bottom: 2px solid #eee;
+      background-color: #fff;
+    }
+    ::v-deep .el-dialog__title {
+      color: #303133;
+    }
+    .footer{
+      font-size: 24px;
+      .btn_list {
+        display: flex;
+        flex-direction: row-reverse;
+        span {
+          padding: 0;
+          margin: 0;
+          width: 100px;
+          height:32px;
+          line-height:32px;
+          text-align: center;
+          display: inline-block;
+          font-size: 16px;
+          border-radius: 4px;
+          box-sizing: border-box;
+          &:hover {
+            cursor: pointer;
+          }
+          &:nth-child(1) {
+            background: rgba(255, 255, 255, 1);
+            order: 1px solid rgba(224, 229, 235, 1);
+
+            border: 1px solid rgba(224, 229, 235, 1);
+          }
+          &:nth-child(2) {
+            background: #3f9b6a;
+            color: #fff;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+  .couponPage{
+
+     padding: 0  20px 20px 20px;
+     min-height: calc(100vh - 50px - 20px);
+     background-color: #Fff;
+
+
+    .tableBox{
+      text-align: center;
+      .fenye{
+        // margin: 20px;
+      }
+    }
+  }
+  .couponDialogBox {
+    max-height: 600px;
+    overflow-y: auto;
+  }
+  .formSearch{
+
+      display: flex;
+      width: 100%;
+      font-size: 14px;
+      justify-content: space-between;
+      // padding-bottom: 10px;
+      align-items: center;
+      margin: 20px 0;
+
+  }
+    .tableBtn {
+      display: inline-block;
+      margin-right: 10px;
+    }
+
+  .greens {
+      color: #3F9B6A;
+    }
+    ::v-deep .buttonHover:hover{
+      color:#3f9b6a !important;
+      border-color: #c5e1d2 !important;
+      background-color: #ecf5f0 !important;
+      outline: none;
+    }
+    ::v-deep .el-pagination__total {
+      position: absolute;
+      left: 10px;
+    }
+    ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active{
+      background-color:#3f9b6a;
+    }
+  </style>
diff --git a/admin-web-master/src/views/couponmanagement/couponlist.vue b/admin-web-master/src/views/couponmanagement/couponlist.vue
new file mode 100644
index 0000000..8b5cbed
--- /dev/null
+++ b/admin-web-master/src/views/couponmanagement/couponlist.vue
@@ -0,0 +1,319 @@
+<template>
+    <div style="background-color:#f7f7f7;padding:10px 10px;">
+      <div class="couponPage" v-show="type == '1'">
+        <div>
+          <div style="height:58px;line-height:58px;">
+            <div style="color:#0006"> <span>优惠券管理</span>   <span style="padding:0 5px;">></span>  <span style="color:#000000e6">优惠券列表</span></div>
+          </div>
+            <!-- 搜索 -->
+          <div class="formSearch">
+            <!-- 搜索条件 -->
+            <el-form :inline="true" :model="query" class="demo-form-inline">
+              <el-form-item label="名称">
+                <el-input v-model="query.couponName" placeholder="请输入名称" />
+              </el-form-item>
+            </el-form>
+            <div>
+              <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
+              <el-button  class="buttonHover"
+                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
+            </div>
+          </div>
+          <!-- 表格 -->
+          <div class="tableBox">
+            <el-table
+              ref="multipleTable"
+              :data="tableData"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#f5f8f9'}"
+              tooltip-effect="light"
+              
+            > 
+              <el-table-column label="编号" >
+                <template slot-scope="scope">{{ scope.row.id }}</template>
+              </el-table-column>
+              <el-table-column label="优惠券名称" >
+                <template slot-scope="scope">{{ scope.row.couponName }}</template>
+              </el-table-column>
+              <el-table-column label="类型">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满减券</span>
+                  <span v-else-if="scope.row.couponType == '2'">折扣券</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="优惠内容">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.couponType == '1'">满{{ scope.row.maxDiscountAmount }}减{{ scope.row.discountContent }}</span>
+                  <span v-else-if="scope.row.couponType == '2'">{{ scope.row.discountContent }}折 最高减{{ scope.row.maxDiscountAmount }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right">
+                <template slot-scope="scope">
+                  <div class="btnList">
+                    <div class="tableBtn greens" @click="xq(scope.row)">查看详情</div>
+                    <!-- <div class="tableBtn greens"  @click="addcoupon(scope.row)">生成优惠券</div> -->
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div style="display: flex;justify-content: space-between;" class="bom">
+              <div style="font-size: 14px;">共  <span style="color: #3F9B6A;">{{total}}</span>  项数据</div>
+              <el-pagination
+                :current-page="query.pageNumber"
+                :page-sizes="[10, 20, 50, 100]"
+                :page-size="10"
+                background
+                small
+                layout="prev, pager, next"
+                :total="total"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </template>
+  
+  <script>
+  import { getcereFundsPoolData,addcereFundsPool,delPool,editPool,batchGenerateCoupons}from '@/api/couponmanagement/couponlist.js'
+  import router from '@/router';
+  import coupon from './coupon.vue';
+  
+  export default {
+    
+    components:{
+      coupon
+    },
+    data () {
+      return {
+        couponfrom:{
+          usedMerchants:'1',
+          couponName: '',
+          remark: '',
+          couponType: '1', // 默认值
+          useCategory: '',
+          maxDiscountAmount: null,
+          usageThreshold: null,
+          discountContent: null,
+          isPointsRequired: '否', // 默认值
+          pointsRequired: null,
+          startTime: '',
+          endTime: '',
+          totalCoupons: null,
+          totalFunds: null,
+          createTime: ''
+        },
+        coupoobj:{},
+        type:'1',
+        query: {
+          activityName: '', // 活动名称
+          // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        },
+        total: 0,
+        tableData: [],
+        activityStatusSelect: [
+          {
+            index: 0,
+            label: '未启用',
+            value: 0
+          },
+          {
+            index: 1,
+            label: '启用中',
+            value: 1
+          },
+          {
+            index: 2,
+            label: '已关闭',
+            value: 2
+          },
+        ],
+        activityVisible: false,
+        editForm: false,
+        activityDetailVisible: false,
+        form: {
+          couponName:'',
+          contributor:'',
+          totalAmount:null,
+        }
+      }
+    },
+    created () {
+      this.getAll()
+    },
+    methods: {
+      xq(e) {
+        // 跳转路由
+        router.push({
+          path: '/other/coupon',
+          query: {
+            id: e.id
+          }
+        })
+      },
+      addcoupon(e) {
+        let that = this
+        console.error(e)
+        let from = {
+          "totalCoupons":e.totalCoupons,          //共多少张优惠券
+          "id":e.id,     //优惠券id
+          "fundPoolId":e.fundPoolId   //资金池id
+        }
+        // return
+        batchGenerateCoupons(from).then(res=>{
+          console.error(res)
+          if(res.code == '200') {
+            that.$message({
+              message: '生成成功',
+              type: 'success'
+            });
+            that.search()
+          } else {
+            that.$message({
+              message: res.message,
+              type: 'error'
+            });
+          }
+        })
+      },
+      async getAll () {
+        const res = await getcereFundsPoolData(this.query)
+        console.error(res.data.content)
+        this.tableData = res.data.content
+        this.total = res.data.numberOfElements
+      },
+      handleSizeChange (val) {
+        this.query.pageSize = val
+        this.getAll()
+      },
+      handleCurrentChange (val) {
+        this.query.pageNumber = val
+        this.getAll()
+      },
+      search () {
+        this.total = 1
+        this.query.pageNumber = 1
+        this.getAll()
+      },
+      // 重置
+      clear () {
+        this.query = {
+          activityName: '',
+          state: '',
+          pageNumber: 1,
+          pageSize: 10
+        }
+        this.getAll()
+      },
+
+    }
+  }
+  </script>
+  
+  <style scoped lang="scss">
+    .el-table{
+     height: calc(100vh - 280px);
+    }
+    .bom {
+      margin-top: 40px;
+    }
+    .el-form-item {
+      margin-bottom: 0;
+    }
+    ::v-deep .el-dialog__header{
+      border-bottom: 2px solid #eee;
+      background-color: #fff;
+    }
+    ::v-deep .el-dialog__title {
+      color: #303133;
+    }
+    .footer{
+      font-size: 24px;
+      .btn_list {
+        display: flex;
+        flex-direction: row-reverse;
+        span {
+          padding: 0;
+          margin: 0;
+          width: 100px;
+          height:32px;
+          line-height:32px;
+          text-align: center;
+          display: inline-block;
+          font-size: 16px;
+          border-radius: 4px;
+          box-sizing: border-box;
+          &:hover {
+            cursor: pointer;
+          }
+          &:nth-child(1) {
+            background: rgba(255, 255, 255, 1);
+            order: 1px solid rgba(224, 229, 235, 1);
+            
+            border: 1px solid rgba(224, 229, 235, 1);
+          }
+          &:nth-child(2) {
+            background: #3f9b6a;
+            color: #fff;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+  .couponPage{
+  
+     padding: 0  20px 20px 20px;
+     min-height: calc(100vh - 50px - 20px);
+     background-color: #Fff;
+  
+  
+    .tableBox{
+      text-align: center;
+      
+      .fenye{
+        // margin: 20px;
+      }
+    }
+  }
+  .couponDialogBox {
+    max-height: 600px;
+    overflow-y: auto;
+  }
+  .formSearch{
+  
+      display: flex;
+      width: 100%;
+      font-size: 14px;
+      justify-content: space-between;
+      padding-bottom: 10px;
+      align-items: center;
+  
+  }
+    .tableBtn {
+      display: inline-block;
+      margin-right: 10px;
+    }
+  
+  .greens {
+      color: #3F9B6A;
+    }
+    ::v-deep .buttonHover:hover{
+      color:#3f9b6a !important;
+      border-color: #c5e1d2 !important;
+      background-color: #ecf5f0 !important;
+      outline: none;
+    }
+    ::v-deep .el-pagination__total {
+      position: absolute;
+      left: 10px;
+    }
+    ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active{
+      background-color:#3f9b6a;
+    }
+  </style>
+  
\ No newline at end of file
--
libgit2 0.21.4