From a0ad39cecca81903f4aef6ebec0b1c24ba7da35c Mon Sep 17 00:00:00 2001
From: Sigo <sigo2017web@163.com>
Date: Wed, 22 Jun 2022 14:10:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/asider.vue              |  30 +++++
 src/pages/discount-coupon/getPay/index.vue    |  12 --
 .../discount-coupon/issue/components/edit.vue |  22 ++--
 src/pages/discount-coupon/issue/index.vue     |   3 +
 .../management/components/add.vue             |  98 +++++++++++++++
 .../management/components/allGot.vue          |  93 ++++++++++++++
 .../management/components/verification.vue    |  73 +++++++++++
 .../discount-coupon/management/index.vue      | 115 +++++++++++++++++-
 .../management/styles/index.css               |   8 ++
 .../discount-coupon/record/components/got.vue |  93 ++++++++++++++
 src/pages/discount-coupon/record/index.vue    |  85 +++++++++++++
 src/pages/discount-coupon/useRecord/index.vue |  80 ++++++++++++
 src/router/index.js                           |  16 +++
 13 files changed, 706 insertions(+), 22 deletions(-)
 delete mode 100644 src/pages/discount-coupon/getPay/index.vue
 create mode 100644 src/pages/discount-coupon/management/components/add.vue
 create mode 100644 src/pages/discount-coupon/management/components/allGot.vue
 create mode 100644 src/pages/discount-coupon/management/components/verification.vue
 create mode 100644 src/pages/discount-coupon/management/styles/index.css
 create mode 100644 src/pages/discount-coupon/record/components/got.vue
 create mode 100644 src/pages/discount-coupon/record/index.vue
 create mode 100644 src/pages/discount-coupon/useRecord/index.vue

diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue
index f898f2a..fc5c5d7 100644
--- a/src/layout/components/asider.vue
+++ b/src/layout/components/asider.vue
@@ -616,6 +616,36 @@ export default {
             },
           ],
         },
+        // 优惠券
+        {
+          name: "优惠券",
+          index: "90",
+          icon: "el-icon-s-ticket",
+          number: "1000",
+          menuLists: [
+            {
+              name: "发布",
+              icon: "el-icon-s-promotion",
+              route: "/couponIssue",
+              index: "couponIssue",
+              number: "1000100",
+            },
+            {
+              name: "管理",
+              icon: "el-icon-s-operation",
+              route: "/couponMane",
+              index: "couponMane",
+              number: "1000200",
+            },
+            {
+              name: "领取消费",
+              icon: "el-icon-time",
+              route: "/couponRecord",
+              index: "couponRecord",
+              number: "1000300",
+            },
+          ],
+        },
       ],
     };
   },
diff --git a/src/pages/discount-coupon/getPay/index.vue b/src/pages/discount-coupon/getPay/index.vue
deleted file mode 100644
index 86579b8..0000000
--- a/src/pages/discount-coupon/getPay/index.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  领取消费
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-</style>
diff --git a/src/pages/discount-coupon/issue/components/edit.vue b/src/pages/discount-coupon/issue/components/edit.vue
index f53c10e..6822937 100644
--- a/src/pages/discount-coupon/issue/components/edit.vue
+++ b/src/pages/discount-coupon/issue/components/edit.vue
@@ -10,16 +10,16 @@
           <el-form-item label="优惠券数量" prop="couponNumber">
             <el-input v-model.trim="form.couponNumber" placeholder="优惠券数量"></el-input>
           </el-form-item>
-          <el-form-item label="优惠限制" prop="serviceConditions">
-            <el-radio v-model="form.serviceConditions" :label="0">满减</el-radio>
-            <el-radio v-model="form.serviceConditions" :label="1">没有限制</el-radio>
-          </el-form-item>
           <el-form-item label="优惠方式" prop="couponType">
             <el-radio v-model="form.couponType" :label="0">代金券</el-radio>
             <el-radio v-model="form.couponType" :label="1">折扣券</el-radio>
             <el-radio v-model="form.couponType" :label="2">代扣券</el-radio>
           </el-form-item>
-          <el-form-item label="满减金额" prop="fullReductionMoney">
+          <el-form-item label="优惠限制" prop="serviceConditions">
+            <el-radio v-model="form.serviceConditions" :label="0">满减</el-radio>
+            <el-radio v-model="form.serviceConditions" :label="1">没有限制</el-radio>
+          </el-form-item>
+          <el-form-item prop="fullReductionMoney" v-show="form.serviceConditions===0" :prop="form.serviceConditions===0?'fullReductionMoney':''">
             <amount-input ref="fullReductionMoney" @amount="handleAmount" name="fullReductionMoney" placeholder="满减金额（满多少可以减）"></amount-input>
           </el-form-item>
           <el-form-item label="适用门店" prop="suitableStore">
@@ -34,10 +34,18 @@
           </el-form-item>
           <el-form-item v-show="form.indateType===0" :prop="form.indateType===0?'startDay':''">
             <el-input v-model.trim="form.startDay" placeholder="领取后多少天生效"></el-input>
+            <el-input v-model.trim="form.endDay" placeholder="生效后多少天内有效"></el-input>
           </el-form-item>
-          <el-form-item v-show="form.indateType===1" :prop="form.indateType===1?'endDay':''">
-            <el-input v-model.trim="form.endDay" placeholder="多少天内有效生效"></el-input>
+          <!-- <el-form-item v-show="form.indateType===0" :prop="form.indateType===0?'endDay':''">
+            <el-input v-model.trim="form.endDay" placeholder="生效后多少天内有效"></el-input>
+          </el-form-item> -->
+          <el-form-item v-show="form.indateType===1" :prop="form.indateType===1?'startDate':''">
+            <el-date-picker v-model="form.fixDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="截止日期" value-format="yyyy-MM-dd">
+            </el-date-picker>
           </el-form-item>
+          <!-- <el-form-item v-show="form.indateType===1" :prop="form.indateType===1?'endDay':''">
+            <el-date-picker v-model="form.endDay" type="date" placeholder="截止日期" value-format="yyyy-MM-dd"></el-date-picker>
+          </el-form-item> -->
           <el-form-item label="分享提成规则" prop="shareCommissionRules">
             <el-radio v-model="form.shareCommissionRules" :label="0">固定提成</el-radio>
             <el-radio v-model="form.shareCommissionRules" :label="1">单据金额抽成(%)</el-radio>
