完成平台交易金

src/api/active/active_bee.js

@@ -43,4 +43,69 @@ export function stopBee(data) {
     method: 'post',
     data
   })
-}
+}
+
+
+//  获取活动参与的店铺
+export function getShopList(data) {
+  return request({
+    url: '/platformBeeCurrency/getCurrencyShop',
+    method: 'post',
+    data
+  })
+}
+
+// 获取活动的数据
+export function getBeeData(data) {
+  // console.log(data);
+  return request({
+    url: '/platformBeeCurrency/getCurrencyData',
+    method: 'post',
+    data
+  })
+}
+
+//  删除活动信息
+export function beeDelete(id) {
+  return request({
+    url: `/platformBeeCurrency/delete/${id}`,
+    method: 'delete',
+  })
+}
+
+// 查看该店铺下参加的商品
+export function activeGetProducts(data) {
+  return request({
+    url: '/activity/getProducts',
+    method: 'post',
+    data
+  })
+}
+
+
+//  审核商家
+export function activExamine(data) {
+  return request({
+    url: '/activity/examine',
+    method: 'post',
+    data
+  })
+}
+
+//  清退
+export function activeLiquidation(data) {
+  return request({
+    url: '/activity/liquidation',
+    method: 'post',
+    data
+  })
+}
+
+// 审核记录查询
+export function activeGetExamines(data) {
+  return request({
+    url: '/activity/getExamines',
+    method: 'post',
+    data
+  })
+}

src/views/active/beeCoin/component/ActivityDetail.vue

