diff --git a/admin-web-master/src/api/couponmanagement/capitalpool.js b/admin-web-master/src/api/couponmanagement/capitalpool.js
index d918350..f93ec4e 100644
--- a/admin-web-master/src/api/couponmanagement/capitalpool.js
+++ b/admin-web-master/src/api/couponmanagement/capitalpool.js
@@ -1,4 +1,13 @@
 import request from '@/utils/request'
+
+export function addcereCouponCategory(data) {
+  return request({
+    url: '/cereCouponCategory/add',
+    method: 'post',
+    data
+  })
+}
+
 // 查询剩余金额
 export function totalCapitalBalance(data) {
   return request({
diff --git a/admin-web-master/src/api/couponmanagement/couponlist.js b/admin-web-master/src/api/couponmanagement/couponlist.js
index 1c4539b..f077abd 100644
--- a/admin-web-master/src/api/couponmanagement/couponlist.js
+++ b/admin-web-master/src/api/couponmanagement/couponlist.js
@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 获取优惠券
+export function myCoupons(data) {
+  return request({
+    url: '/coupon/myCoupons',
+    method: 'post',
+    data
+  })
+}
 // 批量生成优惠券
 export function batchGenerateCoupons(data) {
   return request({
diff --git a/admin-web-master/src/components/top/index.vue b/admin-web-master/src/components/top/index.vue
new file mode 100644
index 0000000..70eaa9c
--- /dev/null
+++ b/admin-web-master/src/components/top/index.vue
@@ -0,0 +1,44 @@
+/<template>
+  <div class="title-with-circle">
+    <div class="circle"></div>
+    <div class="title">{{ title }}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TitleWithCircle',
+  props: {
+    title: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title-with-circle {
+  display: flex;
+  align-items: center;
+}
+
+.circle {
+    margin-right: 9px;
+    content: " ";
+    display: inline-block;
+    height: 18px;
+    width: 4px;
+    background-color: #3f9b6a;
+    border-radius: 5px;
+    vertical-align: bottom;
+}
+
+.title {
+    line-height: 18px;
+    color: #000000e6;
+    font-size: 18px;
+    font-weight: bold;
+    font-family: "Alibaba PuHuiTi 2.0-85 Bold";
+}
+</style>
diff --git a/admin-web-master/src/views/couponmanagement/capitalpool.vue b/admin-web-master/src/views/couponmanagement/capitalpool.vue
index 173146c..47f6481 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpool.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpool.vue
@@ -120,11 +120,12 @@
         <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;">
+      <TitleWithCircle title="资金池" style="margin-bottom: 15px;"/>
+      <div style="display: flex;margin-bottom: 20px;padding-left: 30px;">
         <div>资金池名称:{{ coupoobj.poolName }}</div>
-        <div style="margin-left: 30px;font-weight: bold;">总金额:{{ coupoobj.symon }}</div>
+        <div style="margin-left: 30px;">资金池可用金额:<span style="font-weight: bold;">{{ coupoobj.symon }}</span></div>
       </div>
-      <coupon :couponfrom="couponfrom" :coupoobj="coupoobj" />
+      <coupon :couponfrom="couponfrom" :coupoobj="coupoobj" @changevalue="changevalue"/>
       <div class="footer">
         <div class="btn_list" style="margin-top: 30px;">
           <span @click="qxcoupon" class="buttonHover"
@@ -143,15 +144,16 @@
     delPool,
     editPool,
     cereCouponMainTable,
-    totalCapitalBalance
+    totalCapitalBalance,
+    addcereCouponCategory
   } from '@/api/couponmanagement/capitalpool.js'
   import router from '@/router';
   import coupon from './coupon.vue';
-
+  import TitleWithCircle from '@/components/top/index';
   export default {
 
     components: {
-      coupon
+      coupon,TitleWithCircle
     },
     data() {
       return {
@@ -179,12 +181,14 @@
             trigger: 'blur'
           }, ],
         },
+        useCategorylist:'',
+        usedMerchantslist:'',
         couponfrom: {
-          usedMerchants: '全平台',
+          usedMerchants: 1,
           couponName: '',
           remark: '',
           couponType: '1', // 默认值
-          useCategory: '全部',
+          useCategory: 1,
           maxDiscountAmount: null,
           usageThreshold: null, //使用门槛不用
           discountContent: null,
@@ -236,19 +240,46 @@
       this.getAll()
     },
     methods: {
+      changevalue(e,list) {
+        console.error(e,list )
+        this[e] = list
+      },
       xq(e) {
+        console.log(e )
         // 跳转路由
         router.push({
           path: '/other/capitalpoolinfo',
           query: {
-            id: e.id
+            id: e.poolId
           }
         })
       },
       savecoupon() {
         let that = this
+        if(!this.couponfrom.couponName) {
+          return
+        }
+        if(!this.couponfrom.startTime) {
+          return
+        }
+        if(!this.couponfrom.totalCoupons) {
+          return
+        }
+        if(!this.couponfrom.maxDiscountAmount) {
+          return 
+        }
+        if(!this.couponfrom.discountContent) {
+          return 
+        }
+        if(this.couponfrom.couponType == '1') {
+          if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
+            return 
+          }   
+        } 
         let c1 = this.changecouponfrom()
         console.error(c1)
+        console.error(this.useCategorylist)
+        console.error(this.usedMerchantslist)
         console.error(this.coupoobj)
         let from = this.couponfrom
         from.fundPoolId = this.coupoobj.poolId
@@ -267,10 +298,30 @@
         console.error({
           ...from
         })
-        console.error(JSON.stringify(from))
+        // return
         cereCouponMainTable(from).then(res => {
           console.error(res)
           if (res.data) {
+            if(res.data.useCategory == '2') {
+              let info1 = {
+                couponId:res.data.id,
+                usedMerchants:1,
+                categoryIds:that.useCategorylist
+              }
+              addcereCouponCategory(info1).then(res1 => {
+                console.error(res1)
+              })
+            }
+            if(res.data.usedMerchants == '3') {
+              let info2 = {
+                couponId:res.data.id,
+                usedMerchants:3,
+                categoryIds:that.usedMerchantslist
+              }
+              addcereCouponCategory(info2).then(res2 => {
+                console.error(res2)
+              })
+            }
             that.$message({
               message: '提交成功',
               type: 'success'
@@ -493,6 +544,7 @@
               });
             }
             that.search()
+          }).catch(error => {
           })
         }).catch(() => {
           this.$message({
diff --git a/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
index 4fe0b7e..281c1db 100644
--- a/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
+++ b/admin-web-master/src/views/couponmanagement/capitalpoolinfo.vue
@@ -33,12 +33,12 @@
             :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">{{ scope.row.cereFundsPool?scope.row.cereFundsPool.poolName:'' }}</template>
+              </el-table-column>
               <el-table-column label="类型">
                 <template slot-scope="scope">
                   <span v-if="scope.row.couponType == '1'">满减券</span>
@@ -51,6 +51,12 @@
                   <span v-else-if="scope.row.couponType == '2'">{{ scope.row.discountContent }}折 最高减{{ scope.row.maxDiscountAmount }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="金额" >
+                <template slot-scope="scope">{{ scope.row.totalFunds }}</template>
+              </el-table-column>
+              <el-table-column label="数量" >
+                <template slot-scope="scope">{{ scope.row.totalCoupons }}</template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <div class="btnList">
@@ -120,9 +126,8 @@
           },
         ],
         query: {
-          activityName: '', // 活动名称
-          // 活动状态 0-报名未开始 1-报名进行中 2-活动待开始 3-活动进行中 4-活动已结束
-          state: '',
+          fundPoolId:'',
+          couponName: '', //名称
           pageNumber: 1,
           pageSize: 10
         },
@@ -132,6 +137,8 @@
     },
     created () {
       this.getAll()
+      console.log(this.$route.query.id)
+      this.query.fundPoolId = this.$route.query.id
     },
     methods: {
       handleClick(tab, event) {
@@ -167,12 +174,8 @@
       },
       // 重置
       clear () {
-        this.query = {
-          activityName: '',
-          state: '',
-          pageNumber: 1,
-          pageSize: 10
-        }
+        this.query.couponName = ''
+        this.query.pageNumber = 1
         this.getAll()
       },
 
diff --git a/admin-web-master/src/views/couponmanagement/coupon.vue b/admin-web-master/src/views/couponmanagement/coupon.vue
index 29243a0..2d8e7f8 100644
--- a/admin-web-master/src/views/couponmanagement/coupon.vue
+++ b/admin-web-master/src/views/couponmanagement/coupon.vue
@@ -1,10 +1,12 @@
 <template>
     <div class="addCoupon">
       <!-- 新增优惠券 -->
-      <div class="addCouponBox" style="border: 2px solid #eee;padding-right: 30px;padding-top: 30px;padding-bottom: 30px;">
+      <div class="addCouponBox" style="padding-right: 30px;">
+        <TitleWithCircle title="基本信息" style="margin-bottom: 20px;"/>
         <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, '')"  />
@@ -13,7 +15,7 @@
                 <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-form-item v-if="couponfrom.couponType === '1'" class="inputW" label="优惠内容" prop="maxDiscountAmount">
                 订单满 <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">
@@ -29,13 +31,13 @@
                 <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-group v-model="couponfrom.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-form-item label="选择商品类别:" v-if="couponfrom.useCategory === 2">
+                <el-select style="width: 100%;"  multiple v-model="useCategory" placeholder="请选择" filterable @change="changeuseCategory">
                     <el-option
                         v-for="item in classList"
                         :key="item.classifyId"
@@ -45,19 +47,20 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="使用范围:">
-                <el-radio-group v-model="usedMerchants" >
+                <el-radio-group v-model="couponfrom.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-form-item label="选择商家:" v-if="couponfrom.usedMerchants === 3">
                 <el-select 
                     style="width: 100%;" 
                     multiple 
-                    v-model="couponfrom.usedMerchants" 
+                    v-model="usedMerchants" 
                     placeholder="请选择" 
                     filterable
+                    @change="changeusedMerchants"
                 >
                     <el-option
                     v-for="item in shopList"
@@ -78,7 +81,7 @@
                 <el-input v-model="couponfrom.pointsRequired" type="number" style="width: 150px" /> 分
                 </el-form-item>
             </div>
-            <el-form-item class="timeDataBox" label="用券时间">
+            <el-form-item class="timeDataBox" label="用券时间" prop="startTime">
                 <el-date-picker
                     v-model="dateInfo"
                     type="datetimerange"
@@ -93,7 +96,7 @@
                 <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-input maxlength="200" show-word-limit rows="4" v-model="couponfrom.remark" placeholder="请输入备注" type="textarea" />
             </el-form-item>
         </el-form>
       </div>
@@ -102,10 +105,14 @@
   
   <script>
   import { commdityClassGetAll } from '@/api/renovation';
+  import TitleWithCircle from '@/components/top/index';
   import {
   businessListGetAll,
 } from '@/api/business'
   export default {
+    components: {
+      TitleWithCircle
+    },
     name: 'AddCoupon',
     props: {
         couponfrom: {
@@ -118,17 +125,30 @@
         default: {
           symon:0
         },
-
       },
     },
     data() {
+      var moneyContent = (rule, value, callback) => {
+        if(!this.couponfrom.maxDiscountAmount) {
+          return callback(new Error('请输入优惠内容'));
+        }
+        if(!this.couponfrom.discountContent) {
+          return callback(new Error('请输入优惠内容'));
+        }
+        if(this.couponfrom.couponType == '1') {
+          if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
+            return callback(new Error('请满减金额大于优惠金额'));
+          }   
+        } 
+        callback();
+      }
       return {
         monys:0,
-        usedMerchants:1,
+        usedMerchants:null,
         pointsRequired:0,
         dateInfo: null,
         isThreshold: true,
-        useCategory:1,
+        useCategory:null,
         useCategory2:1,
         classList:[],
         shopList:[],
@@ -136,8 +156,8 @@
             couponName: [
           { required: true, message: '请输入优惠券名称', trigger: 'blur' }
         ],
-        // couponContent: [{ required: true, message: '请输入优惠金额' }],
-        dateInfo: [{ type: 'date', required: true, message: '请选择时间' }],
+        maxDiscountAmount: [ { validator: moneyContent, trigger: 'blur' }],
+        startTime: [{required: true, message: '请选择时间', trigger: 'blur'}],
         totalCoupons: [{ required: true, message: '请输入数量', trigger: 'blur' }]
         },
       }
@@ -147,35 +167,29 @@
         this.couponfrom.maxDiscountAmount = 0
         this.couponfrom.discountContent = 0
       },
-      useCategory(val) {
+      'couponfrom.useCategory'(val) {
         if(val == '1') {
-          this.couponfrom.useCategory = '全部'
+          this.useCategory = null
         } 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 = ''
-        } 
+      'couponfrom.usedMerchants'(val) {
+        this.usedMerchants = null
       },
       pointsRequired(val) {
-        if(val == '1') {
-          this.couponfrom.pointsRequired = ''
-        } else {
-          this.couponfrom.pointsRequired = 0
-        } 
+        this.couponfrom.pointsRequired = 0
       },
     },
     mounted() {
         this.getAll()
     },
     methods: {
+      changeuseCategory(e){
+        this.$emit('changevalue','useCategorylist',e)
+      },
+      changeusedMerchants(e){
+        this.$emit('changevalue','usedMerchantslist',e)
+      },
       changeDate(e){
         console.error(e)
         if(e && e.length>0) {
diff --git a/admin-web-master/src/views/couponmanagement/couponinfo.vue b/admin-web-master/src/views/couponmanagement/couponinfo.vue
index 6c111b4..b6326ed 100644
--- a/admin-web-master/src/views/couponmanagement/couponinfo.vue
+++ b/admin-web-master/src/views/couponmanagement/couponinfo.vue
@@ -91,7 +91,7 @@
   </template>
 
   <script>
-  import { getcereFundsPoolData,addcereFundsPool,delPool,editPool,batchGenerateCoupons}from '@/api/couponmanagement/couponlist.js'
+  import { myCoupons}from '@/api/couponmanagement/couponlist.js'
   import router from '@/router';
   import coupon from './coupon.vue';
 
@@ -153,7 +153,7 @@
         })
       },
       async getAll () {
-        const res = await getcereFundsPoolData(this.query)
+        const res = await myCoupons(this.query)
         console.error(res.data.content)
         this.tableData = res.data.content
         this.total = res.data.numberOfElements
diff --git a/admin-web-master/src/views/couponmanagement/couponlist.vue b/admin-web-master/src/views/couponmanagement/couponlist.vue
index 8b5cbed..bec8792 100644
--- a/admin-web-master/src/views/couponmanagement/couponlist.vue
+++ b/admin-web-master/src/views/couponmanagement/couponlist.vue
@@ -28,12 +28,12 @@
               tooltip-effect="light"
               
             > 
-              <el-table-column label="编号" >
-                <template slot-scope="scope">{{ scope.row.id }}</template>
-              </el-table-column>
-              <el-table-column label="优惠券名称" >
+            <el-table-column label="优惠券名称" >
                 <template slot-scope="scope">{{ scope.row.couponName }}</template>
               </el-table-column>
+              <el-table-column label="资金池">
+                <template slot-scope="scope">{{ scope.row.cereFundsPool?scope.row.cereFundsPool.poolName:'' }}</template>
+              </el-table-column>
               <el-table-column label="类型">
                 <template slot-scope="scope">
                   <span v-if="scope.row.couponType == '1'">满减券</span>
@@ -46,6 +46,12 @@
                   <span v-else-if="scope.row.couponType == '2'">{{ scope.row.discountContent }}折 最高减{{ scope.row.maxDiscountAmount }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="金额" >
+                <template slot-scope="scope">{{ scope.row.totalFunds }}</template>
+              </el-table-column>
+              <el-table-column label="数量" >
+                <template slot-scope="scope">{{ scope.row.totalCoupons }}</template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
                   <div class="btnList">
diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js
index 2053be3..ea57e34 100644
--- a/ceres-uniapp-master/config/api.js
+++ b/ceres-uniapp-master/config/api.js
@@ -313,4 +313,6 @@ module.exports = {
 	wenjuanList: WX_API_BASEPING + '/cereQuestionnaireTable/queryById', 
 	//问卷提交接口
 	wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add', 
+	//新优惠券
+	couponnew: 'http://8.130.38.56:9007/coupon/myCoupons', 
 }
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue b/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue
new file mode 100644
index 0000000..c963196
--- /dev/null
+++ b/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue
@@ -0,0 +1,300 @@
+<template>
+  <view class="couponList u-skeleton">
+    <Skeleton
+        el-color="#efefef"
+        bg-color="#fff"
+        :loading="loading && isFirstComeIn"
+        :animation="true"
+    />
+    <template v-if="couponList.length>0">
+      <view
+          class="couponItem u-skeleton-fillet flex-items"
+          v-for="item of couponList"
+          :key="item.couponId"
+      >
+        <view
+            class="itemLeft u-skeleton-fillet"
+            @click="goProductList(item)"
+        >
+          <view class="topIcon"></view>
+          <view class="bottomIcon"></view>
+          <view class="price flex-items">
+            <view
+                class="flex-column flex-end unitBox"
+                v-if="item.discountMode === 1"
+            >
+              <view class="unit">￥</view>
+            </view>
+            <view class="priceValue">{{ item.reduceMoney }}{{ item.discountMode === 1 ? '' : '折' }}</view>
+          </view>
+          <text class="fs24 font-color-999">满{{ item.fullMoney }}元可用</text>
+        </view>
+        <view class="itemRight u-skeleton-fillet">
+          <view class="topInfo flex-items flex-sp-between">
+            <view @click="goProductList(item)">
+              <view class="couponTit fs32 font-color-FFF">{{ item.activityName }}</view>
+              <view class="couponDate fs24 font-color-999">{{ item.endTime }}到期</view>
+            </view>
+            <view class="exchangeBtnBox flex-column flex-end">
+              <view
+                  class="exchangeBtn fs24 font-color-FFF"
+                  v-if="item.state === 0"
+              >已领取
+              </view>
+              <wx-send-coupon
+                  v-else
+                  @success="success"
+                  :couponList="[item]"
+              >
+                <view class="exchangeBtn fs24 font-color-FFF">{{ item.ifCredit ? '立即兑换' : '立即领取' }}</view>
+              </wx-send-coupon>
+            </view>
+          </view>
+          <view
+              @click="goProductList(item)"
+              class="couponType fs28 font-color-FFF"
+          >{{ item.discountMode === 1 ? '满减券' : '折扣券' }}
+          </view>
+        </view>
+      </view>
+      <!-- 触底 -->
+      <view
+          class="reachBottom"
+          v-if="topLeft > 400 && couponList.length>0"
+      >
+        <image
+            class="reach-icon"
+            src="https://jy.scjysm.asia:18086/mefile/file/static/img//reachBottom.png"
+            mode="widthFix"
+        ></image>
+        <text class="reach-text">这里到底了哦~~</text>
+      </view>
+    </template>
+    <Empty :show="couponList.length<=0" />
+  </view>
+</template>
+
+<script>
+import Skeleton from "../../components/Skeleton";
+import Empty from "../../components/Empty";
+import WxSendCoupon from "../../components/wx/wxSendCoupon";
+
+const NET = require('../../utils/request')
+const API = require('../../config/api')
+export default {
+  name: "list",
+  components: {WxSendCoupon, Empty, Skeleton},
+  data() {
+    return {
+      loading: false,
+      isFirstComeIn: true,
+      couponList: [{}, {}, {}, {}, {}, {}], // 优惠券列表getCoupons
+      page: 1,
+      pageSize: 10,
+      loadingType: 0,
+      topLeft: 0
+    }
+  },
+  onLoad() {
+    this.getCouponList()
+  },
+  onReachBottom() {
+    if (this.loadingType == 1) {
+      uni.stopPullDownRefresh()
+    } else {
+      this.page = this.page + 1
+      this.getCouponList()
+    }
+  },
+  onPageScroll(e) {
+    this.topLeft = e.scrollTop
+  },
+  methods: {
+    getCouponList() {
+      // uni.showLoading({
+      //   mask: true,
+      //   title: '加载中...'
+      // })
+      this.loading = true
+	  NET.request(API.youhuiquan, {
+	    page: this.page,
+	    pageSize: this.pageSize,
+		shopId:154
+	  }, 'GET').then(res => {
+	    uni.hideLoading()
+	    if (res.data.length === 0) {
+	      this.loadingType = 1
+	    } else {
+	      this.couponList = this.couponList.concat(res.data)
+	      this.$forceUpdate()
+	    }
+	    this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
+	    this.loading = false
+	    this.isFirstComeIn = false
+	  }).catch(res => {
+	    uni.hideLoading()
+	  })
+      // NET.request(API.getCoupons, {
+      //   page: this.page,
+      //   pageSize: this.pageSize
+      // }, 'GET').then(res => {
+      //   uni.hideLoading()
+      //   if (res.data.list.length === 0) {
+      //     this.loadingType = 1
+      //   } else {
+      //     this.couponList = this.couponList.concat(res.data.list)
+      //     this.$forceUpdate()
+      //   }
+      //   this.couponList = this.couponList.filter(item => JSON.stringify(item) !== '{}')
+      //   this.loading = false
+      //   this.isFirstComeIn = false
+      // }).catch(res => {
+      //   uni.hideLoading()
+      // })
+    },
+    // 跳转到可用商品列表
+    goProductList(item) {
+      console.log(item, 'test')
+      uni.navigateTo({
+        url: `../coupon/product?id=${ item.couponId }&actId=${item.activityId}`
+      })
+    },
+    success() {
+      this.page = 1
+      this.couponList = []
+      this.getCouponList()
+    }
+  }
+}
+</script>
+
+<style
+    lang="scss"
+    scoped
+>
+page {
+  background: #F8F8F8;
+
+  .couponList {
+    padding: 0 20rpx 40upx;
+    margin-top: 30rpx;
+
+    .couponItem {
+      background: #333333;
+      margin-top: 40rpx;
+      padding: 25rpx 35rpx;
+      overflow: hidden;
+      background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png");
+      background-repeat: no-repeat;
+      background-size: contain;
+      background-position: right top;
+
+      .itemLeft {
+        padding-right: 10rpx;
+        position: relative;
+        border-right: 2rpx dashed #666666;
+        width: 170rpx;
+
+        .topIcon {
+          position: absolute;
+          right: -16rpx;
+          top: -50rpx;
+          width: 32rpx;
+          height: 32rpx;
+          background: #FFFFFF;
+          border-radius: 50%;
+        }
+
+        .bottomIcon {
+          position: absolute;
+          right: -16rpx;
+          bottom: -50rpx;
+          width: 32rpx;
+          height: 32rpx;
+          background: #FFFFFF;
+          border-radius: 50%;
+        }
+
+        //.price {
+        //  width: 100rpx;
+        //}
+        .unitBox {
+          height: 70rpx;
+        }
+
+        .unit {
+          color: #FFEBC4;
+          font-size: 36rpx;
+        }
+
+        .priceValue {
+          font-size: 52rpx;
+          color: #FFEBC4;
+        }
+      }
+
+      .itemRight {
+        padding-left: 45rpx;
+        flex: 1;
+
+        .topInfo {
+          padding-bottom: 10rpx;
+          border-bottom: 2rpx solid #444444;
+          margin-bottom: 10rpx;
+
+          .couponDate {
+            width: 300rpx;
+          }
+
+          .exchangeBtnBox {
+            width: 110rpx;
+            height: 70rpx;
+            text-align: center;
+
+            .exchangeBtn {
+              padding: 5rpx;
+              border: 2rpx solid #999999;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .Put-box1 {
+    .btn {
+      text-align: center;
+      margin-top: 40rpx;
+      border: 2rpx solid #333333;
+      height: 80upx;
+      line-height: 80upx;
+      width: 100%;
+      color: #333333;
+    }
+
+    .submit {
+      background-color: #333333;
+      color: #FFEBC4;
+      margin-left: 20rpx;
+    }
+  }
+}
+
+// 触底样式
+.reachBottom {
+  margin-top: 30rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .reach-icon {
+    width: 150rpx;
+    height: 150rpx;
+  }
+
+  .reach-text {
+    margin: 20rpx 0;
+    color: #CCCCCC;
+  }
+}
+</style>
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list.vue b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
index c963196..95879b1 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/list.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
@@ -116,11 +116,11 @@ export default {
       //   title: '加载中...'
       // })
       this.loading = true
-	  NET.request(API.youhuiquan, {
+	  NET.request(API.couponnew, {
 	    page: this.page,
 	    pageSize: this.pageSize,
 		shopId:154
-	  }, 'GET').then(res => {
+	  }, 'POST').then(res => {
 	    uni.hideLoading()
 	    if (res.data.length === 0) {
 	      this.loadingType = 1
diff --git a/merchant-web-master/src/api/couponmanagement/capitalpool.js b/merchant-web-master/src/api/couponmanagement/capitalpool.js
new file mode 100644
index 0000000..82540e4
--- /dev/null
+++ b/merchant-web-master/src/api/couponmanagement/capitalpool.js
@@ -0,0 +1,69 @@
+import request from '@/utils/requestnew'
+
+export function addcereCouponCategory(data) {
+  return request({
+    url: '/cereCouponCategory/add',
+    method: 'post',
+    data
+  })
+}
+
+// 查询剩余金额
+export function totalCapitalBalance(data) {
+  return request({
+    url: '/cereCouponMainTable/totalCapitalBalance',
+    method: 'post',
+    data
+  })
+}
+export function getcereFundsPoolData(data) {
+  return request({
+    url: '/cereFundsPool/queryByPage',
+    method: 'post',
+    data
+  })
+}
+
+/**
+{
+	"activityId": 0
+}
+ */
+export function getcereFundsPoolDetail(data) {
+  return request({
+    url: '/cereFundsPool/getById',
+    method: 'post',
+    data
+  })
+}
+
+
+export function addcereFundsPool(data) {
+  return request({
+    url: '/cereFundsPool/add ',
+    method: 'post',
+    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/merchant-web-master/src/api/couponmanagement/couponlist.js b/merchant-web-master/src/api/couponmanagement/couponlist.js
new file mode 100644
index 0000000..312f3c3
--- /dev/null
+++ b/merchant-web-master/src/api/couponmanagement/couponlist.js
@@ -0,0 +1,61 @@
+import request from '@/utils/requestnew'
+// 获取优惠券
+export function myCoupons(data) {
+  return request({
+    url: '/coupon/myCoupons',
+    method: 'post',
+    data
+  })
+}
+// 批量生成优惠券
+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/merchant-web-master/src/api/couponmanagement/marketing.js b/merchant-web-master/src/api/couponmanagement/marketing.js
new file mode 100644
index 0000000..ef9ae85
--- /dev/null
+++ b/merchant-web-master/src/api/couponmanagement/marketing.js
@@ -0,0 +1,449 @@
+import request from '@/utils/requestnew'
+
+//* ******************** 待处理订单  *********************
+// 订单管理查询
+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/merchant-web-master/src/components/top/index.vue b/merchant-web-master/src/components/top/index.vue
new file mode 100644
index 0000000..70eaa9c
--- /dev/null
+++ b/merchant-web-master/src/components/top/index.vue
@@ -0,0 +1,44 @@
+/<template>
+  <div class="title-with-circle">
+    <div class="circle"></div>
+    <div class="title">{{ title }}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TitleWithCircle',
+  props: {
+    title: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title-with-circle {
+  display: flex;
+  align-items: center;
+}
+
+.circle {
+    margin-right: 9px;
+    content: " ";
+    display: inline-block;
+    height: 18px;
+    width: 4px;
+    background-color: #3f9b6a;
+    border-radius: 5px;
+    vertical-align: bottom;
+}
+
+.title {
+    line-height: 18px;
+    color: #000000e6;
+    font-size: 18px;
+    font-weight: bold;
+    font-family: "Alibaba PuHuiTi 2.0-85 Bold";
+}
+</style>
diff --git a/merchant-web-master/src/utils/requestnew.js b/merchant-web-master/src/utils/requestnew.js
new file mode 100644
index 0000000..ac653b8
--- /dev/null
+++ b/merchant-web-master/src/utils/requestnew.js
@@ -0,0 +1,107 @@
+import axios from 'axios'
+import {
+  MessageBox,
+  Message
+} from 'element-ui'
+import store from '@/store'
+import router from '@/router'
+import {
+  getToken,
+  getShopId,
+  removeToken
+} from '@/utils/auth'
+
+//
+// const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
+const host = window.location.host;
+let PREFIX;
+if (host == '172.16.61.48' || host == '172.16.61.49:5173') {
+   PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+}else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
+  // 其他情况的默认值
+  // PREFIX = 'http://8.130.38.56:8027/business-server';
+  //  PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';
+  PREFIX = 'http://8.130.38.56:9003'
+}else{
+  PREFIX = '/merchant-business';
+}
+const baseURL = PREFIX
+// const baseURL = 'http://10.0.0.14:9004'
+// create an axios instance
+const service = axios.create({
+  baseURL,
+  // withCredentials: true, // send cookies when cross-domain requests
+  timeout: 300000 // request timeout
+})
+
+// export const uploadUrl = 'http://192.168.1.102:8005/file/upload'
+export const uploadUrl = `${baseURL}/file/upload`
+export const WXuploadUrl = `${baseURL}/file/uploadWxMedia` // 直播上传专用
+//export const QYuploadUrl = `${baseURL}/file/uploadQyMedia` // 微信客服上传专用
+export const QYuploadUrl = `${baseURL}/file/upload` // 微信客服上传专用
+
+// request interceptor
+service.interceptors.request.use(
+  config => {
+    if (store.getters.token) {
+      config.headers['Authorization-business'] = getToken()
+      config.headers['shopId'] = getShopId()
+      config.headers['Content-Type'] = 'application/json; charset=UTF-8'
+      // config.headers['type'] = ' business'
+    }
+    return config
+  },
+  error => {
+    console.log(error)
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  response => {
+    const res = response.data
+    if (response.config.responseType === 'blob') {
+      return response.data
+    }
+    if (res.code !== '') {
+      Message({
+        message: res.message || 'Error',
+        type: 'error',
+        duration: 5 * 1000
+      })
+      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+      const tokenerr = [20003, '20003', 20004, '20004', 20005, '20005']
+      // if (tokenerr.includes(res.code)) {
+      //   localStorage.clear()
+      //   removeToken()
+      //   router.push({ path: '/login' })
+      //   location.reload()
+      // }
+      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+          confirmButtonText: 'Re-Login',
+          cancelButtonText: 'Cancel',
+          type: 'warning'
+        }).then(() => {
+          store.dispatch('user/resetToken').then(() => {
+            location.reload()
+          })
+        })
+      }
+      return Promise.reject(new Error(res.message || 'Error'))
+    } else {
+      return res
+    }
+  },
+  error => {
+    console.log(error)
+    Message({
+      message: '服务器暂无响应，请稍后重试',
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+export default service
diff --git a/merchant-web-master/src/views/couponmanagement/capitalpool.vue b/merchant-web-master/src/views/couponmanagement/capitalpool.vue
new file mode 100644
index 0000000..47f6481
--- /dev/null
+++ b/merchant-web-master/src/views/couponmanagement/capitalpool.vue
@@ -0,0 +1,679 @@
+<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.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">
+                <el-popover trigger="hover" placement="top">
+                  <p style="max-width: 300px;">{{ scope.row.contributor }}</p>
+                  <div slot="reference" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 100%;" >
+                    {{ scope.row.contributor }}
+                  </div>
+                </el-popover>
+              </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>
+
+        <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" :rules="couponRules">
+            <el-form-item label="资金池名称:" prop="poolName">
+              <el-input v-model="form.poolName" placeholder="请输入资金池名称" />
+            </el-form-item>
+            <el-form-item label="总金额:" style="margin: 20px 0;" prop="totalAmount">
+              <el-input v-model.number="form.totalAmount" placeholder="请输入总金额" />
+            </el-form-item>
+            <el-form-item label="出资方:" prop="contributor">
+              <el-input maxlength="200" show-word-limit rows="4" type="textarea" v-model="form.contributor"
+                placeholder="请输入出资方" />
+            </el-form-item>
+          </el-form>
+          <div class="footer" style="margin-top: 25px;">
+            <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>
+      <TitleWithCircle title="资金池" style="margin-bottom: 15px;"/>
+      <div style="display: flex;margin-bottom: 20px;padding-left: 30px;">
+        <div>资金池名称:{{ coupoobj.poolName }}</div>
+        <div style="margin-left: 30px;">资金池可用金额:<span style="font-weight: bold;">{{ coupoobj.symon }}</span></div>
+      </div>
+      <coupon :couponfrom="couponfrom" :coupoobj="coupoobj" @changevalue="changevalue"/>
+      <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>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    getcereFundsPoolData,
+    addcereFundsPool,
+    delPool,
+    editPool,
+    cereCouponMainTable,
+    totalCapitalBalance,
+    addcereCouponCategory
+  } from '@/api/couponmanagement/capitalpool.js'
+  import router from '@/router';
+  import coupon from './coupon.vue';
+  import TitleWithCircle from '@/components/top/index';
+  export default {
+
+    components: {
+      coupon,TitleWithCircle
+    },
+    data() {
+      return {
+        couponRules: {
+          poolName: [{
+              required: true,
+              message: '请输入资金池名称',
+              trigger: 'blur'
+            },
+            {
+              min: 0,
+              max: 20,
+              message: '长度不超过20个字符',
+              trigger: 'blur'
+            }
+          ],
+          totalAmount: [{
+            required: true,
+            message: '请输入总金额',
+            trigger: 'blur'
+          }, ],
+          contributor: [{
+            required: true,
+            message: '请输入出资方',
+            trigger: 'blur'
+          }, ],
+        },
+        useCategorylist:'',
+        usedMerchantslist:'',
+        couponfrom: {
+          usedMerchants: 1,
+          couponName: '',
+          remark: '',
+          couponType: '1', // 默认值
+          useCategory: 1,
+          maxDiscountAmount: null,
+          usageThreshold: null, //使用门槛不用
+          discountContent: null,
+          pointsRequired: 0,
+          startTime: '',
+          endTime: '',
+          totalCoupons: null,
+          totalFunds: null,
+        },
+        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: {
+          poolName: '',
+          contributor: '',
+          totalAmount: null,
+          fundsStatus: '0'
+        }
+      }
+    },
+    created() {
+      this.getAll()
+    },
+    methods: {
+      changevalue(e,list) {
+        console.error(e,list )
+        this[e] = list
+      },
+      xq(e) {
+        console.log(e )
+        // 跳转路由
+        router.push({
+          path: '/other/capitalpoolinfo',
+          query: {
+            id: e.poolId
+          }
+        })
+      },
+      savecoupon() {
+        let that = this
+        if(!this.couponfrom.couponName) {
+          return
+        }
+        if(!this.couponfrom.startTime) {
+          return
+        }
+        if(!this.couponfrom.totalCoupons) {
+          return
+        }
+        if(!this.couponfrom.maxDiscountAmount) {
+          return 
+        }
+        if(!this.couponfrom.discountContent) {
+          return 
+        }
+        if(this.couponfrom.couponType == '1') {
+          if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
+            return 
+          }   
+        } 
+        let c1 = this.changecouponfrom()
+        console.error(c1)
+        console.error(this.useCategorylist)
+        console.error(this.usedMerchantslist)
+        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
+        })
+        // return
+        cereCouponMainTable(from).then(res => {
+          console.error(res)
+          if (res.data) {
+            if(res.data.useCategory == '2') {
+              let info1 = {
+                couponId:res.data.id,
+                usedMerchants:1,
+                categoryIds:that.useCategorylist
+              }
+              addcereCouponCategory(info1).then(res1 => {
+                console.error(res1)
+              })
+            }
+            if(res.data.usedMerchants == '3') {
+              let info2 = {
+                couponId:res.data.id,
+                usedMerchants:3,
+                categoryIds:that.usedMerchantslist
+              }
+              addcereCouponCategory(info2).then(res2 => {
+                console.error(res2)
+              })
+            }
+            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
+        that.$refs.form.validate((valid) => {
+          if (valid) {
+            form.totalAmount = Number(form.totalAmount)
+            if (that.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'
+                }
+              })
+            }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+
+
+      },
+      cancel() {
+        this.activityVisible = false
+        this.form = {
+          poolName: '',
+          contributor: '',
+          totalAmount: null,
+          fundsStatus: '0'
+        }
+      },
+      async getAll() {
+        const res = await getcereFundsPoolData(this.query)
+        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()
+      },
+      // 活动详情
+      details(row) {
+        this.form = row
+        this.activityDetailVisible = true
+      },
+      // 添加活动
+      addActivity() {
+        this.editForm = false
+        this.activityVisible = true
+      },
+      // 编辑
+      editActivity(row) {
+        this.editForm = true
+        this.form = row
+        this.activityVisible = true
+      },
+      async endActivity(row) {
+        const res = await endCoupon({
+          activityId: row.activityId
+        })
+        if (res.code === '') {
+          this.$message({
+            message: '结束成功',
+            type: 'success'
+          })
+        } else {
+          this.$message({
+            message: res.message,
+            type: 'error'
+          })
+        }
+        this.getAll()
+      },
+      async delActivity(row) {
+        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(error => {
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+      },
+
+    }
+  }
+</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;
+  }
+
+  ::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>
diff --git a/merchant-web-master/src/views/couponmanagement/capitalpoolinfo.vue b/merchant-web-master/src/views/couponmanagement/capitalpoolinfo.vue
new file mode 100644
index 0000000..281c1db
--- /dev/null
+++ b/merchant-web-master/src/views/couponmanagement/capitalpoolinfo.vue
@@ -0,0 +1,287 @@
+<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"
+            >
+              <el-table-column label="优惠券名称" >
+                <template slot-scope="scope">{{ scope.row.couponName }}</template>
+              </el-table-column>
+              <el-table-column label="资金池" >
+                <template slot-scope="scope">{{ scope.row.cereFundsPool?scope.row.cereFundsPool.poolName:'' }}</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="金额" >
+                <template slot-scope="scope">{{ scope.row.totalFunds }}</template>
+              </el-table-column>
+              <el-table-column label="数量" >
+                <template slot-scope="scope">{{ scope.row.totalCoupons }}</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 style="display: flex;">
+              <router-link to="/other/capitalpoolinfo"> <el-button  class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" >返回</el-button></router-link>
+            </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: {
+          fundPoolId:'',
+          couponName: '', //名称
+          pageNumber: 1,
+          pageSize: 10
+        },
+        total: 0,
+        tableData: [],
+      }
+    },
+    created () {
+      this.getAll()
+      console.log(this.$route.query.id)
+      this.query.fundPoolId = this.$route.query.id
+    },
+    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.couponName = ''
+        this.query.pageNumber = 1
+        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/merchant-web-master/src/views/couponmanagement/coupon.vue b/merchant-web-master/src/views/couponmanagement/coupon.vue
new file mode 100644
index 0000000..8f4457d
--- /dev/null
+++ b/merchant-web-master/src/views/couponmanagement/coupon.vue
@@ -0,0 +1,360 @@
+<template>
+    <div class="addCoupon">
+      <!-- 新增优惠券 -->
+      <div class="addCouponBox" style="padding-right: 30px;">
+        <TitleWithCircle title="基本信息" style="margin-bottom: 20px;"/>
+        <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="maxDiscountAmount">
+                订单满 <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="couponfrom.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="couponfrom.useCategory === 2">
+                <el-select style="width: 100%;"  multiple v-model="useCategory" placeholder="请选择" filterable @change="changeuseCategory">
+                    <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="couponfrom.usedMerchants" >
+                    <el-radio :label="1" >全平台</el-radio>
+                    <el-radio :label="3" >部分商家</el-radio>    
+                </el-radio-group>
+            </el-form-item> -->
+            <el-form-item label="选择商品:" >
+                <el-select 
+                    style="width: 100%;" 
+                    multiple 
+                    v-model="usedMerchants" 
+                    placeholder="请选择" 
+                    filterable
+                    @change="changeusedMerchants"
+                >
+                    <el-option
+                    v-for="item in shopList"
+                    :key="item.productId"
+                    :label="item.productName"
+                    :value="item.productId"
+                    />
+                </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="用券时间" prop="startTime">
+                <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 maxlength="200" show-word-limit rows="4" v-model="couponfrom.remark" placeholder="请输入备注" type="textarea" />
+            </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  // import { commdityClassGetAll } from '@/api/renovation';
+  import TitleWithCircle from '@/components/top/index';
+//   import {
+//   businessListGetAll,
+// } from '@/api/business'
+import {
+  getClassifyGetAll,
+} from '@/api/commodity'
+  export default {
+    components: {
+      TitleWithCircle
+    },
+    name: 'AddCoupon',
+    props: {
+        couponfrom: {
+        type: Object,
+        default: {},
+
+      },
+      coupoobj: {
+        type: Object,
+        default: {
+          symon:0
+        },
+      },
+    },
+    data() {
+      var moneyContent = (rule, value, callback) => {
+        if(!this.couponfrom.maxDiscountAmount) {
+          return callback(new Error('请输入优惠内容'));
+        }
+        if(!this.couponfrom.discountContent) {
+          return callback(new Error('请输入优惠内容'));
+        }
+        if(this.couponfrom.couponType == '1') {
+          if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
+            return callback(new Error('请满减金额大于优惠金额'));
+          }   
+        } 
+        callback();
+      }
+      return {
+        monys:0,
+        usedMerchants:null,
+        pointsRequired:0,
+        dateInfo: null,
+        isThreshold: true,
+        useCategory:null,
+        useCategory2:1,
+        classList:[],
+        shopList:[],
+        couponRules: {
+            couponName: [
+          { required: true, message: '请输入优惠券名称', trigger: 'blur' }
+        ],
+        maxDiscountAmount: [ { validator: moneyContent, trigger: 'blur' }],
+        startTime: [{required: true, message: '请选择时间', trigger: 'blur'}],
+        totalCoupons: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+        },
+      }
+    },
+    watch: {
+      'couponfrom.couponType'(val) {
+        this.couponfrom.maxDiscountAmount = 0
+        this.couponfrom.discountContent = 0
+      },
+      'couponfrom.useCategory'(val) {
+        if(val == '1') {
+          this.useCategory = null
+        } else {
+        } 
+      },
+      'couponfrom.usedMerchants'(val) {
+        this.usedMerchants = null
+      },
+      pointsRequired(val) {
+        this.couponfrom.pointsRequired = 0
+      },
+    },
+    mounted() {
+        this.getAll()
+    },
+    methods: {
+      changeuseCategory(e){
+        this.$emit('changevalue','useCategorylist',e)
+      },
+      changeusedMerchants(e){
+        this.$emit('changevalue','usedMerchantslist',e)
+      },
+      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 getClassifyGetAll ({
+        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/merchant-web-master/src/views/couponmanagement/couponinfo.vue b/merchant-web-master/src/views/couponmanagement/couponinfo.vue
new file mode 100644
index 0000000..b6326ed
--- /dev/null
+++ b/merchant-web-master/src/views/couponmanagement/couponinfo.vue
@@ -0,0 +1,290 @@
+<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"
+            >
+              <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 style="display: flex;">
+              <router-link to="/other/capitalpoolinfo"> <el-button  class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" >返回</el-button></router-link>
+            </div>
+          </div>
+        </div>
+      </div>
+     
+    </div>
+  </template>
+
+  <script>
+  import { myCoupons}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 myCoupons(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/merchant-web-master/src/views/couponmanagement/couponlist.vue b/merchant-web-master/src/views/couponmanagement/couponlist.vue
new file mode 100644
index 0000000..982a500
--- /dev/null
+++ b/merchant-web-master/src/views/couponmanagement/couponlist.vue
@@ -0,0 +1,631 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:0 10px;">
+    <div class="couponPage" v-show="type == '1'">
+      <div>
+        <!-- 搜索 -->
+        <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="addcoupon">新增</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.couponName }}</template>
+              </el-table-column>
+              <el-table-column label="资金池">
+                <template slot-scope="scope">{{ scope.row.cereFundsPool?scope.row.cereFundsPool.poolName:'' }}</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="金额" >
+                <template slot-scope="scope">{{ scope.row.totalFunds }}</template>
+              </el-table-column>
+              <el-table-column label="数量" >
+                <template slot-scope="scope">{{ scope.row.totalCoupons }}</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>
+              </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>
+
+        <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" :rules="couponRules">
+            <el-form-item label="资金池名称:" prop="poolName">
+              <el-input v-model="form.poolName" placeholder="请输入资金池名称" />
+            </el-form-item>
+            <el-form-item label="总金额:" style="margin: 20px 0;" prop="totalAmount">
+              <el-input v-model.number="form.totalAmount" placeholder="请输入总金额" />
+            </el-form-item>
+            <el-form-item label="出资方:" prop="contributor">
+              <el-input maxlength="200" show-word-limit rows="4" type="textarea" v-model="form.contributor"
+                placeholder="请输入出资方" />
+            </el-form-item>
+          </el-form>
+          <div class="footer" style="margin-top: 25px;">
+            <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'">
+      <coupon :couponfrom="couponfrom" :coupoobj="coupoobj" @changevalue="changevalue"/>
+      <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>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    addcereFundsPool,
+    delPool,
+    editPool,
+    cereCouponMainTable,
+    totalCapitalBalance,
+    addcereCouponCategory
+  } from '@/api/couponmanagement/capitalpool.js'
+  import { getcereFundsPoolData}from '@/api/couponmanagement/couponlist.js'
+  import router from '@/router';
+  import coupon from './coupon.vue';
+  import TitleWithCircle from '@/components/top/index';
+  export default {
+
+    components: {
+      coupon,TitleWithCircle
+    },
+    data() {
+      return {
+        couponRules: {
+          poolName: [{
+              required: true,
+              message: '请输入资金池名称',
+              trigger: 'blur'
+            },
+            {
+              min: 0,
+              max: 20,
+              message: '长度不超过20个字符',
+              trigger: 'blur'
+            }
+          ],
+          totalAmount: [{
+            required: true,
+            message: '请输入总金额',
+            trigger: 'blur'
+          }, ],
+          contributor: [{
+            required: true,
+            message: '请输入出资方',
+            trigger: 'blur'
+          }, ],
+        },
+        useCategorylist:'',
+        usedMerchantslist:'',
+        couponfrom: {
+          usedMerchants: 2,
+          couponName: '',
+          remark: '',
+          couponType: '1', // 默认值
+          useCategory: 1,
+          maxDiscountAmount: null,
+          usageThreshold: null, //使用门槛不用
+          discountContent: null,
+          pointsRequired: 0,
+          startTime: '',
+          endTime: '',
+          totalCoupons: null,
+          totalFunds: null,
+        },
+        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: {
+          poolName: '',
+          contributor: '',
+          totalAmount: null,
+          fundsStatus: '0'
+        }
+      }
+    },
+    created() {
+      this.getAll()
+    },
+    methods: {
+      changevalue(e,list) {
+        console.error(e,list )
+        this[e] = list
+      },
+      xq(e) {
+        console.log(e )
+        // 跳转路由
+        router.push({
+          path: '/other/coupon',
+          query: {
+            id: e.poolId
+          }
+        })
+      },
+      savecoupon() {
+        let that = this
+        if(!this.couponfrom.couponName) {
+          return
+        }
+        if(!this.couponfrom.startTime) {
+          return
+        }
+        if(!this.couponfrom.totalCoupons) {
+          return
+        }
+        if(!this.couponfrom.maxDiscountAmount) {
+          return 
+        }
+        if(!this.couponfrom.discountContent) {
+          return 
+        }
+        if(this.couponfrom.couponType == '1') {
+          if(Number(this.couponfrom.discountContent) >= Number(this.couponfrom.maxDiscountAmount)) {
+            return 
+          }   
+        } 
+        let c1 = this.changecouponfrom()
+        console.error(c1)
+        console.error(this.useCategorylist)
+        console.error(this.usedMerchantslist)
+        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))
+        // return
+        cereCouponMainTable(from).then(res => {
+          console.error(res)
+          if (res.data) {
+            if(res.data.usedMerchants == '2') {
+              let info2 = {
+                couponId:res.data.id,
+                usedMerchants:2,
+                categoryIds:that.usedMerchantslist
+              }
+              addcereCouponCategory(info2).then(res2 => {
+                console.error(res2)
+              })
+            }
+            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
+        this.type = '2'
+  
+      },
+      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
+        that.$refs.form.validate((valid) => {
+          if (valid) {
+            form.totalAmount = Number(form.totalAmount)
+            if (that.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'
+                }
+              })
+            }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+
+
+      },
+      cancel() {
+        this.activityVisible = false
+        this.form = {
+          poolName: '',
+          contributor: '',
+          totalAmount: null,
+          fundsStatus: '0'
+        }
+      },
+      async getAll() {
+        const res = await getcereFundsPoolData(this.query)
+        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()
+      },
+      // 活动详情
+      details(row) {
+        this.form = row
+        this.activityDetailVisible = true
+      },
+      // 添加活动
+      addActivity() {
+        this.editForm = false
+        this.activityVisible = true
+      },
+      // 编辑
+      editActivity(row) {
+        this.editForm = true
+        this.form = row
+        this.activityVisible = true
+      },
+      async endActivity(row) {
+        const res = await endCoupon({
+          activityId: row.activityId
+        })
+        if (res.code === '') {
+          this.$message({
+            message: '结束成功',
+            type: 'success'
+          })
+        } else {
+          this.$message({
+            message: res.message,
+            type: 'error'
+          })
+        }
+        this.getAll()
+      },
+      async delActivity(row) {
+        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(error => {
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
+        });
+      },
+
+    }
+  }
+</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;
+  }
+
+  ::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>