diff --git a/src/pages/discount-coupon/issue/index.vue b/src/pages/discount-coupon/issue/index.vue
index a66addf..83a2b05 100644
--- a/src/pages/discount-coupon/issue/index.vue
+++ b/src/pages/discount-coupon/issue/index.vue
@@ -102,6 +102,9 @@ export default {
 </script>
 
 <style scoped>
+.container /deep/ .el-step__icon {
+  background-color: #f1f1f1;
+}
 .marginTop {
   margin-top: 30px;
 }
diff --git a/src/pages/discount-coupon/management/components/add.vue b/src/pages/discount-coupon/management/components/add.vue
new file mode 100644
index 0000000..74b4166
--- /dev/null
+++ b/src/pages/discount-coupon/management/components/add.vue
@@ -0,0 +1,98 @@
+<template>
+  <el-dialog title="增加优惠券" :visible.sync="dialogFormVisible" ref="dialog" width="450px" @close="close">
+    <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+      <el-form-item label="增量" prop="num">
+        <el-input v-model.trim="form.num" clearable autocomplete="off" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">核 销</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'add',
+  data() {
+    return {
+      form: {
+        code: undefined,
+      },
+      rules: {
+        code: [{ required: true, trigger: 'blur', message: '请输入优惠券编码' }],
+      },
+      dialogFormVisible: false,
+    }
+  },
+  created() { },
+  methods: {
+    // 打开弹窗
+    open() {
+      this.form = Object.assign({}, {})
+      this.dialogFormVisible = true
+    },
+    // 关闭弹窗
+    close() {
+      this.$refs['form'].resetFields()
+      this.form = this.$options.data().form
+      this.dialogFormVisible = false
+    },
+    // 确认核销
+    save() {
+      this.$refs['form'].validate(async (valid) => {
+        if (valid) {
+          if (this.form.hotelAssetId) {
+            const form = Object.assign({}, this.form)
+            form.depreciationRate = parseFloat(form.depreciationRate)
+            form.netSalvage = parseFloat(form.netSalvage)
+            doEdit(form).then((res) => this.callbackFun(res))
+          } else {
+            const form = Object.assign({}, this.form)
+            form.depreciationRate = parseFloat(form.depreciationRate)
+            form.netSalvage = parseFloat(form.netSalvage)
+            doAdd(form).then((res) => this.callbackFun(res))
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    callbackFun(res) {
+      if (res.success) {
+        this.$baseMessage(res.msg, 'success')
+        this.$emit('fetch-data')
+        this.close()
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.el-form {
+  padding: 0px 20px !important;
+}
+.el-form .item {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.el-form .item .el-form-item {
+  width: 49%;
+}
+.el-form .item .el-form-item:first-child {
+  margin-right: 1%;
+}
+.el-form .el-select {
+  width: 100%;
+}
+.remind {
+  display: flex;
+}
+.remind .msg {
+  width: 60px;
+  text-align: right;
+}
+</style>
diff --git a/src/pages/discount-coupon/management/components/allGot.vue b/src/pages/discount-coupon/management/components/allGot.vue
new file mode 100644
index 0000000..262206d
--- /dev/null
+++ b/src/pages/discount-coupon/management/components/allGot.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="container">
+    <!-- <vab-query-form>
+      <vab-query-form-left-panel :span="10">
+        <el-button icon="el-icon-back" type="warning" @click="handleGoBack">返回</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="14">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="优惠券编码" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="微信昵称" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="手机号码" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form> -->
+    <el-table class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="508px" :element-loading-text="elementLoadingText">
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券编码"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="头像"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="微信昵称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="手机号码"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="分享人"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="deductionAmount" label="是否已核销"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="shareAmount" label="领取时间"></el-table-column>
+      <!-- <el-table-column show-overflow-tooltip align="center" min-width="130" prop="phone" label="手机号码"></el-table-column> -->
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="imgUrl" label="核销时间"></el-table-column>
+      <el-table-column align="center" min-width="80" label="操作">
+        <template #default="{ row, $index }">
+          <el-button type="warning" size="mini">核销</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      list: [
+        {
+          name: 123,
+        },
+      ],
+      listLoading: false,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        pageNu: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      layout: 'total, sizes, prev, pager, next, jumper',
+    }
+  },
+  created() {
+    console.log(this.$route.params)
+  },
+  methods: {
+    // 分页-一页多少条
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      // this.fetchData()
+    },
+    // 分页-第几页
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val
+      // this.fetchData()
+    },
+    // 查询
+    queryData() {
+      this.queryForm.pageNum = 1
+      this.fetchData()
+    },
+    // 查询当前优惠券的所有领取人
+    fetchData() { },
+    // 返回
+    handleGoBack() {
+      this.$router.push('/active/management')
+      this.$store.dispatch('tabsBar/delRoute', { path: '/active/allGot' })
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/pages/discount-coupon/management/components/verification.vue b/src/pages/discount-coupon/management/components/verification.vue
new file mode 100644
index 0000000..fbc6f70
--- /dev/null
+++ b/src/pages/discount-coupon/management/components/verification.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-dialog title="核销优惠券" :visible.sync="dialogFormVisible" ref="dialog" width="450px" @close="close">
+    <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+      <el-form-item label="优惠券编码" prop="code">
+        <el-input v-model.trim="form.code" clearable autocomplete="off" onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">核 销</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'Verification',
+  data() {
+    return {
+      form: {
+        code: undefined,
+      },
+      rules: {
+        code: [{ required: true, trigger: 'blur', message: '请输入优惠券编码' }],
+      },
+      dialogFormVisible: false,
+    }
+  },
+  created() { },
+  methods: {
+    // 打开弹窗
+    open() {
+      this.form = Object.assign({}, {})
+      this.dialogFormVisible = true
+    },
+    // 关闭弹窗
+    close() {
+      this.$refs['form'].resetFields()
+      this.form = this.$options.data().form
+      this.dialogFormVisible = false
+    },
+    // 确认核销
+    save() {
+      this.$refs['form'].validate(async (valid) => {
+        if (valid) {
+          if (this.form.hotelAssetId) {
+            const form = Object.assign({}, this.form)
+            form.depreciationRate = parseFloat(form.depreciationRate)
+            form.netSalvage = parseFloat(form.netSalvage)
+            doEdit(form).then((res) => this.callbackFun(res))
+          } else {
+            const form = Object.assign({}, this.form)
+            form.depreciationRate = parseFloat(form.depreciationRate)
+            form.netSalvage = parseFloat(form.netSalvage)
+            doAdd(form).then((res) => this.callbackFun(res))
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    callbackFun(res) {
+      if (res.success) {
+        this.$baseMessage(res.msg, 'success')
+        this.$emit('fetch-data')
+        this.close()
+      }
+    },
+  },
+}
+</script>
+<style scoped>
+</style>
diff --git a/src/pages/discount-coupon/management/index.vue b/src/pages/discount-coupon/management/index.vue
index eaff4a0..fc12c60 100644
--- a/src/pages/discount-coupon/management/index.vue
+++ b/src/pages/discount-coupon/management/index.vue
@@ -1,12 +1,121 @@
 <template>
-  管理
+  <div class="container">
+    <!-- <vab-query-form>
+      <vab-query-form-left-panel :span="12">
+        <el-button icon="el-icon-s-promotion" type="primary" @click="handleIssue">发布</el-button>
+        <el-button icon="el-icon-full-screen" type="warning" @click="handleVerification">核销</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="12">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="优惠券名称" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form> -->
+    <div class="query-form">
+      <div class="query-form-left-panel">
+        <el-button icon="el-icon-s-promotion" type="primary" size="mini" @click="handleIssue">发布</el-button>
+        <el-button icon="el-icon-full-screen" type="warning" size="mini" @click="handleVerification">核销</el-button>
+      </div>
+      <div class="query-form-right-panel">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="优惠券名称" clearable size="small" style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" size="mini" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <el-table style="width: 100%;margin-top:5px" max-height="650" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="handleGoter">
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券名称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券类型"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="发行数量"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="deductionAmount" label="优惠"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="shareAmount" label="分润"></el-table-column>
+      <!-- <el-table-column show-overflow-tooltip align="center" min-width="130" prop="phone" label="手机号码"></el-table-column> -->
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="imgUrl" label="图片"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="desc1" label="已领取数量"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="desc1" label="已使用数量"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="desc1" label="使用日期" sortable></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="desc1" label="优惠券状态">
+        <template #default="{ row, $index }">
+          <el-tag type="success" v-if="row.status == 1">完美</el-tag>
+          <el-tag type="primary" v-if="row.status == 2">未过期</el-tag>
+          <el-tag type="warning" v-if="row.status == 3">已过期</el-tag>
+          <el-tag type="danger" v-if="row.status == 4">已作废</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="250" label="操作">
+        <template #default="{ row, $index }">
+          <el-button type="primary" size="mini" :disabled="row.status != 2">增量</el-button>
+          <el-button type="warning" size="mini" :disabled="row.status != 2">作废</el-button>
+          <el-button type="danger" size="mini" :disabled="row.status != 2">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
+    <verification ref="verification" @fetch-data="fetchData"></verification>
+  </div>
 </template>
 
 <script>
+import Verification from './components/verification'
 export default {
-
+  name: 'active',
+  components: { Verification },
+  data() {
+    return {
+      list: [{ status: 1 }, { status: 3 }, { status: 2 }, { status: 4 }],
+      listLoading: false,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        pageNu: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      layout: 'total, sizes, prev, pager, next, jumper',
+    }
+  },
+  methods: {
+    // 分页-一页多少条
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      this.fetchData()
+    },
+    // 分页-第几页
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val
+      this.fetchData()
+    },
+    // 查询
+    queryData() {
+      this.queryForm.pageNum = 1
+      this.fetchData()
+    },
+    // 获取优惠券活动数据
+    fetchData() { },
+    // 查询所有领取人
+    handleGoter(row) {
+      this.$router.push({ name: 'AllGot', params: row })
+    },
+    // 发布
+    handleIssue() {
+      this.$router.push('/active/issue')
+    },
+    // 核销
+    handleVerification() {
+      this.$refs.verification.open()
+    },
+  },
 }
 </script>
 
-<style>
+<style scoped>
+@import "./styles/index.css";
 </style>
diff --git a/src/pages/discount-coupon/management/styles/index.css b/src/pages/discount-coupon/management/styles/index.css
new file mode 100644
index 0000000..f02167e
--- /dev/null
+++ b/src/pages/discount-coupon/management/styles/index.css
@@ -0,0 +1,8 @@
+.query-form{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.query-form .el-form-item{
+  margin-bottom: 0px;
+}
diff --git a/src/pages/discount-coupon/record/components/got.vue b/src/pages/discount-coupon/record/components/got.vue
new file mode 100644
index 0000000..e2a3bf1
--- /dev/null
+++ b/src/pages/discount-coupon/record/components/got.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="container">
+    <!-- <vab-query-form>
+      <vab-query-form-left-panel :span="10">
+        <el-button icon="el-icon-back" type="warning" @click="handleGoBack">返回</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="14">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="优惠券编码" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="微信昵称" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="手机号码" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form> -->
+    <el-table class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="508px" :element-loading-text="elementLoadingText">
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券编码"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="头像"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="微信昵称"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="手机号码"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="分享人"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="deductionAmount" label="是否已核销"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="shareAmount" label="领取时间"></el-table-column>
+      <!-- <el-table-column show-overflow-tooltip align="center" min-width="130" prop="phone" label="手机号码"></el-table-column> -->
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="imgUrl" label="核销时间"></el-table-column>
+      <el-table-column align="center" min-width="80" label="操作">
+        <template #default="{ row, $index }">
+          <el-button type="warning" size="mini">核销</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      list: [
+        {
+          name: 123,
+        },
+      ],
+      listLoading: false,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        pageNu: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      layout: 'total, sizes, prev, pager, next, jumper',
+    }
+  },
+  created() {
+    console.log(this.$route.params)
+  },
+  methods: {
+    // 分页-一页多少条
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      // this.fetchData()
+    },
+    // 分页-第几页
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val
+      // this.fetchData()
+    },
+    // 查询
+    queryData() {
+      this.queryForm.pageNum = 1
+      this.fetchData()
+    },
+    // 查询当前优惠券的所有领取人
+    fetchData() { },
+    // 返回
+    handleGoBack() {
+      this.$router.push('/active/record')
+      this.$store.dispatch('tabsBar/delRoute', { path: '/active/got' })
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/pages/discount-coupon/record/index.vue b/src/pages/discount-coupon/record/index.vue
new file mode 100644
index 0000000..7ab785b
--- /dev/null
+++ b/src/pages/discount-coupon/record/index.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="container">
+    <!-- <vab-query-form>
+      <vab-query-form-right-panel :span="24">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-select v-model.trim="queryForm.status" placeholder="状态" clearable>
+              <el-option label="已领取" value="1"></el-option>
+              <el-option label="已核销" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-select v-model.trim="queryForm.name" placeholder="优惠券名称" clearable>
+              <el-option label="优惠券一" value="1"></el-option>
+              <el-option label="优惠券二" value="2"></el-option>
+              <el-option label="优惠券三" value="3"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form> -->
+    <el-table class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" max-height="508px" :element-loading-text="elementLoadingText" @row-dblclick="handleGot">
+      <template slot="empty"></template>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="share" label="分享人"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="got" label="领取人"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="100" prop="status" label="状态">
+        <template #default="{ row, $index }">
+          <el-tag type="primary" v-if="row.status == 1">未核销</el-tag>
+          <el-tag type="danger" v-if="row.status == 2">已核销</el-tag>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination background :current-page="queryForm.pageNum" :page-size="queryForm.pageSize" :layout="layout" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      list: [
+        { share: '张三', got: '李四', status: '1' },
+        { share: '王五', got: '赵六', status: '2' },
+      ],
+      listLoading: false,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        pageNu: 1,
+        pageSize: 10,
+      },
+      total: 2,
+      layout: 'total, sizes, prev, pager, next, jumper',
+    }
+  },
+  methods: {
+    // 分页-一页多少条
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val
+      // this.fetchData()
+    },
+    // 分页-第几页
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val
+      // this.fetchData()
+    },
+    // 查询
+    queryData() {
+      this.queryForm.pageNum = 1
+      this.fetchData()
+    },
+    // 查询领取消费记录
+    fetchData() { },
+    // 分享人下的领取人
+    handleGot() {
+      console.log(123)
+      this.$router.push('/active/got')
+    },
+  },
+}
+</script>
+
+<style></style>
diff --git a/src/pages/discount-coupon/useRecord/index.vue b/src/pages/discount-coupon/useRecord/index.vue
new file mode 100644
index 0000000..e005795
--- /dev/null
+++ b/src/pages/discount-coupon/useRecord/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="container">
+    <vab-query-form>
+      <vab-query-form-right-panel :span="24">
+        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="状态" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input v-model="queryForm.name" placeholder="活动名称" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form>
+    <el-table
+      class="custom-table"
+      highlight-current-row
+      border
+      v-loading="listLoading"
+      :data="list"
+      max-height="508px"
+      :element-loading-text="elementLoadingText"
+    >
+      <template slot="empty"></template>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="parentLevel" label="父级"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="sublevel" label="子级"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="status" label="状态"></el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      :current-page="queryForm.pageNum"
+      :page-size="queryForm.pageSize"
+      :layout="layout"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    ></el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        list: [],
+        listLoading: false,
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNu: 1,
+          pageSize: 10,
+        },
+        total: 0,
+        layout: 'total, sizes, prev, pager, next, jumper',
+      }
+    },
+    methods: {
+      // 分页-一页多少条
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        // this.fetchData()
+      },
+      // 分页-第几页
+      handleCurrentChange(val) {
+        this.queryForm.pageNum = val
+        // this.fetchData()
+      },
+      // 查询
+      queryData() {
+        this.queryForm.pageNum = 1
+        this.fetchData()
+      },
+      fetchData() {},
+    },
+  }
+</script>
+
+<style></style>
diff --git a/src/router/index.js b/src/router/index.js
index f36631d..7896caf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -790,6 +790,22 @@ const router = new VueRouter({
             index: "couponIssue"
           }
         },