@@ -0,0 +1,587 @@
+<!--  -->
+<template>
+  <div>
+    <div class="pending">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="活动信息" name="first">
+          <div class="shop_info">
+            <h3 class="detail_title">活动信息</h3>
+            <div class="shopInfo_left">
+              <p class="detail_text">
+                <span>活动名称：</span>
+                <span class="text">{{ form.currencyName }}</span>
+              </p>
+              <p class="detail_text">
+                <span>活动备注：</span>
+                <span class="text">{{ form.remark }}</span>
+              </p>
+              <p class="detail_text">
+                <span>报名时间：</span>
+                <span class="text">{{ form.signStartTime }}-{{ form.signEndTime }}</span>
+              </p>
+              <p class="detail_text">
+                <span>起止时间：</span>
+                <span class="text">{{ form.startTime }}-{{ form.endTime }}</span>
+              </p>
+              <p class="detail_text">
+                <span>活动保证金：</span>
+                <span class="text textColor ">
+                  <el-radio-group v-model="form.ifBond">
+                    <el-radio :label="1" disabled>需要</el-radio>
+                    <el-radio :label="0" disabled>不需要</el-radio>
+                  </el-radio-group>
+                </span>
+              </p>
+              <p v-if="form.ifBond" class="detail_text">
+                <span>保证金金额：</span>
+                <span class="text">{{ form.bondMoney }}</span>
+              </p>
+              <p class="detail_text">
+                <span>活动状态：</span>
+                <span v-if="form.state === 0" class="text">报名未开始</span>
+                <span v-if="form.state === 1" class="text">报名进行中</span>
+                <span v-if="form.state === 2" class="text">活动待开始</span>
+                <span v-if="form.state === 3" class="text">活动进行中</span>
+                <span v-if="form.state === 4" class="text">活动已结束</span>
+              </p>
+            </div>
+          </div>
+          <div class="shop_info">
+            <h3 class="detail_title">优惠规则</h3>
+            <p class="detail_text">
+              <span>优惠方案：</span>
+              <template v-if="form.setRules == 2">
+                <span class="text">比例优惠{{ form.currencyMoney }}%</span>
+              </template>
+              <template v-else-if="form.setRules == 1">
+                <span class="text">直降{{ form.currencyMoney }}元</span>
+              </template>
+            </p>
+            <p class="detail_text">
+              <span>是否限购：</span>
+              <span class="text textColor ">
+                <el-radio-group v-model="form.ifLimit">
+                  <el-radio :label="2" disabled>限购</el-radio>
+                  <el-radio :label="1" disabled>不限购</el-radio>
+                </el-radio-group>
+              </span>
+            </p>
+            <p v-if="form.ifLimit == 2" class="detail_text">
+              <span>商品限购：</span>
+              <span class="text">限购{{ form.limitNumber || 0 }}人</span>
+            </p>
+            <p class="detail_text">
+              <span>优惠券叠加：</span>
+              <span class="text textColor ">
+                <el-radio-group v-model="form.ifAdd">
+                  <el-radio :label="1" disabled>叠加</el-radio>
+                  <el-radio :label="0" disabled>不叠加</el-radio>
+                </el-radio-group>
+              </span>
+            </p>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="参与店铺" name="second">
+          <!-- 搜索 -->
+          <div class="formSearch">
+            <el-form :inline="true" :model="shopQuery" class="demo-form-inline">
+              <el-form-item label="店铺名称">
+                <el-input v-model="shopQuery.shopName" maxlength="20" placeholder="请输入店铺名称" />
+              </el-form-item>
+              <el-form-item label="店铺编码">
+                <el-input v-model="shopQuery.shopCode" maxlength="20" placeholder="请输入店铺编码" />
+              </el-form-item>
+              <el-form-item label="审核状态">
+                <el-select v-model="shopQuery.state" clearable placeholder="请选择审核状态">
+                  <el-option label="待审核" value="0" />
+                  <el-option label="报名成功" value="1" />
+                  <el-option label="报名失败" value="2" />
+                  <el-option label="报名进行中" value="3" />
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" plain @click="search">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <!-- 表格 -->
+          <div class="tableBox">
+            <el-table ref="multipleTable" :data="tableData" border
+              :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark"
+              style="width: 100%">
+              <el-table-column label="店铺名称" width="220">
+                <template slot-scope="scope">{{ scope.row.shopName }}</template>
+              </el-table-column>
+              <el-table-column prop="shopCode" label="店铺编码" />
+              <el-table-column prop="products" label="参与商品数" />
+              <el-table-column prop="examines" label="审核次数" />
+              <el-table-column label="审核状态">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.state == 0">待审核</span>
+                  <span v-if="scope.row.state == 1">报名成功</span>
+                  <span v-if="scope.row.state == 2">报名失败</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div class="btnList">
+                    <el-button type="text" @click="seeMore(scope.row)">查看商品</el-button>
+                    <el-button type="text" @click="checkList(scope.row)">审核记录</el-button>
+                    <el-button v-if="scope.row.state === 0" type="text" @click="examine(scope.row)">审核</el-button>
+
+                    <el-button v-if="scope.row.state === 1" type="text" @click="liquidation(scope.row)">清退</el-button>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="fenye">
+              <el-pagination :current-page="shopQuery.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+                layout="total, sizes, prev, pager, next, jumper" :total="tableTotal" @size-change="handleSizeChange"
+                @current-change="handleCurrentChange" />
+            </div>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="活动数据" name="chart">
+          <DetailComponent :info-list="infoList">
+            <template #table>
+              <div class="table">
+                <el-table :data="activityTable" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
+                  style="width: 100%">
+                  >
+                  <el-table-column prop="shopName" label="店铺名称" />
+                  <el-table-column prop="shopCode" label="店铺编码" />
+                  <el-table-column prop="products" label="参与商品数(件)" />
+                  <el-table-column prop="persons" label="访客数" />
+                  <el-table-column prop="orders" label="提交订单数" />
+                  <el-table-column prop="finish" label="成交比数" />
+                  <el-table-column prop="total" label="成交总额" />
+                </el-table>
+              </div>
+            </template>
+          </DetailComponent>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <!-- 活动商品记录弹框 -->
+    <el-dialog title="活动商品" :visible.sync="foodsDia" center width="70%" :close-on-click-modal="false"
+      :modal-append-to-body="false" :modal="false">
+      <div class="diaddStyle">
+        <el-table ref="multipleTable" :data="tableProducts" border
+          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+          <el-table-column label="产品主图" width="220">
+            <template slot-scope="scope">
+              <img :src="scope.row.image" width="50" height="50" alt srcset>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productName" label="产品名称" />
+          <el-table-column prop="productId" label="产品id" />
+          <el-table-column prop="price" label="售价(元)" />
+          <el-table-column prop="originalPrice" label="原价(元)" />
+          <el-table-column prop="stockNumber" label="库存(件)" />
+          <el-table-column prop="volume" label="累计销量(件)" />
+          <el-table-column label="上架状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.shelveState == 1">上架</span>
+              <span v-if="scope.row.shelveState == 0">下架</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- <div class="fenye">
+          <el-pagination :current-page="currentPages" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            layout="total, prev, pager, next, jumper" :total="totals" @size-change="handleSizeChanges"
+            @current-change="handleCurrentChanges" />
+        </div> -->
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="foodsDia = false">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 审核清退 -->
+    <el-dialog append-to-body :title="checkObj.title" :visible.sync="checkObj.show" center width="30%"
+      :close-on-click-modal="false">
+      <div v-if="checkObj.type === 1" class="diaddStyle">
+        <el-form ref="form" :model="addform" label-width="80px">
+          <el-form-item label="审核状态">
+            <el-radio-group v-model="addform.state">
+              <el-radio label="1">报名成功</el-radio>
+              <el-radio label="2">报名失败</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="addform.remark" maxlength="200" type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-else class="diaddStyle">
+        <div class="text">确认要清退本商家吗？</div>
+        <div class="text">清退后商家的所有商品将退出本次活动</div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="enter">确定</el-button>
+        <el-button @click="checkDIa = checkObj.show = false">取消</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 审核记录弹框 -->
+    <el-dialog title="审核记录" :visible.sync="checkDIa" center width="30%" :close-on-click-modal="false"
+      :modal-append-to-body="false" :modal="false">
+      <div class="diaddStyle">
+        <el-table ref="multipleTable" :data="checkLists" border
+          :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+          <el-table-column label="动态" width="220">
+            <template slot-scope="scope">
+              {{
+        scope.row.operationDescribtion
+      }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="时间" />
+          <el-table-column prop="name" label="操作人" />
+          <el-table-column prop="remark" label="其他信息" />
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="checkDIa = false">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getBeeInfo, getShopList, getBeeData, activeGetProducts, activExamine, activeLiquidation, activeGetExamines } from '@/api/active/active_bee.js'
+import DetailComponent from '@/views/active/component/detail.vue'
+export default {
+  props: {
+    beeData: {
+      typeof: Object,
+      default: {}
+    },
+    activclean: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: {
+    // List,
+    DetailComponent
+  },
+  created() {
+    const { currencyId } = this.beeData;
+    this.shopQuery.currencyId = currencyId;
+    this.chartQuery.currencyId = currencyId;
+    //  请求活动具体信息
+    this.getBeeInfoList()
+    //  请求店铺数据
+    this.getShopAll();
+    //  请求活动的数据
+    this.getBeeDataList()
+  },
+  data() {
+    return {
+      activeName: 'first',
+      //  活动详情渲染
+      form: {},
+      //  活动参与的店铺查询参数
+      shopQuery: {
+        currencyId: null,
+        shopName: "",
+        shopCode: "",
+        state: "",
+        page: 1,
+        pageSize: 10
+      },
+      //  参与店铺的数据
+      tableData: [],
+      //  店铺总数
+      tableTotal: 0,
+      //  活动数据
+      infoList: [
+        { name: '', value: '', fields: 'money' }
+      ],
+      //  获取活动数据的参数
+      chartQuery: {
+        currencyId: null,
+        page: 1,
+        pageSize: 10
+      },
+      //  查看当前店铺下参与的商品弹框
+      foodsDia: false,
+      //  查看当前店铺下参与的商品列表
+      tableProducts: [],
+      //  用于判断是审核还是清退
+      checkObj: {},
+      addform: {
+        signId: '', // 报名id
+        state: '1', // 审核状态 1-报名成功 2-报名失败
+        remark: '' // 备注
+      },
+      //  活动数据类表格
+      activityTable: [],
+      chartTotal: 1,
+      chartQuery: {
+        page: 1,
+        pageSize: 10
+      },
+      // 审核记录列表
+      checkLists: [],
+      // 审核记录弹窗
+      checkDIa: false,
+    }
+  },
+  methods: {
+    //  请求活动详情
+    async getBeeInfoList() {
+      try {
+        let res = await getBeeInfo(this.shopQuery.currencyId);
+        this.form = res.data;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    //  获取活动参与的店铺
+    async getShopAll() {
+      try {
+        let res = await getShopList(this.shopQuery);
+        this.tableData = res.data.list;
+        this.tableTotal = res.data.total;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    //  获取活动参数的数据
+    async getBeeDataList() {
+      try {
+        let res = await getBeeData(this.chartQuery);
+        this.infoList = this.formateInfoList(res)
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    //  分页数据修改
+    handleSizeChange(val) {
+      this.shopQuery.pageSize = val;
+      this.getShopAll();
+    },
+    //  数据条数修改
+    handleCurrentChange(val) {
+      this.shopQuery.page = val;
+      this.getShopAll();
+    },
+    //  查询店铺数据
+    search() {
+      this.getShopAll()
+    },
+    //  查看商品
+    async seeMore(row) {
+      let res = await activeGetProducts({
+        signId: row.signId,
+        page: 1,
+        pageSize: 10
+      })
+      this.tableProducts = res.data.list;
+      // console.log(this.tableProducts);
+      // console.log(res)
+      this.foodsDia = true;
+    },
+    //  审核
+    examine(row) {
+      this.addform.signId = row.signId
+      this.checkObj = {
+        title: '审核',
+        show: true,
+        arr: row,
+        type: 1
+      }
+    },
+    // 清退
+    async liquidation(row) {
+      this.checkObj = {
+        title: '清退',
+        show: true,
+        arr: row,
+        type: 2
+      }
+    },
+    //  确定
+    async enter() {
+      if (this.checkObj.type === 1) {
+        const res = await activExamine(this.addform)
+        if (res.code == '') {
+          this.$message({
+            message: '处理成功',
+            type: 'success'
+          })
+          this.checkObj.show = false
+          this.getShopAll()
+        }
+      } else {
+        const res = await activeLiquidation({
+          signId: this.checkObj.arr.signId
+        })
+        if (res.code === '') {
+          this.$message({
+            message: '清退成功',
+            type: 'success'
+          })
+          this.checkObj.show = false
+          this.getShopAll()
+        }
+      }
+    },
+    // 格式化卡片统计渲染
+    formateInfoList(res) {
+      return [
+        {
+          name: '浏览量',
+          value: res.data.visit || 0
+        },
+        {
+          name: '支付订单数',
+          value: res.data.orders || 0
+        },
+        {
+          name: '	支付买家数',
+          value: res.data.pays || 0
+        },
+        {
+          name: '支付转化率',
+          value: res.data.conversion || 0
+        },
+        {
+          name: '参与商家数',
+          value: res.data.shops || 0
+        },
+        {
+          name: '参与商品数',
+          value: res.data.products || 0
+        },
+        {
+          name: '活动成交金额',
+          value: res.data.total || 0
+        }
+      ]
+    },
+    formateTableList(res) {
+      if (!Array.isArray(res)) {
+        return res
+      }
+      return res.map((item) => ({
+        shopName: item.shopName,
+        shopCode: item.shopCode,
+        products: item.products,
+        persons: item.persons,
+        orders: item.orders,
+        finish: item.finish,
+        total: item.total
+      }))
+    },
+    // 审核记录
+    async checkList(row) {
+      this.checkDIa = true
+      const res = await activeGetExamines({
+        only: `${row.shopId}-${row.currencyId}-${row.signId}`
+      })
+      this.checkLists = res.data
+    },
+  },
+  watch: {
+    activclean(newVal, oldVal) {
+      if (!newVal) {
+        this.activeName = 'first'
+        const defaultShopQuery = {
+          shopName: "",
+          shopCode: "",
+          state: "",
+          page: 1,
+          pageSize: 10
+        };
+        this.shopQuery = { ...this.shopQuery, ...defaultShopQuery }
+        return
+      }
+      const { currencyId } = this.beeData;
+      this.shopQuery.currencyId = currencyId;
+      this.chartQuery.currencyId = currencyId;
+      //  请求店铺数据
+      this.getShopAll();
+      //  请求活动的数据
+      this.getBeeDataList()
+      //  请求活动详情
+      this.getBeeInfoList()
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+//@import url(); 引入公共css类
+@import url("../../../../styles/elDialog.scss");
+
+.pending {
+  padding: 30px;
+}
+
+.fenye {
+  margin-top: 20px;
+}
+
+.diaddStyle {
+  .text {
+    text-align: center;
+  }
+}
+
+.detail_title {
+  font-size: 22px;
+  color: #333333;
+  position: relative;
+  margin: 50px 20px 20px;
+
+  &:before {
+    content: "";
+    display: block;
+    position: absolute;
+    top: 5px;
+    left: -20px;
+    width: 4px;
+    height: 24px;
+    background-color: #3a68f2;
+  }
+}
+
+.detail_text {
+  padding: 0 120px;
+
+  //  font-size: 16px;
+  .text {
+    color: #666666;
+    line-height: 40px;
+    margin-left: 20px;
+  }
+
+  .Margin {
+    margin-left: 90px;
+  }
+}
+
+.shop_info {
+  overflow: hidden;
+
+  .shopInfo_left {
+    float: left;
+  }
+}
+
+.mf {
+  margin-left: 20px;
+
+  .el-tag {
+    margin-bottom: 20px;
+  }
+}
+
+// radio默认选中修改颜色
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #409EFF !important;
+}
+</style>

src/views/active/beeCoin/component/AddActive.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="edit_add_page">
         <div class="content">
-            <el-form ref="form" :model="form" label-width="100px" :rules="formRules">
+            <el-form ref="form" :model="form" label-width="150px" :rules="formRules">
                 <h2>基础信息</h2>
                 <br>
                 <el-form-item label="活动名称:" prop="currencyName">
@@ -31,15 +31,15 @@
                 <el-form-item v-if="form.ifBond === 1" label="保证金金额:">
                     <el-input v-model="form.bondMoney" maxlength="9" placeholder="请输入活动保证金金额" :disabled="unStart" />
                 </el-form-item>
-                <h2>优惠规则</h2>
+                <h2>赠送规则</h2>
                 <br>
-                <el-form-item label="设置规则:">
+                <el-form-item label="设置赠送规则:">
                     <el-radio-group v-model="form.setRules" @input="setRulesChange">
                         <el-radio :label="1" :disabled="unStart">比例金额</el-radio>
                         <el-radio :label="2" :disabled="unStart">固定金额</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="优惠比例:" prop="currencyMoney">
+                <el-form-item label="赠送比例/赠送金额:" prop="currencyMoney">
                     <el-input-number v-model="form.currencyMoney" :disabled="unStart" :min="0"
                         :max="form.setRules === 1 ? 100 : 9999"></el-input-number>
                     <span style="margin-left: 20px; font-size: 16px;" v-if="form.setRules === 1">单位为%</span>

src/views/active/beeCoin/index.vue

@@ -26,26 +26,13 @@
         :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%"
       >
         <el-table-column prop="currencyName" label="活动名称" width="220" />
-        <el-table-column prop="remark" label="活动内容" align="center" />
-        <!-- <el-table-column label="营销方式">
-          <template slot-scope="scope">
-            <span v-if="scope.row.discountMode == 1">满减</span>
-            <span v-if="scope.row.discountMode == 2">优惠券</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column label="报名时间" align="center">
-          <template slot-scope="scope">
-            <span>{{  `${scope.row.signStartTime}~${scope.row.signEndTime}` }}</span>
-          </template>
+        <el-table-column prop="content" label="活动内容" align="center" />
+        <el-table-column prop="shops" label="参与商家数" align="center" />
+        <el-table-column prop="products" label="商品数量" align="center" />
+        <el-table-column label="报名时间" align="center" prop="signTime">
         </el-table-column>
-        <el-table-column label="活动起止时间" align="center">
-          <template slot-scope="scope">
-            <span>{{  `${scope.row.startTime}~${scope.row.endTime}` }}</span>
-          </template>
+        <el-table-column label="活动起止时间" align="center" prop="time">
         </el-table-column>
-        <!-- <el-table-column prop="shops" label="商家数" align="center" /> -->
-        <!-- <el-table-column prop="products" label="商品数量" align="center" /> -->
-        <el-table-column prop="bondMoney" label="保证金" align="center" />
         <el-table-column label="活动状态" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.state == 0">报名未开始</span>
@@ -55,6 +42,7 @@
             <span v-if="scope.row.state == 4">活动已结束</span>
           </template>
         </el-table-column>
+        <!-- <el-table-column prop="createTime" label="创建时间" width="220" /> -->
         <el-table-column label="操作" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <div class="btnList">
@@ -89,20 +77,20 @@
       :close-on-click-modal="false"
       @close="cleanForm('activityDetailVisible')"
     >
-      <ActivityDetail :activity-id="activityForm.seckillId" />
+      <ActivityDetail :beeData="activityForm" :activclean="activityDetailVisible" />
     </el-dialog>
   </div>
 </template>
 
 <script>
 import AddActive from '@/views/active/beeCoin/component/AddActive.vue'
-import ActivityDetail from '@/views/active/seckilllist/seckillDetail.vue'
+import ActivityDetail from '@/views/active/beeCoin/component/ActivityDetail.vue'
 // import {
 //   getSeckillData,
 //   endSeckillData,
 //   delSeckillData
 // } from '@/api/active/active_seckill.js'
-import { getBeeList,stopBee} from '@/api/active/active_bee.js'
+import { getBeeList,stopBee,beeDelete} from '@/api/active/active_bee.js'
 export default {
   components: {
     AddActive,
@@ -211,7 +199,7 @@ export default {
       }
     },
     async delActivity(row) {
-      const res = await delSeckillData({ seckillId: row.seckillId })
+      const res = await beeDelete(row.currencyId)
       if (res.code === '') {
         this.$message({
           message: '删除成功',
@@ -222,6 +210,7 @@ export default {
     },
     cleanForm(attr) {
       this[attr] = false
+      // console.log(attr);
     },
     refersh(attr) {
       this[attr] = false

src/views/active/beeCoin/module.js

@@ -1,8 +1,8 @@
 function Form() {
-  this.currencyName = '测试活动1'
+  this.currencyName = ''
   this.currencyMoney = 0,
   this.setRules = 1,
-  this.remark = '活动周期1！！！！'
+  this.remark = ''
   this.ifAdd = 0
   this.ifBond = 0 // 活动保证金
   this.bondMoney = '' // 保证金金额

src/views/business/businessList/index.vue

@@ -96,10 +96,21 @@
                 <el-form-item label="店铺名称" prop="shopName">
                   <el-input v-model="ruleForm.shopName" maxlength="20" :disabled="disabled" />
                 </el-form-item>
+                <el-form-item label="是否支持交易金" prop="isBeeCoin">
+                  <el-radio-group v-model="ruleForm.isBeeCoin">
+                    <el-radio :disabled="disabled" :label="1">
+                      支持
+                    </el-radio>
+                    <el-radio :disabled="disabled" :label="2">
+                      不支持
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
                 <el-form-item label="商家交易金提现比例" prop="beeCoinRatio">
-                  <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家交易金提现比例"
-                    style="width: 50%" />
-                  <span style="margin-left: 10px;">：1</span>
+                  <!-- <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家交易金提现比例"
+                    style="width: 50%" /> -->
+                    <el-input-number v-model="ruleForm.beeCoinRatio" :precision="2" :step="0.01" :max="1"></el-input-number>
+                  <span style="margin-left: 10px;">比例*100</span>
                 </el-form-item>
                 <el-form-item label="店铺负责人" prop="chargePersonName">
                   <el-input v-model="ruleForm.chargePersonName" maxlength="20" :disabled="disabled" />
@@ -358,6 +369,7 @@ export default {
         effectiveYear: '', // 生效年限
         contractState: 1, // 合同状态 1-有效 0-无效
         auditLive: 1,
+        isBeeCoin:2,
         auditLiveProduct: 1,
         shopPhone: '', // 账号
         shopPassword: '', // 密码
@@ -378,7 +390,8 @@ export default {
 
       rulesInfo: {
         beeCoinRatio: [
-          { required: true, message: '请输入商家交易金提现比例', trigger: 'blur' }
+          { required: true, message: '请输入商家交易金提现比例', trigger: 'blur' },
+          
         ],
         effectiveYear: [
           { required: true, message: '请输入生效时限', trigger: 'blur' }
@@ -389,6 +402,9 @@ export default {
         chargePersonName: [
           { required: true, message: '请输入店铺负责人', trigger: 'blur' }
         ],
+        isBeeCoin: [
+          { required: true, message: '请选择是否支持交易金', trigger: 'blur' }
+        ],
         chargePersonPhone: [
           { required: true, message: '请输入负责人电话', trigger: 'blur' },
           {
@@ -578,6 +594,7 @@ export default {
         isVoucher: 1, // 是否支持代金卷 1 true 2 false
         contractState: 1, // 合同状态 1-有效 0-无效
         auditLive: 1,
+        isBeeCoin:2,
         auditLiveProduct: 1,
         shopPhone: '', // 账号
         shopPassword: '', // 密码

src/views/customer/customerMage/index.vue

@@ -196,12 +196,12 @@ export default {
     },
     // 查询标签
     searchTips() {
-      console.log(this.tipsForm)
+      // console.log(this.tipsForm)
       this.getSelect({ labelName: this.tipsForm.labelName })
     },
     // 打标签
     async saveTips(row) {
-      console.log(this.checkList)
+      // console.log(this.checkList)
       const res = await customerSaveUserLabel({
         buyerUserId: this.buyerUserId,
         buyerLabelIds: this.checkList
@@ -218,7 +218,7 @@ export default {
     // 加入黑名单
     addBlackList(row) {
       //  "ifBlack": "是否加入黑名单 1-是 0-否"
-      console.log(row.ifBlack)
+      // console.log(row.ifBlack)
       this.$confirm(
         `${row.ifBlack
           ? '确认是否取消黑名单'

src/views/finance/application/index.vue

@@ -30,8 +30,8 @@
       <!--  表格 -->
       <div class="content_table">
         <div class="table">
-          <el-table :data="tableData" v-loading="tableLoading" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }"
-            style="width: 100%">
+          <el-table :data="tableData" v-loading="tableLoading" border
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" style="width: 100%">
             >
             <el-table-column prop="orderSn" label="流水号"></el-table-column>
             <el-table-column prop="name" label="用户名称" />
@@ -129,7 +129,8 @@
         </el-table>
       </div>
       <div class="dialog-pagination">
-        <el-pagination layout="prev, pager, next" :total="waterData.length" :page-size="5" @current-change="waterChange">
+        <el-pagination layout="prev, pager, next" :total="waterData.length" :page-size="5"
+          @current-change="waterChange">
         </el-pagination>
       </div>
     </el-dialog>
@@ -160,7 +161,7 @@ export default {
       total: 1,
       tableData: [],
       //  控制表格的加载
-      tableLoading:true,
+      tableLoading: true,
       infoList: [
         { name: '手机号码', value: '', fields: 'phone' },
         { name: '银行名称', value: '', fields: 'bankName' },
@@ -186,7 +187,7 @@ export default {
         page: 1,
         pageSize: 5,
         // buyerUserId: ""
-        acquirerId:""
+        acquirerId: ""
       },
       watherFlag: true
     }
@@ -266,15 +267,26 @@ export default {
         this.$message.success('确认信息成功，请确认打款')
         this.confirmInfo = "确认打款";
       } else if (index === 1 && this.confirmInfo == "确认打款") {
-        const res = await applicationHandle({
-          withdrawalId: this.dioObj.arr.withdrawalId,
-          state: 3
+        this.$confirm('此操作将把款项打给用户, 是否继续?', '打款', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          const res = await applicationHandle({
+            withdrawalId: this.dioObj.arr.withdrawalId,
+            state: 3
+          });
+          if (res.code === '') {
+            this.$message.success('确认打款成功')
+            this.dioObj.show = false
+            this.getAll(this.formInline)
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消打款'
+          });
         });
-        if (res.code === '') {
-          this.$message.success('确认打款成功')
-          this.dioObj.show = false
-          this.getAll(this.formInline)
-        }
       } else if (index === 2) {
         if (this.rejectReason == "") {
           this.$prompt('请输入拒绝打款理由', '提示', {
@@ -317,10 +329,10 @@ export default {
     },
 
     //  通联确认
-    async confirmTong(item){
+    async confirmTong(item) {
       let obj = {
-        orderSn:item.orderSn,
-        withdrawalId:item.withdrawalId
+        orderSn: item.orderSn,
+        withdrawalId: item.withdrawalId
       }
       try {
         let res = await getTonglian(obj);
@@ -329,7 +341,7 @@ export default {
           this.getAll(this.formInline)
         }
       } catch (error) {
-        
+
       }
     },
     // 初始化查询所有数据
@@ -359,7 +371,7 @@ export default {
       }
     },
     //  表格分页
-    waterChange(e){
+    waterChange(e) {
       this.watherParameter.page = e
       this.getWatherTable(this.watherParameter.acquirerId)
     },
@@ -419,7 +431,8 @@ export default {
     }
   }
 }
-.dialog-pagination{
+
+.dialog-pagination {
   display: flex;
   align-items: center;
   justify-content: center;