+        {
+          path: "/couponMane",
+          component: () => import("../pages/discount-coupon/management/index.vue"),
+          meta: {
+            title: "管理",
+            index: "couponMane"
+          }
+        },
+        {
+          path: "/couponRecord",
+          component: () => import("../pages/discount-coupon/record/index.vue"),
+          meta: {
+            title: "领取消费",
+            index: "couponRecord"
+          }
+        },
       ]
     }
   ]

From 228a298c6f45105789e96527274ae16aee4c9ae2 Mon Sep 17 00:00:00 2001
From: Sigo <sigo2017web@163.com>
Date: Wed, 22 Jun 2022 14:49:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/discount-coupon/management.js         | 12 +++++++
 src/layout/components/asider.vue              | 10 +++---
 .../discount-coupon/management/index.vue      | 34 ++++++++-----------
 3 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 src/api/discount-coupon/management.js

diff --git a/src/api/discount-coupon/management.js b/src/api/discount-coupon/management.js
new file mode 100644
index 0000000..065724c
--- /dev/null
+++ b/src/api/discount-coupon/management.js
@@ -0,0 +1,12 @@
+import {
+  service
+} from "../../utils/service";
+
+// 主页查询
+export function getList(params) {
+  return service({
+    url: "/platformCoupon",
+    method: "get",
+    params
+  });
+}
diff --git a/src/layout/components/asider.vue b/src/layout/components/asider.vue
index fc5c5d7..ad59bfe 100644
--- a/src/layout/components/asider.vue
+++ b/src/layout/components/asider.vue
@@ -619,30 +619,30 @@ export default {
         // 优惠券
         {
           name: "优惠券",
-          index: "90",
+          index: "100",
           icon: "el-icon-s-ticket",
-          number: "1000",
+          number: "400",
           menuLists: [
             {
               name: "发布",
               icon: "el-icon-s-promotion",
               route: "/couponIssue",
               index: "couponIssue",
-              number: "1000100",
+              number: "400100",
             },
             {
               name: "管理",
               icon: "el-icon-s-operation",
               route: "/couponMane",
               index: "couponMane",
-              number: "1000200",
+              number: "400100",
             },
             {
               name: "领取消费",
               icon: "el-icon-time",
               route: "/couponRecord",
               index: "couponRecord",
-              number: "1000300",
+              number: "400100",
             },
           ],
         },
diff --git a/src/pages/discount-coupon/management/index.vue b/src/pages/discount-coupon/management/index.vue
index fc12c60..a873415 100644
--- a/src/pages/discount-coupon/management/index.vue
+++ b/src/pages/discount-coupon/management/index.vue
@@ -1,21 +1,5 @@
 <template>
   <div class="container">
-    <!-- <vab-query-form>
-      <vab-query-form-left-panel :span="12">
-        <el-button icon="el-icon-s-promotion" type="primary" @click="handleIssue">发布</el-button>
-        <el-button icon="el-icon-full-screen" type="warning" @click="handleVerification">核销</el-button>
-      </vab-query-form-left-panel>
-      <vab-query-form-right-panel :span="12">
-        <el-form :inline="true" class="docTime" :model="queryForm" @submit.native.prevent>
-          <el-form-item>
-            <el-input v-model="queryForm.name" placeholder="优惠券名称" clearable style="width: 150px"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </vab-query-form-right-panel>
-    </vab-query-form> -->
     <div class="query-form">
       <div class="query-form-left-panel">
         <el-button icon="el-icon-s-promotion" type="primary" size="mini" @click="handleIssue">发布</el-button>
@@ -35,7 +19,7 @@
     <el-table style="width: 100%;margin-top:5px" max-height="650" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)' ,color:'#eeeeee'}" ref="list" class="custom-table" highlight-current-row border v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @row-dblclick="handleGoter">
       <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券名称"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="130" prop="name" label="优惠券类型"></el-table-column>
-      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNum" label="发行数量"></el-table-column>
+      <el-table-column show-overflow-tooltip align="center" min-width="130" prop="couponNumber" label="优惠券数量"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="130" prop="deductionAmount" label="优惠"></el-table-column>
       <el-table-column show-overflow-tooltip align="center" min-width="130" prop="shareAmount" label="分润"></el-table-column>
       <!-- <el-table-column show-overflow-tooltip align="center" min-width="130" prop="phone" label="手机号码"></el-table-column> -->
@@ -65,7 +49,8 @@
 </template>
 
 <script>
-import Verification from './components/verification'
+import Verification from './components/verification';
+import { getList } from "@/api/discount-coupon/management.js";
 export default {
   name: 'active',
   components: { Verification },
@@ -82,6 +67,9 @@ export default {
       layout: 'total, sizes, prev, pager, next, jumper',
     }
   },
+  created() {
+    this.fetchData()
+  },
   methods: {
     // 分页-一页多少条
     handleSizeChange(val) {
@@ -99,7 +87,15 @@ export default {
       this.fetchData()
     },
     // 获取优惠券活动数据
-    fetchData() { },
+    async fetchData() {
+      this.listLoading = true
+      let { list, pageNum, pageSize } = await getList(this.queryForm)
+      this.listLoading = false
+      this.list = Array.from(list);
+      this.queryForm.pageNum = pageNum
+      this.queryForm.pageSize = pageSize
+      // console.log('res', res);
+    },
     // 查询所有领取人
     handleGoter(row) {
       this.$router.push({ name: 'AllGot', params: row })

From abb95b0fc95eaab3cbe45aed3869a168e3042529 Mon Sep 17 00:00:00 2001
From: Sigo <sigo2017web@163.com>
Date: Wed, 22 Jun 2022 17:25:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/discount-coupon/issue.js              | 12 +++++
 .../issue/components/activeImg.vue            | 49 +++++++++++++++++++
 .../discount-coupon/issue/components/edit.vue | 19 +++++--
 .../discount-coupon/management/index.vue      | 40 ++++++++-------
 4 files changed, 98 insertions(+), 22 deletions(-)
 create mode 100644 src/api/discount-coupon/issue.js
 create mode 100644 src/pages/discount-coupon/issue/components/activeImg.vue

diff --git a/src/api/discount-coupon/issue.js b/src/api/discount-coupon/issue.js
new file mode 100644
index 0000000..8fea337
--- /dev/null
+++ b/src/api/discount-coupon/issue.js
@@ -0,0 +1,12 @@
+import {
+  service
+} from "../../utils/service";
+
+// 主页查询
+export function doAdd(data) {
+  return service({
+    url: "/platformCoupon/add",
+    method: "post",
+    data
+  });
+}
diff --git a/src/pages/discount-coupon/issue/components/activeImg.vue b/src/pages/discount-coupon/issue/components/activeImg.vue
new file mode 100644
index 0000000..7615e0f
--- /dev/null
+++ b/src/pages/discount-coupon/issue/components/activeImg.vue
@@ -0,0 +1,49 @@
+<template>
+  <el-upload class="avatar-uploader" :limit="10" ref="upload" action="#" :show-file-list="false" :auto-upload="false" :on-change="handleChange">
+    <img v-if="imageUrl" :src="imageUrl" class="avatar">
+    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+  </el-upload>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      imageUrl: ''
+    };
+  },
+  methods: {
+    handleChange(file, fileList) {
+      this.imageUrl = URL.createObjectURL(file.raw);
+      this.$emit('active-img', file.raw);
+      // console.log('file', file);
+      console.log('fileList', fileList);
+    },
+  }
+}
+</script>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  background-color: #fff;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 150px;
+  height: 150px;
+  line-height: 150px;
+  text-align: center;
+}
+.avatar {
+  width: 150px;
+  height: 150px;
+  display: block;
+}
+</style>
diff --git a/src/pages/discount-coupon/issue/components/edit.vue b/src/pages/discount-coupon/issue/components/edit.vue
index 6822937..568e47d 100644
--- a/src/pages/discount-coupon/issue/components/edit.vue
+++ b/src/pages/discount-coupon/issue/components/edit.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="form.couponName" placeholder="优惠券名称"></el-input>
           </el-form-item>
           <el-form-item label="优惠券数量" prop="couponNumber">
-            <el-input v-model.trim="form.couponNumber" placeholder="优惠券数量"></el-input>
+            <el-input-number v-model="form.couponNumber" :min="1" :precision="0" label="优惠券数量" style="width:100%"></el-input-number>
           </el-form-item>
           <el-form-item label="优惠方式" prop="couponType">
             <el-radio v-model="form.couponType" :label="0">代金券</el-radio>
@@ -56,6 +56,9 @@
           <el-form-item v-show="form.shareCommissionRules===1" :prop="form.shareCommissionRules===1?'orderCommission':''">
             <amount-input ref="orderCommission" @amount="handleAmount" name="orderCommission" placeholder="单据金额抽成(%)"></amount-input>
           </el-form-item>
+          <el-form-item label="推广图片">
+            <active-img @active-img="handleImage"></active-img>
+          </el-form-item>
         </el-form>
       </el-col>
     </el-row>
@@ -73,13 +76,14 @@
 
 <script>
 import AmountInput from '@/components/AmountInput/index'
+import ActiveImg from './activeImg.vue'
 export default {
   name: 'Form',
-  components: { AmountInput },
+  components: { AmountInput, ActiveImg },
   data() {
     return {
       form: {
-        couponNum: 1,
+        couponNumber: 1,
       },
       rules: {
         couponName: [
@@ -144,7 +148,6 @@ export default {
   methods: {
     // 下一步
     handleNext() {
-      console.log(123);
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.$emit('next', 2)
@@ -153,6 +156,7 @@ export default {
         }
       })
     },
+    // 重置
     resetForm() {
       this.$refs.fullReductionMoney.reset()
       this.$refs.fixedAmount.reset()
@@ -160,6 +164,13 @@ export default {
       this.$refs.form.resetFields()
       this.$baseMessage('重置成功', 'success')
     },
+    // 选择图片后返回
+    handleImage(file) {
+      let form = Object.assign({}, this.form);
+      form.file = file
+      this.form = Object.assign({}, form);
+    },
+    // 金额自定义组件返回值
     handleAmount(name, amount) {
       let form = Object.assign({}, this.form)
       form[name] = amount
diff --git a/src/pages/discount-coupon/management/index.vue b/src/pages/discount-coupon/management/index.vue
index a873415..22c8813 100644
--- a/src/pages/discount-coupon/management/index.vue
+++ b/src/pages/discount-coupon/management/index.vue
@@ -52,13 +52,15 @@
 import Verification from './components/verification';
 import { getList } from "@/api/discount-coupon/management.js";
 export default {
-  name: 'active',
+  name: 'management',
   components: { Verification },
   data() {
     return {
-      list: [{ status: 1 }, { status: 3 }, { status: 2 }, { status: 4 }],
+      // 列表
+      list: [],
       listLoading: false,
       elementLoadingText: '正在加载...',
+      // 分页
       queryForm: {
         pageNu: 1,
         pageSize: 10,
@@ -71,6 +73,22 @@ export default {
     this.fetchData()
   },
   methods: {
+    // ========================== 查询 ========================== //
+    queryData() {
+      this.queryForm.pageNum = 1
+      this.fetchData()
+    },
+    // 获取优惠券活动数据
+    async fetchData() {
+      this.listLoading = true
+      let { code, pageInfo } = await getList(this.queryForm)
+      this.listLoading = false
+      if (code == "000000") {
+        this.list = Array.from(pageInfo.list);
+        this.queryForm.pageNum = pageInfo.pageNum
+        this.queryForm.pageSize = pageInfo.pageSize
+      }
+    },
     // 分页-一页多少条
     handleSizeChange(val) {
       this.queryForm.pageSize = val
@@ -81,28 +99,14 @@ export default {
       this.queryForm.pageNum = val
       this.fetchData()
     },
-    // 查询
-    queryData() {
-      this.queryForm.pageNum = 1
-      this.fetchData()
-    },
-    // 获取优惠券活动数据
-    async fetchData() {
-      this.listLoading = true
-      let { list, pageNum, pageSize } = await getList(this.queryForm)
-      this.listLoading = false
-      this.list = Array.from(list);
-      this.queryForm.pageNum = pageNum
-      this.queryForm.pageSize = pageSize
-      // console.log('res', res);
-    },
+    // ========================== 其它 ========================== //
     // 查询所有领取人
     handleGoter(row) {
       this.$router.push({ name: 'AllGot', params: row })
     },
     // 发布
     handleIssue() {
-      this.$router.push('/active/issue')
+      this.$router.push('/couponIssue')
     },
     // 核销
     handleVerification() {

From 000cf9254d57d0daa2347d1a3acde9ea18b3c37d Mon Sep 17 00:00:00 2001
From: Sigo <sigo2017web@163.com>
Date: Thu, 23 Jun 2022 09:42:58 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |   43 +-
 .../discount-coupon/issue/components/edit.vue |   32 +-
 .../issue/components/template.vue             |    6 +
 src/pages/discount-coupon/issue/index.vue     |    4 +-
 src/utils/index.js                            | 1076 +++++++++--------
 5 files changed, 597 insertions(+), 564 deletions(-)

diff --git a/src/main.js b/src/main.js
index a23bcd8..7ae3dd0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,9 @@ import "babel-polyfill";
 import "es6-promise/auto";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
-import { Message } from "element-ui";
+import {
+  Message
+} from "element-ui";
 Vue.use(ElementUI);
 import App from "./App.vue";
 import store from "./store";
@@ -22,18 +24,26 @@ import "./utils/dialog";
 import "./plugins";
 // import "./utils/directive/focus";
 import echarts from "echarts";
-import { getCookie } from "./utils/utils.js";
+import {
+  getCookie
+} from "./utils/utils.js";
 import apiConfig from "../config/api.config.js";
 import vueEsign from "vue-esign";
 import animated from "animate.css"; // npm install animate.css --save安装，在引入
 import formatTime from "./utils/filters.js";
 import arrDiff from "./utils/array.js";
-import { Loading } from "element-ui";
+import {
+  Loading
+} from "element-ui";
 import countdown from "./utils/countdown.js";
 import "./utils/rem.js";
 Vue.use(animated);
 Vue.use(vueEsign);
 
+import {
+  thousands
+} from '@/utils/index.js'
+
 import Vue from "vue";
 import Router from "vue-router";
 import router from "./router";
@@ -44,10 +54,13 @@ Vue.use(VueAxios, axios);
 axios.defaults.baseURL = apiConfig.baseUrl;
 Vue.use(Print); //注册
 
-import { message } from "./utils/resetMessage.js"; //现在提示弹窗每次只弹一条
+import {
+  message
+} from "./utils/resetMessage.js"; //现在提示弹窗每次只弹一条
 // import VueParticles from 'vue-particles'
 // Vue.use(VueParticles)
 
+Vue.prototype.$thousands = thousands
 Vue.prototype.$message = message;
 Vue.prototype.$countdown = countdown;
 Vue.prototype.bus = new Vue();
@@ -66,7 +79,7 @@ export function getNextDate(date, day) {
 }
 axios.defaults.withCredentials = true; //让ajax携带cookie
 // 全局过滤器--时间戳格式化时间//.padStart(2 , "0")   不足两位的，用0填充
-Vue.filter("dateFormat", function(originVal) {
+Vue.filter("dateFormat", function (originVal) {
   const dt = new Date(originVal);
   const y = dt.getFullYear();
   const m = (dt.getMonth() + 1 + "").padStart(2, "0");
@@ -76,7 +89,7 @@ Vue.filter("dateFormat", function(originVal) {
   const ss = (dt.getSeconds() + "").padStart(2, "0");
   return `${y}-${m}-${d} ${hh}:${mm}:${ss}`;
 });
-Vue.filter("dateMonth", function(originVal) {
+Vue.filter("dateMonth", function (originVal) {
   const dt = new Date(originVal);
   const y = dt.getFullYear();
   const m = (dt.getMonth() + 1 + "").padStart(2, "0");
@@ -86,10 +99,10 @@ Vue.filter("dateMonth", function(originVal) {
   const ss = (dt.getSeconds() + "").padStart(2, "0");
   return `${y}-${m}-${d}`;
 });
-Vue.filter("phone", function(phone) {
+Vue.filter("phone", function (phone) {
   return phone.substring(0, 3) + "****" + phone.substring(phone.length - 4);
 });
-Vue.filter("identityNum", function(identityNum) {
+Vue.filter("identityNum", function (identityNum) {
   return (
     identityNum.substring(0, 4) +
     "**************" +
@@ -97,11 +110,11 @@ Vue.filter("identityNum", function(identityNum) {
   );
 });
 
-Vue.filter("money", function(money) {
+Vue.filter("money", function (money) {
   return (money * 1).toFixed(2);
 });
 
-Vue.prototype.openLoading = function() {
+Vue.prototype.openLoading = function () {
   const loading = this.$loading({
     // 声明一个loading对象
     lock: true, // 是否锁屏
@@ -112,7 +125,7 @@ Vue.prototype.openLoading = function() {
     body: true,
     customClass: "mask" // 遮罩层新增类名
   });
-  setTimeout(function() {
+  setTimeout(function () {
     // 设定定时器，超时5S后自动关闭遮罩层，避免请求失败时，遮罩层一直存在的问题
     loading.close(); // 关闭遮罩层
   }, 5000);
@@ -151,7 +164,9 @@ router.beforeEach((to, from, next) => {
       message: "请先登录",
       duration: 2000
     });
-    next({ path: "/login" });
+    next({
+      path: "/login"
+    });
   }
 });
 Vue.directive("role", {
@@ -178,7 +193,9 @@ new Vue({
   el: "#app",
   router,
   store,
-  components: { App },
+  components: {
+    App
+  },
   template: "<App/>"
 });
 
diff --git a/src/pages/discount-coupon/issue/components/edit.vue b/src/pages/discount-coupon/issue/components/edit.vue
index 568e47d..bebf3fc 100644
--- a/src/pages/discount-coupon/issue/components/edit.vue
+++ b/src/pages/discount-coupon/issue/components/edit.vue
@@ -56,7 +56,7 @@
           <el-form-item v-show="form.shareCommissionRules===1" :prop="form.shareCommissionRules===1?'orderCommission':''">
             <amount-input ref="orderCommission" @amount="handleAmount" name="orderCommission" placeholder="单据金额抽成(%)"></amount-input>
           </el-form-item>
-          <el-form-item label="推广图片">
+          <el-form-item label="活动图片" prop="imageUrl">
             <active-img @active-img="handleImage"></active-img>
           </el-form-item>
         </el-form>
@@ -120,37 +120,17 @@ export default {
         shareCommissionRules: [
           { required: true, message: '请选择分享提成规则', trigger: ['blur', 'change'] },
         ],
-        couponNum: [{ required: true, message: '优惠券数量', trigger: 'blur' }],
-        shareAmount: [
-          { required: true, message: '请输入分润', trigger: 'blur' },
-          {
-            pattern: /^\d*(?:\.\d{0,2})?$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '最多能输入两位小数',
-            trigger: 'blur',
-          },
-        ],
-        phone: [
-          { required: true, message: '请输入联系方式', trigger: 'blur' },
-          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
-          {
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur',
-          },
-        ],
-        imgUrl: [{ required: true, message: '请上传活动图片', trigger: 'change' }],
-        region: [{ required: true, message: '请选择活动区域', trigger: 'change' }],
+        // imageUrl: [{ required: true, message: '请上传活动图片', trigger: ['blur', 'change'] }],
       },
     }
   },
   methods: {
+    // ============================== 操作 ============================== //
     // 下一步
     handleNext() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          this.$emit('next', 2)
+          this.$emit('next', 2, this.form)
         } else {
           return false
         }
@@ -164,6 +144,7 @@ export default {
       this.$refs.form.resetFields()
       this.$baseMessage('重置成功', 'success')
     },
+    // ============================== 第三方插件方法 ============================== //
     // 选择图片后返回
     handleImage(file) {
       let form = Object.assign({}, this.form);
@@ -190,4 +171,7 @@ export default {
   justify-content: center;
   padding: 50px 0;
 }
+.form .el-form-item {
+  margin-bottom: 15px;
+}
 </style>
diff --git a/src/pages/discount-coupon/issue/components/template.vue b/src/pages/discount-coupon/issue/components/template.vue
index 60ea7f1..e7702cc 100644
--- a/src/pages/discount-coupon/issue/components/template.vue
+++ b/src/pages/discount-coupon/issue/components/template.vue
@@ -34,9 +34,15 @@ export default {
   data() {
     return {
       choose: 0,
+      form: {}
     }
   },
   methods: {
+    // 切换步骤时传过来的数据
+    handleData(form) {
+      this.form = Object.assign({}, form);
+      console.log('form', form);
+    },
     handleChoose(num) {
       this.choose = num
     },
diff --git a/src/pages/discount-coupon/issue/index.vue b/src/pages/discount-coupon/issue/index.vue
index 83a2b05..ef91b71 100644
--- a/src/pages/discount-coupon/issue/index.vue
+++ b/src/pages/discount-coupon/issue/index.vue
@@ -94,8 +94,10 @@ export default {
       this.form = Object.assign({}, form)
     },
     // 下一步
-    handleNext(active) {
+    handleNext(active, form) {
       this.active = active
+      let activeName = active == 1 ? 'edit' : active == 2 ? 'templates' : 'complete'
+      this.$refs[activeName].handleData(fiorm)
     },
   },
 }
diff --git a/src/utils/index.js b/src/utils/index.js
index a97f222..8232439 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,526 +1,550 @@
-/**
- * @description 格式化时间
- * @param time
- * @param cFormat
- * @returns {string|null}
- */
-export function parseTime(time, pattern) {
-  if (arguments.length === 0 || !time) {
-    return null;
-  }
-  const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
-  let date;
-  if (typeof time === "object") {
-    date = time;
-  } else {
-    if (typeof time === "string" && /^[0-9]+$/.test(time)) {
-      time = parseInt(time);
-    } else if (typeof time === "string") {
-      time = time.replace(new RegExp(/-/gm), "/");
-    }
-    if (typeof time === "number" && time.toString().length === 10) {
-      time = time * 1000;
-    }
-    date = new Date(time);
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  };
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key];
-    // Note: getDay() returns 0 on Sunday
-    if (key === "a") {
-      return ["日", "一", "二", "三", "四", "五", "六"][value];
-    }
-    if (result.length > 0 && value < 10) {
-      value = "0" + value;
-    }
-    return value || 0;
-  });
-  return time_str;
-}
-
-/**
- * 表单刷新重置
- * @param {String} refName
- */
-export function resetForm(refName) {
-  if (this.$refs[refName]) {
-    this.$refs[refName].resetFields();
-  }
-}
-
-/**
- * 添加日期范围
- * @param {Object} params
- * @param {Array} dateRange
- */
-export function addDateRange(params, dateRange) {
-  var search = params;
-  search.beginTime = "";
-  search.endTime = "";
-  if (null != dateRange && "" != dateRange) {
-    search.beginTime = this.dateRange[0];
-    search.endTime = this.dateRange[1];
-  }
-  return search;
-}
-
-/**
- * @description 格式化时间
- * @param time
- * @param option
- * @returns {string}
- */
-export function formatTime(time, option) {
-  if (("" + time).length === 10) {
-    time = parseInt(time) * 1000;
-  } else {
-    time = +time;
-  }
-  const d = new Date(time);
-  const now = Date.now();
-
-  const diff = (now - d) / 1000;
-
-  if (diff < 30) {
-    return "刚刚";
-  } else if (diff < 3600) {
-    // less 1 hour
-    return Math.ceil(diff / 60) + "分钟前";
-  } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + "小时前";
-  } else if (diff < 3600 * 24 * 2) {
-    return "1天前";
-  }
-  if (option) {
-    return parseTime(time, option);
-  } else {
-    return (
-      d.getMonth() +
-      1 +
-      "月" +
-      d.getDate() +
-      "日" +
-      d.getHours() +
-      "时" +
-      d.getMinutes() +
-      "分"
-    );
-  }
-}
-
-/**
- * @description 将url请求参数转为json格式
- * @param url
- * @returns {{}|any}
- */
-export function paramObj(url) {
-  const search = url.split("?")[1];
-  if (!search) {
-    return {};
-  }
-  return JSON.parse(
-    '{"' +
-      decodeURIComponent(search)
-        .replace(/"/g, '\\"')
-        .replace(/&/g, '","')
-        .replace(/=/g, '":"')
-        .replace(/\+/g, " ") +
-      '"}'
-  );
-}
-
-/**
- * @description 父子关系的数组转换成树形结构数据
- * @param data
- * @returns {*}
- */
-export function translateDataToTree(data) {
-  const parent = data.filter(
-    value => value.parentId === "undefined" || value.parentId == null
-  );
-  const children = data.filter(
-    value => value.parentId !== "undefined" && value.parentId != null
-  );
-  const translator = (parent, children) => {
-    parent.forEach(parent => {
-      children.forEach((current, index) => {
-        if (current.parentId === parent.id) {
-          const temp = JSON.parse(JSON.stringify(children));
-          temp.splice(index, 1);
-          translator([current], temp);
-          typeof parent.children !== "undefined"
-            ? parent.children.push(current)
-            : (parent.children = [current]);
-        }
-      });
-    });
-  };
-  translator(parent, children);
-  return parent;
-}
-
-/**
- * @description 树形结构数据转换成父子关系的数组
- * @param data
- * @returns {[]}
- */
-export function translateTreeToData(data) {
-  const result = [];
-  data.forEach(item => {
-    const loop = data => {
-      result.push({
-        id: data.id,
-        name: data.name,
-        parentId: data.parentId
-      });
-      const child = data.children;
-      if (child) {
-        for (let i = 0; i < child.length; i++) {
-          loop(child[i]);
-        }
-      }
-    };
-    loop(item);
-  });
-  return result;
-}
-
-/**
- * @description 10位时间戳转换
- * @param time
- * @returns {string}
- */
-export function tenBitTimestamp(time) {
-  const date = new Date(time * 1000);
-  const y = date.getFullYear();
-  let m = date.getMonth() + 1;
-  m = m < 10 ? "" + m : m;
-  let d = date.getDate();
-  d = d < 10 ? "" + d : d;
-  let h = date.getHours();
-  h = h < 10 ? "0" + h : h;
-  let minute = date.getMinutes();
-  let second = date.getSeconds();
-  minute = minute < 10 ? "0" + minute : minute;
-  second = second < 10 ? "0" + second : second;
-  return y + "年" + m + "月" + d + "日 " + h + ":" + minute + ":" + second; //组合
-}
-
-/**
- * @description 13位时间戳转换
- * @param time
- * @returns {string}
- */
-export function thirteenBitTimestamp(time) {
-  const date = new Date(time / 1);
-  const y = date.getFullYear();
-  let m = date.getMonth() + 1;
-  m = m < 10 ? "" + m : m;
-  let d = date.getDate();
-  d = d < 10 ? "" + d : d;
-  let h = date.getHours();
-  h = h < 10 ? "0" + h : h;
-  let minute = date.getMinutes();
-  let second = date.getSeconds();
-  minute = minute < 10 ? "0" + minute : minute;
-  second = second < 10 ? "0" + second : second;
-  return y + "年" + m + "月" + d + "日 " + h + ":" + minute + ":" + second; //组合
-}
-
-/**
- * @description 获取随机id
- * @param length
- * @returns {string}
- */
-export function uuid(length = 32) {
-  const num = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-  let str = "";
-  for (let i = 0; i < length; i++) {
-    str += num.charAt(Math.floor(Math.random() * num.length));
-  }
-  return str;
-}
-
-/**
- * @description m到n的随机数
- * @param m
- * @param n
- * @returns {number}
- */
-export function random(m, n) {
-  return Math.floor(Math.random() * (m - n) + n);
-}
-
-/**
- * @description addEventListener
- * @type {function(...[*]=)}
- */
-export const on = (function() {
-  return function(element, event, handler, useCapture = false) {
-    if (element && event && handler) {
-      element.addEventListener(event, handler, useCapture);
-    }
-  };
-})();
-
-/**
- * @description removeEventListener
- * @type {function(...[*]=)}
- */
-export const off = (function() {
-  return function(element, event, handler, useCapture = false) {
-    if (element && event) {
-      element.removeEventListener(event, handler, useCapture);
-    }
-  };
-})();
-
-/**
- * 构造树型结构数据
- * @param {*} data 数据源
- * @param {*} id id字段 默认 'id'
- * @param {*} parentId 父节点字段 默认 'parentId'
- * @param {*} children 孩子节点字段 默认 'children'
- * @param {*} rootId 根Id 默认 0
- */
-export function handleTree(data, id, parentId, children, rootId) {
-  console.log(data);
-  id = id || "id";
-  parentId = parentId || "parentId";
-  children = children || "children";
-  rootId = rootId || 0;
-  //对源数据深度克隆
-  const cloneData = JSON.parse(JSON.stringify(data));
-  //循环所有项
-  const treeData = cloneData.filter(father => {
-    let branchArr = cloneData.filter(child => {
-      //返回每一项的子级数组
-      return father[id] === child[parentId];
-    });
-    branchArr.length > 0 ? (father.children = branchArr) : "";
-    //返回第一层
-    return father[parentId] === rootId;
-  });
-  // console.log('treeData', treeData)
-  return treeData != "" ? treeData : data;
-}
-
-// blob方式下载文件
-export function download(res, filename) {
-  let blob = new Blob([res]);
-  // console.log('blob', blob)
-  var a = document.createElement("a");
-  var url = window.URL.createObjectURL(blob);
-  a.href = url;
-  a.download = decodeURIComponent(filename);
-  a.click();
-  window.URL.revokeObjectURL(url);
-}
-
-// -------------------------- 正整数的正则表达式 ------------------------- //
-export function expression(value) {
-  var pattern = /^[1-9][0-9]*$/; // 正整数的正则表达式
-  // 不符合正整数时
-  if (!pattern.test(value)) {
-    // input 框绑定的内容为空
-    value = parseFloat(value);
-  }
-  return value;
-}
-
-// -------------------------- 获取指定日期上一天、下一天 ------------------------- //
-export function getNextDate(date, day) {
-  var dd = new Date(date);
-  dd.setDate(dd.getDate() + day);
-  var y = dd.getFullYear();
-  var m =
-    dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
-  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
-  return y + "-" + m + "-" + d;
-}
-
-// -------------------------- 基于只能输入数字与小数点情况下获取两位小数 ------------------------- //
-export function parseNumber(values) {
-  if (values.split(".")[1]) {
-    return values.split(".")[1].length > 2
-      ? parseFloat(
-          values.split(".")[0] +
-            "." +
-            values
-              .split(".")[1]
-              .toString()
-              .slice(0, 2)
-        )
-      : parseFloat(values.split(".")[0] + "." + values.split(".")[1]);
-  } else {
-    return values;
-  }
-}
-
-/**
- * 构造下拉选择型结构数据
- * @param {*} data 数据源
- * @param {*} label 展示字段
- * @param {*} value 实际值字段
- */
-export function handleSelectOption(data, labelField, valueField) {
-  const cloneData = JSON.parse(JSON.stringify(data));
-  let result = [];
-  data.forEach(item => {
-    result.push({ label: item[labelField], value: item[valueField] });
-  });
-  return result;
-}
-
-/**
- * 构造下拉选择型结构数据
- * @param {*} data 数据源
- * @param {*} label 展示字段
- * @param {*} value 实际值字段
- */
-export function copyObject(data) {
-  return JSON.parse(JSON.stringify(data));
-}
-
-/**
- * 获取单据状态
- * @param {*} key 状态值
- */
-export function getDocStatus(key) {
-  let status;
-  switch (key) {
-    case "1":
-      status = "已提交";
-      break;
-    case "2":
-      status = "已撤回";
-      break;
-    case "3":
-      status = "审核中";
-      break;
-    case "4":
-      status = "审核通过";
-      break;
-    case "5":
-      status = "审核不通过";
-      break;
-    case "6":
-      status = "已关闭";
-      break;
-    default:
-      // '0'
-      status = "已保存";
-      break;
-  }
-  return status;
-}
-/**
- * 判断是否为空或空串
- * @param {object} data
- */
-function isEmpty(data) {
-  return data == "" || data == null || data == undefined;
-}
-
-/**
- * @description 计算两个时间并格式化
- * @param startTime
- * @param endTime
- * @returns {string}
- */
-export function compoteFormatTime(startTime, endTime) {
-  if (isEmpty(startTime) || isEmpty(endTime)) {
-    return "";
-  }
-  let st = new Date(startTime);
-  let et = new Date(endTime);
-  let time = et.getTime() - st.getTime();
-  return compoteFormatTimestamp(time);
-  // 返回 几天 几时 几分 几秒
-}
-
-/**
- * @description 将时间戳格式化
- * @param timestamp
- * @returns {string}
- */
-export function compoteFormatTimestamp(timestamp) {
-  let result = "";
-  // 时间差(秒)
-  let time = timestamp / 1000;
-  const ds = 86400;
-  const hs = 3600;
-  const ms = 60;
-  // 向下取整数
-  let day = parseInt(time / ds);
-  let hours = parseInt((time - day * ds) / hs);
-  let minute = parseInt((time - day * ds - hours * hs) / ms);
-  let second = time - day * ds - hours * hs - minute * ms;
-  if (day != 0) {
-    result += day + "天";
-  }
-  if (day != 0 || hours != 0) {
-    result += hours + "时";
-  }
-  if (hours != 0 || minute != 0) {
-    result += minute + "分";
-  }
-  result += second + "秒";
-  return result;
-  // 返回 几天 几时 几分 几秒
-}
-
-/**
- * 表格合计项
- * @param {object} param
- */
-export function getTableSummation(param) {
-  const { columns, data } = param;
-  const sums = [];
-  const fields = ["price", "number", "amount"];
-  columns.forEach((column, index) => {
-    if (index === 0) {
-      sums[index] = "合计";
-      return;
-    }
-    if (fields.includes(column.property)) {
-      const values = data.map(item => Number(item[column.property]));
-      if (!values.every(value => isNaN(value))) {
-        sums[index] = values.reduce((prev, curr) => {
-          let prevV = new this.$Decimal(prev);
-          let currV = new this.$Decimal(curr);
-          const value = Number(curr);
-          if (!isNaN(value)) {
-            return prevV.add(currV).toNumber();
-          } else {
-            return new this.$Decimal(prev).toNumber();
-          }
-        }, 0);
-      } else {
-        sums[index] = "";
-      }
-    } else {
-      sums[index] = "";
-    }
-  });
-  return sums;
-}
-
-export function stateFormat(row, column, cellValue) {
-  if (cellValue) {
-    return Number(cellValue)
-      .toFixed(2)
-      .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
-        return $1 + ",";
-      })
-      .replace(/\.$/, "");
-  }
-}
+/**
+ * @description 格式化时间
+ * @param time
+ * @param cFormat
+ * @returns {string|null}
+ */
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null;
+  }
+  const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
+  let date;
+  if (typeof time === "object") {
+    date = time;
+  } else {
+    if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+      time = parseInt(time);
+    } else if (typeof time === "string") {
+      time = time.replace(new RegExp(/-/gm), "/");
+    }
+    if (typeof time === "number" && time.toString().length === 10) {
+      time = time * 1000;
+    }
+    date = new Date(time);
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  };
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key];
+    // Note: getDay() returns 0 on Sunday
+    if (key === "a") {
+      return ["日", "一", "二", "三", "四", "五", "六"][value];
+    }
+    if (result.length > 0 && value < 10) {
+      value = "0" + value;
+    }
+    return value || 0;
+  });
+  return time_str;
+}
+
+/**
+ * 表单刷新重置
+ * @param {String} refName
+ */
+export function resetForm(refName) {
+  if (this.$refs[refName]) {
+    this.$refs[refName].resetFields();
+  }
+}
+
+/**
+ * 添加日期范围
+ * @param {Object} params
+ * @param {Array} dateRange
+ */
+export function addDateRange(params, dateRange) {
+  var search = params;
+  search.beginTime = "";
+  search.endTime = "";
+  if (null != dateRange && "" != dateRange) {
+    search.beginTime = this.dateRange[0];
+    search.endTime = this.dateRange[1];
+  }
+  return search;
+}
+
+/**
+ * @description 格式化时间
+ * @param time
+ * @param option
+ * @returns {string}
+ */
+export function formatTime(time, option) {
+  if (("" + time).length === 10) {
+    time = parseInt(time) * 1000;
+  } else {
+    time = +time;
+  }
+  const d = new Date(time);
+  const now = Date.now();
+
+  const diff = (now - d) / 1000;
+
+  if (diff < 30) {
+    return "刚刚";
+  } else if (diff < 3600) {
+    // less 1 hour
+    return Math.ceil(diff / 60) + "分钟前";
+  } else if (diff < 3600 * 24) {
+    return Math.ceil(diff / 3600) + "小时前";
+  } else if (diff < 3600 * 24 * 2) {
+    return "1天前";
+  }
+  if (option) {
+    return parseTime(time, option);
+  } else {
+    return (
+      d.getMonth() +
+      1 +
+      "月" +
+      d.getDate() +
+      "日" +
+      d.getHours() +
+      "时" +
+      d.getMinutes() +
+      "分"
+    );
+  }
+}
+
+/**
+ * @description 将url请求参数转为json格式
+ * @param url
+ * @returns {{}|any}
+ */
+export function paramObj(url) {
+  const search = url.split("?")[1];
+  if (!search) {
+    return {};
+  }
+  return JSON.parse(
+    '{"' +
+    decodeURIComponent(search)
+    .replace(/"/g, '\\"')
+    .replace(/&/g, '","')
+    .replace(/=/g, '":"')
+    .replace(/\+/g, " ") +
+    '"}'
+  );
+}
+
+/**
+ * @description 父子关系的数组转换成树形结构数据
+ * @param data
+ * @returns {*}
+ */
+export function translateDataToTree(data) {
+  const parent = data.filter(
+    value => value.parentId === "undefined" || value.parentId == null
+  );
+  const children = data.filter(
+    value => value.parentId !== "undefined" && value.parentId != null
+  );
+  const translator = (parent, children) => {
+    parent.forEach(parent => {
+      children.forEach((current, index) => {
+        if (current.parentId === parent.id) {
+          const temp = JSON.parse(JSON.stringify(children));
+          temp.splice(index, 1);
+          translator([current], temp);
+          typeof parent.children !== "undefined" ?
+            parent.children.push(current) :
+            (parent.children = [current]);
+        }
+      });
+    });
+  };
+  translator(parent, children);
+  return parent;
+}
+
+/**
+ * @description 树形结构数据转换成父子关系的数组
+ * @param data
+ * @returns {[]}
+ */
+export function translateTreeToData(data) {
+  const result = [];
+  data.forEach(item => {
+    const loop = data => {
+      result.push({
+        id: data.id,
+        name: data.name,
+        parentId: data.parentId
+      });
+      const child = data.children;
+      if (child) {
+        for (let i = 0; i < child.length; i++) {
+          loop(child[i]);
+        }
+      }
+    };
+    loop(item);
+  });
+  return result;
+}
+
+/**
+ * @description 10位时间戳转换
+ * @param time
+ * @returns {string}
+ */
+export function tenBitTimestamp(time) {
+  const date = new Date(time * 1000);
+  const y = date.getFullYear();
+  let m = date.getMonth() + 1;
+  m = m < 10 ? "" + m : m;
+  let d = date.getDate();
+  d = d < 10 ? "" + d : d;
+  let h = date.getHours();
+  h = h < 10 ? "0" + h : h;
+  let minute = date.getMinutes();
+  let second = date.getSeconds();
+  minute = minute < 10 ? "0" + minute : minute;
+  second = second < 10 ? "0" + second : second;
+  return y + "年" + m + "月" + d + "日 " + h + ":" + minute + ":" + second; //组合
+}
+
+/**
+ * @description 13位时间戳转换
+ * @param time
+ * @returns {string}
+ */
+export function thirteenBitTimestamp(time) {
+  const date = new Date(time / 1);
+  const y = date.getFullYear();
+  let m = date.getMonth() + 1;
+  m = m < 10 ? "" + m : m;
+  let d = date.getDate();
+  d = d < 10 ? "" + d : d;
+  let h = date.getHours();
+  h = h < 10 ? "0" + h : h;
+  let minute = date.getMinutes();
+  let second = date.getSeconds();
+  minute = minute < 10 ? "0" + minute : minute;
+  second = second < 10 ? "0" + second : second;
+  return y + "年" + m + "月" + d + "日 " + h + ":" + minute + ":" + second; //组合
+}
+
+/**
+ * @description 获取随机id
+ * @param length
+ * @returns {string}
+ */
+export function uuid(length = 32) {
+  const num = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+  let str = "";
+  for (let i = 0; i < length; i++) {
+    str += num.charAt(Math.floor(Math.random() * num.length));
+  }
+  return str;
+}
+
+/**
+ * @description m到n的随机数
+ * @param m
+ * @param n
+ * @returns {number}
+ */
+export function random(m, n) {
+  return Math.floor(Math.random() * (m - n) + n);
+}
+
+/**
+ * @description addEventListener
+ * @type {function(...[*]=)}
+ */
+export const on = (function () {
+  return function (element, event, handler, useCapture = false) {
+    if (element && event && handler) {
+      element.addEventListener(event, handler, useCapture);
+    }
+  };
+})();
+
+/**
+ * @description removeEventListener
+ * @type {function(...[*]=)}
+ */
+export const off = (function () {
+  return function (element, event, handler, useCapture = false) {
+    if (element && event) {
+      element.removeEventListener(event, handler, useCapture);
+    }
+  };
+})();
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id, parentId, children, rootId) {
+  console.log(data);
+  id = id || "id";
+  parentId = parentId || "parentId";
+  children = children || "children";
+  rootId = rootId || 0;
+  //对源数据深度克隆
+  const cloneData = JSON.parse(JSON.stringify(data));
+  //循环所有项
+  const treeData = cloneData.filter(father => {
+    let branchArr = cloneData.filter(child => {
+      //返回每一项的子级数组
+      return father[id] === child[parentId];
+    });
+    branchArr.length > 0 ? (father.children = branchArr) : "";
+    //返回第一层
+    return father[parentId] === rootId;
+  });
+  // console.log('treeData', treeData)
+  return treeData != "" ? treeData : data;
+}
+
+// blob方式下载文件
+export function download(res, filename) {
+  let blob = new Blob([res]);
+  // console.log('blob', blob)
+  var a = document.createElement("a");
+  var url = window.URL.createObjectURL(blob);
+  a.href = url;
+  a.download = decodeURIComponent(filename);
+  a.click();
+  window.URL.revokeObjectURL(url);
+}
+
+// -------------------------- 正整数的正则表达式 ------------------------- //
+export function expression(value) {
+  var pattern = /^[1-9][0-9]*$/; // 正整数的正则表达式
+  // 不符合正整数时
+  if (!pattern.test(value)) {
+    // input 框绑定的内容为空
+    value = parseFloat(value);
+  }
+  return value;
+}
+
+// -------------------------- 获取指定日期上一天、下一天 ------------------------- //
+export function getNextDate(date, day) {
+  var dd = new Date(date);
+  dd.setDate(dd.getDate() + day);
+  var y = dd.getFullYear();
+  var m =
+    dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
+  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
+  return y + "-" + m + "-" + d;
+}
+
+// -------------------------- 基于只能输入数字与小数点情况下获取两位小数 ------------------------- //
+export function parseNumber(values) {
+  if (values.split(".")[1]) {
+    return values.split(".")[1].length > 2 ?
+      parseFloat(
+        values.split(".")[0] +
+        "." +
+        values
+        .split(".")[1]
+        .toString()
+        .slice(0, 2)
+      ) :
+      parseFloat(values.split(".")[0] + "." + values.split(".")[1]);
+  } else {
+    return values;
+  }
+}
+
+/**
+ * 构造下拉选择型结构数据
+ * @param {*} data 数据源
+ * @param {*} label 展示字段
+ * @param {*} value 实际值字段
+ */
+export function handleSelectOption(data, labelField, valueField) {
+  const cloneData = JSON.parse(JSON.stringify(data));
+  let result = [];
+  data.forEach(item => {
+    result.push({
+      label: item[labelField],
+      value: item[valueField]
+    });
+  });
+  return result;
+}
+
+/**
+ * 构造下拉选择型结构数据
+ * @param {*} data 数据源
+ * @param {*} label 展示字段
+ * @param {*} value 实际值字段
+ */
+export function copyObject(data) {
+  return JSON.parse(JSON.stringify(data));
+}
+
+/**
+ * 获取单据状态
+ * @param {*} key 状态值
+ */
+export function getDocStatus(key) {
+  let status;
+  switch (key) {
+    case "1":
+      status = "已提交";
+      break;
+    case "2":
+      status = "已撤回";
+      break;
+    case "3":
+      status = "审核中";
+      break;
+    case "4":
+      status = "审核通过";
+      break;
+    case "5":
+      status = "审核不通过";
+      break;
+    case "6":
+      status = "已关闭";
+      break;
+    default:
+      // '0'
+      status = "已保存";
+      break;
+  }
+  return status;
+}
+/**
+ * 判断是否为空或空串
+ * @param {object} data
+ */
+function isEmpty(data) {
+  return data == "" || data == null || data == undefined;
+}
+
+/**
+ * @description 计算两个时间并格式化
+ * @param startTime
+ * @param endTime
+ * @returns {string}
+ */
+export function compoteFormatTime(startTime, endTime) {
+  if (isEmpty(startTime) || isEmpty(endTime)) {
+    return "";
+  }
+  let st = new Date(startTime);
+  let et = new Date(endTime);
+  let time = et.getTime() - st.getTime();
+  return compoteFormatTimestamp(time);
+  // 返回 几天 几时 几分 几秒
+}
+
+/**
+ * @description 将时间戳格式化
+ * @param timestamp
+ * @returns {string}
+ */
+export function compoteFormatTimestamp(timestamp) {
+  let result = "";
+  // 时间差(秒)
+  let time = timestamp / 1000;
+  const ds = 86400;
+  const hs = 3600;
+  const ms = 60;
+  // 向下取整数
+  let day = parseInt(time / ds);
+  let hours = parseInt((time - day * ds) / hs);
+  let minute = parseInt((time - day * ds - hours * hs) / ms);
+  let second = time - day * ds - hours * hs - minute * ms;
+  if (day != 0) {
+    result += day + "天";
+  }
+  if (day != 0 || hours != 0) {
+    result += hours + "时";
+  }
+  if (hours != 0 || minute != 0) {
+    result += minute + "分";
+  }
+  result += second + "秒";
+  return result;
+  // 返回 几天 几时 几分 几秒
+}
+
+/**
+ * 表格合计项
+ * @param {object} param
+ */
+export function getTableSummation(param) {
+  const {
+    columns,
+    data
+  } = param;
+  const sums = [];
+  const fields = ["price", "number", "amount"];
+  columns.forEach((column, index) => {
+    if (index === 0) {
+      sums[index] = "合计";
+      return;
+    }
+    if (fields.includes(column.property)) {
+      const values = data.map(item => Number(item[column.property]));
+      if (!values.every(value => isNaN(value))) {
+        sums[index] = values.reduce((prev, curr) => {
+          let prevV = new this.$Decimal(prev);
+          let currV = new this.$Decimal(curr);
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return prevV.add(currV).toNumber();
+          } else {
+            return new this.$Decimal(prev).toNumber();
+          }
+        }, 0);
+      } else {
+        sums[index] = "";
+      }
+    } else {
+      sums[index] = "";
+    }
+  });
+  return sums;
+}
+
+export function stateFormat(row, column, cellValue) {
+  if (cellValue) {
+    return Number(cellValue)
+      .toFixed(2)
+      .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+        return $1 + ",";
+      })
+      .replace(/\.$/, "");
+  }
+}
+/**
+ * @description (/\d{1,3}(?=(\d{3})+$)/g, '$&,') 只能正数使用
+ */
+// -------------------------- 千分号 ------------------------- //
+export function thousands(value) {
+  ;
+  /\d{1,3}(?=(\d{3})+$)/g, '$&,'
+  if (value) {
+    if (value.includes('.')) {
+      let array = value.split('.')
+      let data = array[0].replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,')
+      return data + '.' + array[1]
+    } else {
+      let data = value.replace(/\d{1,3}(?=(\d{3})+$)/g, '$&,')
+      return data
+    }
+  }
+}

From 4528ec86279ebffcf44d80e09fa25839b0e23107 Mon Sep 17 00:00:00 2001
From: Sigo <sigo2017web@163.com>
Date: Thu, 23 Jun 2022 11:23:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/discount-coupon/issue.js              |  2 +-
 .../issue/components/activeImg.vue            |  4 +
 .../discount-coupon/issue/components/edit.vue | 68 +++++++++-------
 .../issue/components/template.vue             | 18 ++++-
 src/pages/discount-coupon/issue/index.vue     | 79 +++----------------
 5 files changed, 74 insertions(+), 97 deletions(-)

diff --git a/src/api/discount-coupon/issue.js b/src/api/discount-coupon/issue.js
index 8fea337..3fe67ed 100644
--- a/src/api/discount-coupon/issue.js
+++ b/src/api/discount-coupon/issue.js
@@ -2,7 +2,7 @@ import {
   service
 } from "../../utils/service";
 
-// 主页查询
+// 发布
 export function doAdd(data) {
   return service({
     url: "/platformCoupon/add",
diff --git a/src/pages/discount-coupon/issue/components/activeImg.vue b/src/pages/discount-coupon/issue/components/activeImg.vue
index 7615e0f..7cbd5b8 100644
--- a/src/pages/discount-coupon/issue/components/activeImg.vue
+++ b/src/pages/discount-coupon/issue/components/activeImg.vue
@@ -18,6 +18,10 @@ export default {
       // console.log('file', file);
       console.log('fileList', fileList);
     },
+    // 发布后清除选择的文件
+    handleClear() {
+      this.$refs.upload.clearFiles();
+    }
   }
 }
 </script>
diff --git a/src/pages/discount-coupon/issue/components/edit.vue b/src/pages/discount-coupon/issue/components/edit.vue
index bebf3fc..5d8ea9c 100644
--- a/src/pages/discount-coupon/issue/components/edit.vue
+++ b/src/pages/discount-coupon/issue/components/edit.vue
@@ -19,45 +19,49 @@
             <el-radio v-model="form.serviceConditions" :label="0">满减</el-radio>
             <el-radio v-model="form.serviceConditions" :label="1">没有限制</el-radio>
           </el-form-item>
-          <el-form-item prop="fullReductionMoney" v-show="form.serviceConditions===0" :prop="form.serviceConditions===0?'fullReductionMoney':''">
+          <el-form-item v-if="form.serviceConditions===0" prop="fullReductionMoney">
             <amount-input ref="fullReductionMoney" @amount="handleAmount" name="fullReductionMoney" placeholder="满减金额（满多少可以减）"></amount-input>
           </el-form-item>
           <el-form-item label="适用门店" prop="suitableStore">
-            <el-input v-model.trim="form.suitableStore" placeholder="优惠券适用的门店"></el-input>
+            <el-radio v-model="form.suitableStore" :label="0">所有门店</el-radio>
+            <el-radio v-model="form.suitableStore" :label="1">指定门店</el-radio>
+          </el-form-item>
+          <el-form-item v-if="form.suitableStore===1" prop="useStoreList">
+            <el-button type="primary" size="mini">选择门店</el-button>
           </el-form-item>
           <el-form-item label="适用项目" prop="suitableProject">
-            <el-input v-model.trim="form.suitableProject" placeholder="优惠券适用的项目"></el-input>
+            <el-radio v-model="form.suitableProject" :label="0">所有项目</el-radio>
+            <el-radio v-model="form.suitableProject" :label="1">指定项目</el-radio>
+          </el-form-item>
+          <el-form-item v-if="form.suitableProject===1" prop="projectList">
+            <el-button type="primary" size="mini">选择项目</el-button>
           </el-form-item>
           <el-form-item label="有效方式" prop="indateType">
             <el-radio v-model="form.indateType" :label="0">领取后多少天</el-radio>
             <el-radio v-model="form.indateType" :label="1">固定日期</el-radio>
           </el-form-item>
-          <el-form-item v-show="form.indateType===0" :prop="form.indateType===0?'startDay':''">
+          <el-form-item v-if="form.indateType===0" prop="startDay">
             <el-input v-model.trim="form.startDay" placeholder="领取后多少天生效"></el-input>
-            <el-input v-model.trim="form.endDay" placeholder="生效后多少天内有效"></el-input>
           </el-form-item>
-          <!-- <el-form-item v-show="form.indateType===0" :prop="form.indateType===0?'endDay':''">
+          <el-form-item v-if="form.indateType===0" prop="endDay">
             <el-input v-model.trim="form.endDay" placeholder="生效后多少天内有效"></el-input>
-          </el-form-item> -->
-          <el-form-item v-show="form.indateType===1" :prop="form.indateType===1?'startDate':''">
+          </el-form-item>
+          <el-form-item v-if="form.indateType===1" prop="startDate">
             <el-date-picker v-model="form.fixDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="截止日期" value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
-          <!-- <el-form-item v-show="form.indateType===1" :prop="form.indateType===1?'endDay':''">
-            <el-date-picker v-model="form.endDay" type="date" placeholder="截止日期" value-format="yyyy-MM-dd"></el-date-picker>
-          </el-form-item> -->
           <el-form-item label="分享提成规则" prop="shareCommissionRules">
             <el-radio v-model="form.shareCommissionRules" :label="0">固定提成</el-radio>
             <el-radio v-model="form.shareCommissionRules" :label="1">单据金额抽成(%)</el-radio>
           </el-form-item>
-          <el-form-item v-show="form.shareCommissionRules===0" :prop="form.shareCommissionRules===0?'fixedAmount':''">
+          <el-form-item v-if="form.shareCommissionRules===0" prop="fixedAmount">
             <amount-input ref="fixedAmount" @amount="handleAmount" name="fixedAmount" placeholder="固定提成(元)"></amount-input>
           </el-form-item>
-          <el-form-item v-show="form.shareCommissionRules===1" :prop="form.shareCommissionRules===1?'orderCommission':''">
+          <el-form-item v-if="form.shareCommissionRules===1" prop="orderCommission">
             <amount-input ref="orderCommission" @amount="handleAmount" name="orderCommission" placeholder="单据金额抽成(%)"></amount-input>
           </el-form-item>
           <el-form-item label="活动图片" prop="imageUrl">
-            <active-img @active-img="handleImage"></active-img>
+            <active-img ref="activeImg" @active-img="handleImage"></active-img>
           </el-form-item>
         </el-form>
       </el-col>
@@ -76,7 +80,7 @@
 
 <script>
 import AmountInput from '@/components/AmountInput/index'
-import ActiveImg from './activeImg.vue'
+import ActiveImg from './activeImg'
 export default {
   name: 'Form',
   components: { AmountInput, ActiveImg },
@@ -98,15 +102,8 @@ export default {
         couponType: [
           { required: true, message: '请选择优惠方式', trigger: ['blur', 'change'] },
         ],
-
         fullReductionMoney: [
           { required: true, message: '请输入满减金额', trigger: 'blur' },
-          {
-            pattern: /^\d*(?:\.\d{0,2})?$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '最多能输入两位小数',
-            trigger: 'blur',
-          },
         ],
         suitableStore: [
           { required: true, message: '请选择适用门店', trigger: ['blur', 'change'] },
@@ -117,10 +114,16 @@ export default {
         indateType: [
           { required: true, message: '请选择有效方式', trigger: ['blur', 'change'] },
         ],
+        startDay: [
+          { required: true, message: '请输入多少天', trigger: 'blur' },
+        ],
+        endDay: [
+          { required: true, message: '请输入多少天', trigger: 'blur' },
+        ],
         shareCommissionRules: [
           { required: true, message: '请选择分享提成规则', trigger: ['blur', 'change'] },
         ],
-        // imageUrl: [{ required: true, message: '请上传活动图片', trigger: ['blur', 'change'] }],
+        imageUrl: [{ required: true, message: '请上传活动图片', trigger: ['blur', 'change'] }],
       },
     }
   },
@@ -138,9 +141,16 @@ export default {
     },
     // 重置
     resetForm() {
-      this.$refs.fullReductionMoney.reset()
-      this.$refs.fixedAmount.reset()
-      this.$refs.orderCommission.reset()
+      let form = Object.assign({}, this.form);
+      if (form.serviceConditions === 0) {
+        this.$refs.fullReductionMoney.reset()
+      }
+      if (shareCommissionRules === 0) {
+        this.$refs.fixedAmount.reset()
+      }
+      if (shareCommissionRules === 1) {
+        this.$refs.orderCommission.reset()
+      }
       this.$refs.form.resetFields()
       this.$baseMessage('重置成功', 'success')
     },
@@ -148,7 +158,7 @@ export default {
     // 选择图片后返回
     handleImage(file) {
       let form = Object.assign({}, this.form);
-      form.file = file
+      form.multipartFile = file
       this.form = Object.assign({}, form);
     },
     // 金额自定义组件返回值
@@ -157,6 +167,10 @@ export default {
       form[name] = amount
       this.form = Object.assign({}, form)
     },
+    // 发布后清除选择的文件
+    handleClear() {
+      this.$refs.activeImg.handleClear()
+    }
   },
 }
 </script>
diff --git a/src/pages/discount-coupon/issue/components/template.vue b/src/pages/discount-coupon/issue/components/template.vue
index e7702cc..66e4d62 100644
--- a/src/pages/discount-coupon/issue/components/template.vue
+++ b/src/pages/discount-coupon/issue/components/template.vue
@@ -23,13 +23,14 @@
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
         <div class="box">
           <el-button type="warning" @click="handleLast" size="medium">上一步</el-button>
-          <el-button type="primary" @click="handleNext" size="medium">提交</el-button>
+          <el-button type="primary" @click="handleSubmit" size="medium">提交</el-button>
         </div>
       </el-col>
     </el-row>
   </div>
 </template>
 <script>
+import { doAdd } from "@/api/discount-coupon/issue.js";
 export default {
   data() {
     return {
@@ -51,8 +52,19 @@ export default {
       this.$emit('next', 1)
     },
     // 提交
-    handleNext() {
-      this.$emit('next', 3)
+    async handleSubmit() {
+      let format = new FormData()
+      Object.keys(this.form).map(key => {
+        format.append(key, this.form[key])
+      })
+      let { code } = await doAdd(format)
+      if (code == '000000') {
+        this.$message({
+          message: '发布成功',
+          type: 'success'
+        });
+        this.$emit('next', 3)
+      }
     },
   },
 }
diff --git a/src/pages/discount-coupon/issue/index.vue b/src/pages/discount-coupon/issue/index.vue
index ef91b71..170db61 100644
--- a/src/pages/discount-coupon/issue/index.vue
+++ b/src/pages/discount-coupon/issue/index.vue
@@ -26,78 +26,25 @@ export default {
   data() {
     return {
       active: 1,
-      form: {
-        couponNum: 1,
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          {
-            min: 3,
-            max: 5,
-            message: '长度在 3 到 5 个字符',
-            trigger: 'blur',
-          },
-        ],
-        deductionAmount: [
-          { required: true, message: '请输入抵扣金额', trigger: 'blur' },
-          {
-            pattern: /^\d*(?:\.\d{0,2})?$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '最多能输入两位小数',
-            trigger: 'blur',
-          },
-        ],
-        couponNum: [{ required: true, message: '优惠券数量', trigger: 'blur' }],
-        shareAmount: [
-          { required: true, message: '请输入分润', trigger: 'blur' },
-          {
-            pattern: /^\d*(?:\.\d{0,2})?$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '最多能输入两位小数',
-            trigger: 'blur',
-          },
-        ],
-        phone: [
-          { required: true, message: '请输入联系方式', trigger: 'blur' },
-          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
-          {
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            //pattern: /^1[3456789]\d{9}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur',
-          },
-        ],
-        imgUrl: [{ required: true, message: '请上传活动图片', trigger: 'change' }],
-        region: [{ required: true, message: '请选择活动区域', trigger: 'change' }],
-      },
+      form: {},
     }
   },
   methods: {
-    submitForm() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          alert('submit!')
-        } else {
-          return false
-        }
-      })
-    },
-    resetForm() {
-      this.$refs.deductionAmount.reset()
-      this.$refs.shareAmount.reset()
-      this.$refs.form.resetFields()
-    },
-    handleAmount(name, amount) {
-      let form = Object.assign({}, this.form)
-      form[name] = amount
-      this.form = Object.assign({}, form)
-    },
-    // 下一步
+    // 下一步/上一步
     handleNext(active, form) {
       this.active = active
       let activeName = active == 1 ? 'edit' : active == 2 ? 'templates' : 'complete'
-      this.$refs[activeName].handleData(fiorm)
+      if (activeName == 'templates') {
+        this.$nextTick(function () {
+          this.$refs[activeName].handleData(form)
+        });
+      }
+      if (active === 1) {
+        // 发布后清除选择的文件
+        this.$nextTick(function () {
+          this.$refs.edit.handleClear()
+        });
+      }
     },
   },
 }