From d558c99018d81eec2f3f08a6e57fad3990453719 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 4 Dec 2024 13:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AC=E7=9B=98=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/disc-spinning.js                      |    2 +-
 src/components/ali-oss-upload.vue             |   92 +
 .../finance/components/pop-add-zhuanpan.vue   |   75 +-
 src/views/finance/financeList.vue             | 1539 +++++++++--------
 src/views/mission/mission.vue                 |    1 -
 5 files changed, 938 insertions(+), 771 deletions(-)
 create mode 100644 src/components/ali-oss-upload.vue

diff --git a/src/api/disc-spinning.js b/src/api/disc-spinning.js
index 9871725..536c1bb 100644
--- a/src/api/disc-spinning.js
+++ b/src/api/disc-spinning.js
@@ -27,7 +27,7 @@ function get(id) {
         params: data
     })
 }
-function update(updatedata) {
+function update(data) {
     return $http({
         url: 'discSpinning/updateDiscSpinning',
         method: 'post',
diff --git a/src/components/ali-oss-upload.vue b/src/components/ali-oss-upload.vue
new file mode 100644
index 0000000..0836a61
--- /dev/null
+++ b/src/components/ali-oss-upload.vue
@@ -0,0 +1,92 @@
+<template>
+  <el-upload
+    class="avatar-uploader"
+    v-model="url"
+    action=""
+    :auto-upload="false"
+    :http-request="onFileSubmit"
+    :onChange="onFileChange"
+    :show-file-list="false"
+  >
+    <video
+      v-if="url"
+      :src="url"
+      class="avatar"
+      controls="controls"
+      style="width: 200px; height: 148px"
+    >
+      您的浏览器不支持视频播放
+    </video>
+    <i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
+    <el-progress
+      type="circle"
+      v-if="percentage > 0 && percentage <= 100"
+      :percentage="percentage"
+      color="#efefef"
+    ></el-progress>
+  </el-upload>
+</template>
+<script>
+import OSS from "@/utils/oss-upload.js";
+import { $getCredentials } from "@/api/oss.js";
+export default {
+  data() {
+    return {
+      url: "",
+      ossClient: undefined,
+      percentage: 0,
+    };
+  },
+  mounted() {
+    this.initOssClient();
+  },
+  methods: {
+    async onFileChange(data) {
+      console.log(data);
+      const date = new Date();
+      const start =
+        date.getFullYear() +
+        "" +
+        (date.getMonth() * 1 + 1) +
+        "" +
+        date.getDate();
+      const houzhui = "." + data.name.substr(data.name.lastIndexOf(".") + 1);
+      const name = start + "/" + getUUID() + houzhui;
+      const fileRes = await this.ossClient.partUpload(name, data.raw, (p) => {
+        this.percentage = Math.floor(p * 100);
+        // 这里可以根据进度做相应的处理，例如更新UI等
+      });
+      console.log(fileRes);
+      if (!fileRes) {
+        this.percentage = 0;
+        this.$notify({
+          title: "失败",
+          message: `上传阿里云失败`,
+          type: "error",
+        });
+        return;
+      }
+      if (fileRes.name == "cancel") {
+        return;
+      }
+      this.url = fileRes.replace(
+        "https://djvideo.oss-cn-shanghai.aliyuncs.com/",
+        "https://duanju.hnsiyao.cn/"
+      );
+    },
+    onFileSubmit(data) {
+      console.log("data");
+      console.log(data);
+    },
+    async initOssClient() {
+      console.log("initOssClient");
+      const { data } = await $getCredentials();
+      if (data.code == 0) {
+        const res = data.data;
+        console.log(res);
+        this.ossClient = new OSS({ ...res, stsToken: res.securityToken });
+      }
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/finance/components/pop-add-zhuanpan.vue b/src/views/finance/components/pop-add-zhuanpan.vue
index 7ce44a0..30f6612 100644
--- a/src/views/finance/components/pop-add-zhuanpan.vue
+++ b/src/views/finance/components/pop-add-zhuanpan.vue
@@ -7,21 +7,21 @@
     :close-on-click-modal="true"
   >
     <el-form :model="form" label-width="100px">
-      <el-form-item label="描述">
+      <el-form-item label="名称" required>
         <el-input v-model="form.name"></el-input>
       </el-form-item>
       <el-form-item label="类型" required>
         <el-radio-group v-model="form.type">
-            <el-radio label="1">谢谢惠顾</el-radio>
-            <el-radio label="2">红包</el-radio>
-            <el-radio label="9">其他</el-radio>
+          <el-radio :label="1">谢谢惠顾</el-radio>
+          <el-radio :label="2">红包</el-radio>
+          <el-radio :label="3">物品</el-radio>
+          <!-- <el-radio label="9">其他</el-radio> -->
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="红包金额比例" v-if="form.type=='2'">
-        <el-input-number v-model="form.ratio"></el-input-number>
-      </el-form-item>
-      <el-form-item label="中奖概率" v-if="form.type=='2'">
-        <el-input-number v-model="form.odds"></el-input-number>
+
+      <el-form-item label="中奖概率" required>
+        <el-input-number :min="0" :max="100" v-model="form.odds"></el-input-number>
+        <span>%</span>
       </el-form-item>
       <el-form-item label="图片上传">
         <el-upload
@@ -32,11 +32,7 @@
           :on-success="uploadSuccess"
         >
           <div class="upload-file-box">
-            <img
-              v-if="form.url"
-              :src="form.url"
-              class="avatar"
-            />
+            <img v-if="form.url" :src="form.url" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon iconss"></i>
           </div>
         </el-upload>
@@ -61,9 +57,8 @@ export default {
       form: {
         name: "",
         url: "",
-        ratio:1,
-        type:'1',
-        odds:0
+        type: 1,
+        odds: 0,
       },
     };
   },
@@ -72,18 +67,36 @@ export default {
       this.form.url = file.data;
     },
     open(item) {
+      console.log(item);
       this.dialogVisible = true;
       this.item = item;
+      this.form = {
+        ...item,
+      };
     },
     diaClose() {
       this.dialogVisible = false;
+      this.form = {
+        name: "",
+        url: "",
+        type: 1,
+        odds: 0,
+      };
     },
     async confirm() {
       if (!this.form.name) {
-        return this.$message.error("描述不能为空");
+        return this.$message.error("名称不能为空");
+      }
+      if (this.form.odds === "") {
+        return this.$message.error("中奖概率不能为空！");
+      }
+      const { name, url, type, odds, id } = this.form;
+      const { data } = await $disc.update({ name, url, type, odds, id });
+      if (data.code == 0) {
+        this.$message.success("修改成功");
+        this.$emit("refresh");
+        this.diaClose();
       }
-      const res = await $disc.add(this.form);
-      console.log(res);
     },
   },
 };
@@ -95,13 +108,19 @@ export default {
 ::v-deep .el-form-item__label {
   text-align: left;
 }
-.upload-file-box{
-    border-radius: 6px; width: 148px; height: 148px;
-    display: flex; justify-content: center; align-items: center;
-    overflow: hidden;
-    border: 1px solid #c0c4cc;
-    img{
-        width: 100%; height: 100%; object-fit: cover;
-    }
+.upload-file-box {
+  border-radius: 6px;
+  width: 148px;
+  height: 148px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  border: 1px solid #c0c4cc;
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/finance/financeList.vue b/src/views/finance/financeList.vue
index 07208cc..baa5162 100644
--- a/src/views/finance/financeList.vue
+++ b/src/views/finance/financeList.vue
@@ -1,67 +1,624 @@
 <template>
   <div>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="提现管理" name="first">
-      <div style="margin: 5px; display: inline-block">
-        <div style="position: relative; display: inline-block">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="提现管理" name="first">
+        <div style="margin: 5px; display: inline-block">
+          <div style="position: relative; display: inline-block">
+            <span>状态：</span>
+            <el-select
+              v-model="stateTx"
+              style="width: 150px; margin: 10px"
+              @change="phoneSelect()"
+            >
+              <el-option
+                v-for="item in statesTx"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option> </el-select
+            >&nbsp;&nbsp;&nbsp;&nbsp;
+          </div>
+          <div style="position: relative; display: inline-block">
+            <span>类型：</span>
+            <el-select
+              v-model="typeTx"
+              style="width: 150px; margin: 10px"
+              @change="phoneSelect()"
+            >
+              <el-option
+                v-for="item in typeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option> </el-select
+            >&nbsp;&nbsp;&nbsp;&nbsp;
+          </div>
+          <div style="position: relative; display: inline-block">
+            <span>支付宝账号：</span>
+            <el-input
+              style="width: 200px"
+              @keydown.enter.native="phoneSelect"
+              placeholder="请输入支付宝账号"
+              v-model="zhifubao"
+            ></el-input
+            >&nbsp;&nbsp;
+            <span
+              @click="phoneSelect"
+              style="position: absolute; right: 18px; top: 8px"
+            >
+              <icon-svg
+                name="shousuo"
+                class="site-sidebar__menu-icon"
+              ></icon-svg>
+            </span>
+          </div>
+          <div style="position: relative; display: inline-block">
+            <span>支付宝名称：</span>
+            <el-input
+              style="width: 200px"
+              @keydown.enter.native="phoneSelect"
+              placeholder="请输入支付宝名称"
+              v-model="zhifubaoName"
+            ></el-input
+            >&nbsp;&nbsp;
+            <span
+              @click="phoneSelect"
+              style="position: absolute; right: 18px; top: 8px"
+            >
+              <icon-svg
+                name="shousuo"
+                class="site-sidebar__menu-icon"
+              ></icon-svg>
+            </span>
+          </div>
+          <div style="position: relative; display: inline-block">
+            <span>用户昵称：</span>
+            <el-input
+              style="width: 200px"
+              @keydown.enter.native="phoneSelect"
+              placeholder="请输入用户昵称"
+              v-model="userName"
+            ></el-input
+            >&nbsp;&nbsp;
+            <span
+              @click="phoneSelect"
+              style="position: absolute; right: 18px; top: 8px"
+            >
+              <icon-svg
+                name="shousuo"
+                class="site-sidebar__menu-icon"
+              ></icon-svg>
+            </span>
+          </div>
+          <div style="position: relative; display: inline-block">
+            <span>分销商昵称：</span>
+            <el-input
+              style="width: 200px"
+              @keydown.enter.native="phoneSelect"
+              placeholder="请输入分销商昵称"
+              v-model="sysUserName"
+            ></el-input
+            >&nbsp;&nbsp;
+          </div>
+
+          <div style="margin: 5px; display: inline-block">
+            <span>开始时间：</span>
+            <el-date-picker
+              style="width: 160px; margin-left: 10px"
+              v-model="startTime"
+              align="right"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始时间"
+            >
+            </el-date-picker>
+          </div>
+          <div style="margin: 5px; display: inline-block">
+            <span>截止时间：</span>
+            <el-date-picker
+              style="width: 160px; margin-left: 10px"
+              v-model="endTime"
+              align="right"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="选择截止时间"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+        <div style="display: inline-block">
+          <el-button
+            style="margin: 10px"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="phoneSelect"
+            >查询
+          </el-button>
+          <el-button
+            style="margin: 10px"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="cleans2"
+            >重置
+          </el-button>
+          <el-button
+            style="margin: 0 0 20px 20px"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="transferClcik()"
+            :disabled="
+              checkBoxData.length <= 0 || !isAuth('financeList:transfer')
+            "
+          >
+            批量转账
+          </el-button>
+          <el-button
+            style="margin-left: 15px"
+            size="mini"
+            type="warning"
+            icon="document"
+            @click="exportBtn"
+            >导出Excel
+          </el-button>
+        </div>
+        <div style="color: orange">
+          *
+          导出提示：导出数据前请进行时间或者状态等筛选，否则导出数据量过多易出现卡顿或系统崩溃
+        </div>
+        <el-table
+          @selection-change="changeFun"
+          v-loading="tableDataLoading"
+          :data="tableData"
+        >
+          <el-table-column type="selection"> </el-table-column>
+          <el-table-column fixed prop="id" label="编号" width="80">
+          </el-table-column>
+          <el-table-column prop="zhifubao" label="用户昵称" width="150">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.userType == 1"
+                @click="updates(scope.row.userId)"
+                >{{ scope.row.userName ? scope.row.userName : "未绑定" }}</span
+              >
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="userType" label="类型" width="150">
+            <template slot-scope="scope">
+              <span v-if="scope.row.userType == 1">用户</span>
+              <span v-if="scope.row.userType == 2">分销商</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="zhifubao" label="分销商昵称" width="150">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.userType == 2"
+                @click="updatesF(scope.row.sysUserId)"
+                >{{
+                  scope.row.sysUserName ? scope.row.sysUserName : "未绑定"
+                }}</span
+              >
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="zhifubao" label="支付宝账号" width="150">
+            <template slot-scope="scope">
+              <span style="color: #4f9dec; cursor: pointer">{{
+                scope.row.zhifubao ? scope.row.zhifubao : "未绑定"
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="zhifubaoName" label="支付宝名称" width="100">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.zhifubaoName ? scope.row.zhifubaoName : "null"
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="orderNumber" label="转账订单号" width="150">
+          </el-table-column>
+          <el-table-column prop="money" label="提现金额" width="100">
+          </el-table-column>
+          <el-table-column prop="state" label="状态" width="100">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.state == 0"
+                >待转账</span
+              >
+              <span v-if="scope.row.state == 1">已转账</span>
+              <span v-if="scope.row.state == -1">已拒绝</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="refund" label="拒绝原因" width="220">
+          </el-table-column>
+          <el-table-column prop="createAt" label="申请时间" width="170">
+          </el-table-column>
+          <el-table-column prop="outAt" label="转账/拒绝时间" width="180">
+          </el-table-column>
+
+          <el-table-column fixed="right" label="操作" width="150">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="primary"
+                :disabled="
+                  !isAuth('financeList:transfer') || scope.row.state != 0
+                "
+                @click="batch(scope.row)"
+                >转账
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                :disabled="
+                  !isAuth('financeList:refund') || scope.row.state != 0
+                "
+                @click="refund(scope.row)"
+                >拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="totalnum"
+          >
+          </el-pagination>
+        </div>
+        <!-- 拒绝弹框 -->
+        <el-dialog title="拒绝" :visible.sync="dialogFormVisible" center>
+          <el-form :model="form">
+            <el-form-item label="拒绝原因：" :label-width="formLabelWidth">
+              <el-input
+                v-model="form.content"
+                type="textarea"
+                rows="4"
+                placeholder="请输入拒绝原因"
+                style="width: 65%"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="refundNoticeTo()"
+              >确 定</el-button
+            >
+          </div>
+        </el-dialog>
+      </el-tab-pane>
+      <el-tab-pane label="收入统计" name="second">
+        <div>
+          <el-select
+            v-model="flag"
+            style="width: 150px; margin-left: 10px"
+            @change="animeDat"
+          >
+            <el-option
+              v-for="item in flags"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;
+          <el-date-picker
+            style="width: 200px; margin-left: 10px"
+            v-model="info1.stockDate1"
+            align="right"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+            @change="animeSelect"
+          >
+          </el-date-picker>
+        </div>
+        <el-row>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">总收入</div>
+                <div class="text_color">
+                  <span>{{ MoneyData.sumMoney ? MoneyData.sumMoney : 0 }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">短剧收入</div>
+                <div class="text_color">
+                  <span>{{
+                    MoneyData.courseMoney ? MoneyData.courseMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">会员收入</div>
+                <div class="text_color">
+                  <span>{{ MoneyData.vipMoney ? MoneyData.vipMoney : 0 }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane label="提现统计" name="third">
+        <div>
+          <el-select
+            v-model="flag"
+            style="width: 150px; margin-left: 10px"
+            @change="animeDat2"
+          >
+            <el-option
+              v-for="item in flags"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;
+          <el-date-picker
+            style="width: 200px; margin-left: 10px"
+            v-model="info1.stockDate1"
+            align="right"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+            @change="animeSelect2"
+          >
+          </el-date-picker>
+        </div>
+        <el-row>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">累计提现金额</div>
+                <div class="text_color">
+                  <span>{{ withdrawData.sumMoney }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">提现次数</div>
+                <div class="text_color">
+                  <span>{{ withdrawData.countMoney }}</span
+                  >笔
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">待转账次数</div>
+                <div class="text_color">
+                  <span>{{ withdrawData.stayMoney }}</span
+                  >笔
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane label="充值统计" name="sixth">
+        <div>
+          <el-select
+            v-model="flag"
+            style="width: 150px; margin-left: 10px"
+            @change="animeDat3"
+          >
+            <el-option
+              v-for="item in flags"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;
+          <el-date-picker
+            style="width: 200px; margin-left: 10px"
+            v-model="info1.stockDate1"
+            align="right"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+            @change="animeSelect3"
+          >
+          </el-date-picker>
+        </div>
+        <el-row>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">充值总金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.sumMoney ? rechgeData.sumMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">微信APP充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.weiXinAppMoney ? rechgeData.weiXinAppMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">微信公众号充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.weiXinGZHMoney ? rechgeData.weiXinGZHMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">微信小程序充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.weiXinXCXMoney ? rechgeData.weiXinXCXMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">支付APP充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.zhiFuBaoAppMoney
+                      ? rechgeData.zhiFuBaoAppMoney
+                      : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">小程序充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.weiXinXCXMoney ? rechgeData.weiXinXCXMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">支付宝H5充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.zhiFuBaoH5Money ? rechgeData.zhiFuBaoH5Money : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">抖音充值金额</div>
+                <div class="text_color">
+                  <span>{{ rechgeData.dyMoney ? rechgeData.dyMoney : 0 }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">苹果充值金额</div>
+                <div class="text_color">
+                  <span>{{
+                    rechgeData.iosMoney ? rechgeData.iosMoney : 0
+                  }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6" class="cards">
+            <div class="box">
+              <div class="box_num">
+                <div class="box_color">快手充值金额</div>
+                <div class="text_color">
+                  <span>{{ rechgeData.ksMoney ? rechgeData.ksMoney : 0 }}</span
+                  >元
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-tab-pane>
+      <el-tab-pane label="充值记录" name="fourth">
+        <div style="margin: 2% 0; display: inline-block">
           <span>状态：</span>
           <el-select
-            v-model="stateTx"
-            style="width: 150px; margin: 10px"
-            @change="phoneSelect()"
+            v-model="state"
+            placeholder="请选择状态"
+            style="width: 150px"
+            @change="timeDate()"
           >
             <el-option
-              v-for="item in statesTx"
+              v-for="item in states"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             >
-            </el-option> </el-select
-          >&nbsp;&nbsp;&nbsp;&nbsp;
+            </el-option>
+          </el-select>
         </div>
         <div style="position: relative; display: inline-block">
-          <span>类型：</span>
-          <el-select
-            v-model="typeTx"
-            style="width: 150px; margin: 10px"
-            @change="phoneSelect()"
-          >
-            <el-option
-              v-for="item in typeType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option> </el-select
-          >&nbsp;&nbsp;&nbsp;&nbsp;
-        </div>
-        <div style="position: relative; display: inline-block">
-          <span>支付宝账号：</span>
+          <span>充值订单号：</span>
           <el-input
             style="width: 200px"
-            @keydown.enter.native="phoneSelect"
-            placeholder="请输入支付宝账号"
-            v-model="zhifubao"
+            @keydown.enter.native="timeDate"
+            placeholder="请输入充值订单号"
+            v-model="orderId"
           ></el-input
           >&nbsp;&nbsp;
           <span
-            @click="phoneSelect"
-            style="position: absolute; right: 18px; top: 8px"
-          >
-            <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
-          </span>
-        </div>
-        <div style="position: relative; display: inline-block">
-          <span>支付宝名称：</span>
-          <el-input
-            style="width: 200px"
-            @keydown.enter.native="phoneSelect"
-            placeholder="请输入支付宝名称"
-            v-model="zhifubaoName"
-          ></el-input
-          >&nbsp;&nbsp;
-          <span
-            @click="phoneSelect"
+            @click="timeDate"
             style="position: absolute; right: 18px; top: 8px"
           >
             <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
@@ -71,726 +628,221 @@
           <span>用户昵称：</span>
           <el-input
             style="width: 200px"
-            @keydown.enter.native="phoneSelect"
+            @keydown.enter.native="timeDate"
             placeholder="请输入用户昵称"
             v-model="userName"
           ></el-input
           >&nbsp;&nbsp;
           <span
-            @click="phoneSelect"
+            @click="timeDate"
             style="position: absolute; right: 18px; top: 8px"
           >
             <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
           </span>
         </div>
-        <div style="position: relative; display: inline-block">
-          <span>分销商昵称：</span>
-          <el-input
-            style="width: 200px"
-            @keydown.enter.native="phoneSelect"
-            placeholder="请输入分销商昵称"
-            v-model="sysUserName"
-          ></el-input
-          >&nbsp;&nbsp;
-        </div>
-
-        <div style="margin: 5px; display: inline-block">
+        <div style="display: inline-block">
           <span>开始时间：</span>
           <el-date-picker
             style="width: 160px; margin-left: 10px"
             v-model="startTime"
             align="right"
-            type="date"
+            type="datetime"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             placeholder="选择开始时间"
           >
-          </el-date-picker>
-        </div>
-        <div style="margin: 5px; display: inline-block">
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
           <span>截止时间：</span>
           <el-date-picker
             style="width: 160px; margin-left: 10px"
             v-model="endTime"
             align="right"
-            type="date"
+            type="datetime"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             placeholder="选择截止时间"
           >
           </el-date-picker>
+          <el-button
+            style="margin-left: 15px"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="timeDate"
+            >查询
+          </el-button>
+          <el-button
+            style="margin-left: 15px"
+            size="mini"
+            type="primary"
+            icon="document"
+            @click="selectTrigger"
+            >重置
+          </el-button>
         </div>
-      </div>
-      <div style="display: inline-block">
-        <el-button
-          style="margin: 10px"
-          size="mini"
-          type="primary"
-          icon="document"
-          @click="phoneSelect"
-          >查询
-        </el-button>
-        <el-button
-          style="margin: 10px"
-          size="mini"
-          type="primary"
-          icon="document"
-          @click="cleans2"
-          >重置
-        </el-button>
-        <el-button
-          style="margin: 0 0 20px 20px"
-          size="mini"
-          type="primary"
-          icon="document"
-          @click="transferClcik()"
-          :disabled="
-            checkBoxData.length <= 0 || !isAuth('financeList:transfer')
-          "
-        >
-          批量转账
-        </el-button>
-        <el-button
-          style="margin-left: 15px"
-          size="mini"
-          type="warning"
-          icon="document"
-          @click="exportBtn"
-          >导出Excel
-        </el-button>
-      </div>
-      <div style="color: orange">
-        *
-        导出提示：导出数据前请进行时间或者状态等筛选，否则导出数据量过多易出现卡顿或系统崩溃
-      </div>
-      <el-table
-        @selection-change="changeFun"
-        v-loading="tableDataLoading"
-        :data="tableData"
-      >
-        <el-table-column type="selection"> </el-table-column>
-        <el-table-column fixed prop="id" label="编号" width="80">
-        </el-table-column>
-        <el-table-column prop="zhifubao" label="用户昵称" width="150">
-          <template slot-scope="scope">
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.userType == 1"
-              @click="updates(scope.row.userId)"
-              >{{ scope.row.userName ? scope.row.userName : "未绑定" }}</span
-            >
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="userType" label="类型" width="150">
-          <template slot-scope="scope">
-            <span v-if="scope.row.userType == 1">用户</span>
-            <span v-if="scope.row.userType == 2">分销商</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="zhifubao" label="分销商昵称" width="150">
-          <template slot-scope="scope">
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.userType == 2"
-              @click="updatesF(scope.row.sysUserId)"
-              >{{
-                scope.row.sysUserName ? scope.row.sysUserName : "未绑定"
-              }}</span
-            >
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="zhifubao" label="支付宝账号" width="150">
-          <template slot-scope="scope">
-            <span style="color: #4f9dec; cursor: pointer">{{
-              scope.row.zhifubao ? scope.row.zhifubao : "未绑定"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="zhifubaoName" label="支付宝名称" width="100">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.zhifubaoName ? scope.row.zhifubaoName : "null"
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="orderNumber" label="转账订单号" width="150">
-        </el-table-column>
-        <el-table-column prop="money" label="提现金额" width="100">
-        </el-table-column>
-        <el-table-column prop="state" label="状态" width="100">
-          <template slot-scope="scope">
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.state == 0"
-              >待转账</span
-            >
-            <span v-if="scope.row.state == 1">已转账</span>
-            <span v-if="scope.row.state == -1">已拒绝</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="refund" label="拒绝原因" width="220">
-        </el-table-column>
-        <el-table-column prop="createAt" label="申请时间" width="170">
-        </el-table-column>
-        <el-table-column prop="outAt" label="转账/拒绝时间" width="180">
-        </el-table-column>
-
-        <el-table-column fixed="right" label="操作" width="150">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              :disabled="
-                !isAuth('financeList:transfer') || scope.row.state != 0
-              "
-              @click="batch(scope.row)"
-              >转账
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              :disabled="!isAuth('financeList:refund') || scope.row.state != 0"
-              @click="refund(scope.row)"
-              >拒绝
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="text-align: center; margin-top: 10px">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="limit"
-          :current-page="page"
-          layout="total,sizes, prev, pager, next,jumper"
-          :total="totalnum"
-        >
-        </el-pagination>
-      </div>
-      <!-- 拒绝弹框 -->
-      <el-dialog title="拒绝" :visible.sync="dialogFormVisible" center>
-        <el-form :model="form">
-          <el-form-item label="拒绝原因：" :label-width="formLabelWidth">
-            <el-input
-              v-model="form.content"
-              type="textarea"
-              rows="4"
-              placeholder="请输入拒绝原因"
-              style="width: 65%"
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click="refundNoticeTo()">确 定</el-button>
+        <el-table v-loading="tableDataLoading" :data="rechargeData">
+          <el-table-column fixed prop="id" label="编号" width="80">
+          </el-table-column>
+          <el-table-column prop="userName" label="用户昵称">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                @click="updates(scope.row.userId)"
+                >{{ scope.row.userName ? scope.row.userName : "未绑定" }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column prop="orderId" label="充值订单号" width="250">
+          </el-table-column>
+          <el-table-column prop="money" label="充值金额" width="100">
+          </el-table-column>
+          <el-table-column prop="payDiamond" label="钻石价格" width="100">
+          </el-table-column>
+          <el-table-column prop="diamond" label="是否是钻石支付" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.diamond == 1">是</span>
+              <span v-else>否</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="分类" width="120">
+            <template slot-scope="scope">
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 1"
+                >app微信</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 2"
+                >微信公众号</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 3"
+                >微信小程序</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 4"
+                >app支付宝</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 5"
+                >h5支付宝</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 6"
+                >抖音</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 7"
+                >苹果支付</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 8"
+                >快手支付</span
+              >
+              <span
+                style="color: #4f9dec; cursor: pointer"
+                v-if="scope.row.classify == 9"
+                >系统充值</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" width="120">
+            <template slot-scope="scope">
+              <span style="color: #4f9dec" v-if="scope.row.state == 0"
+                >待充值</span
+              >
+              <span style="color: #4f9dec" v-if="scope.row.state == 1"
+                >充值成功</span
+              >
+              <span style="color: #4f9dec" v-if="scope.row.state == 2"
+                >充值失败</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" width="170">
+          </el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="170">
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px">
+          <el-pagination
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="limit"
+            :current-page="page"
+            layout="total,sizes, prev, pager, next,jumper"
+            :total="totalnum2"
+          >
+          </el-pagination>
         </div>
-      </el-dialog>
-    </el-tab-pane>
-    <el-tab-pane label="收入统计" name="second">
-      <div>
-        <el-select
-          v-model="flag"
-          style="width: 150px; margin-left: 10px"
-          @change="animeDat"
-        >
-          <el-option
-            v-for="item in flags"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option> </el-select
-        >&nbsp;&nbsp;&nbsp;
-        <el-date-picker
-          style="width: 200px; margin-left: 10px"
-          v-model="info1.stockDate1"
-          align="right"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间"
-          @change="animeSelect"
-        >
-        </el-date-picker>
-      </div>
-      <el-row>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">总收入</div>
-              <div class="text_color">
-                <span>{{ MoneyData.sumMoney ? MoneyData.sumMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">短剧收入</div>
-              <div class="text_color">
-                <span>{{
-                  MoneyData.courseMoney ? MoneyData.courseMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">会员收入</div>
-              <div class="text_color">
-                <span>{{ MoneyData.vipMoney ? MoneyData.vipMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </el-tab-pane>
-    <el-tab-pane label="提现统计" name="third">
-      <div>
-        <el-select
-          v-model="flag"
-          style="width: 150px; margin-left: 10px"
-          @change="animeDat2"
-        >
-          <el-option
-            v-for="item in flags"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option> </el-select
-        >&nbsp;&nbsp;&nbsp;
-        <el-date-picker
-          style="width: 200px; margin-left: 10px"
-          v-model="info1.stockDate1"
-          align="right"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间"
-          @change="animeSelect2"
-        >
-        </el-date-picker>
-      </div>
-      <el-row>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">累计提现金额</div>
-              <div class="text_color">
-                <span>{{ withdrawData.sumMoney }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">提现次数</div>
-              <div class="text_color">
-                <span>{{ withdrawData.countMoney }}</span
-                >笔
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">待转账次数</div>
-              <div class="text_color">
-                <span>{{ withdrawData.stayMoney }}</span
-                >笔
-              </div>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </el-tab-pane>
-    <el-tab-pane label="充值统计" name="sixth">
-      <div>
-        <el-select
-          v-model="flag"
-          style="width: 150px; margin-left: 10px"
-          @change="animeDat3"
-        >
-          <el-option
-            v-for="item in flags"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option> </el-select
-        >&nbsp;&nbsp;&nbsp;
-        <el-date-picker
-          style="width: 200px; margin-left: 10px"
-          v-model="info1.stockDate1"
-          align="right"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间"
-          @change="animeSelect3"
-        >
-        </el-date-picker>
-      </div>
-      <el-row>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">充值总金额</div>
-              <div class="text_color">
-                <span>{{ rechgeData.sumMoney ? rechgeData.sumMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">微信APP充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.weiXinAppMoney ? rechgeData.weiXinAppMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">微信公众号充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.weiXinGZHMoney ? rechgeData.weiXinGZHMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">微信小程序充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.weiXinXCXMoney ? rechgeData.weiXinXCXMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
+      </el-tab-pane>
 
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">支付APP充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.zhiFuBaoAppMoney ? rechgeData.zhiFuBaoAppMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">小程序充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.weiXinXCXMoney ? rechgeData.weiXinXCXMoney : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">支付宝H5充值金额</div>
-              <div class="text_color">
-                <span>{{
-                  rechgeData.zhiFuBaoH5Money ? rechgeData.zhiFuBaoH5Money : 0
-                }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">抖音充值金额</div>
-              <div class="text_color">
-                <span>{{ rechgeData.dyMoney ? rechgeData.dyMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">苹果充值金额</div>
-              <div class="text_color">
-                <span>{{ rechgeData.iosMoney ? rechgeData.iosMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="6" class="cards">
-          <div class="box">
-            <div class="box_num">
-              <div class="box_color">快手充值金额</div>
-              <div class="text_color">
-                <span>{{ rechgeData.ksMoney ? rechgeData.ksMoney : 0 }}</span
-                >元
-              </div>
-            </div>
-          </div>
-        </el-col>
-      </el-row>
-    </el-tab-pane>
-    <el-tab-pane label="充值记录" name="fourth">
-      <div style="margin: 2% 0; display: inline-block">
-        <span>状态：</span>
-        <el-select
-          v-model="state"
-          placeholder="请选择状态"
-          style="width: 150px"
-          @change="timeDate()"
-        >
-          <el-option
-            v-for="item in states"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div style="position: relative; display: inline-block">
-        <span>充值订单号：</span>
-        <el-input
-          style="width: 200px"
-          @keydown.enter.native="timeDate"
-          placeholder="请输入充值订单号"
-          v-model="orderId"
-        ></el-input
-        >&nbsp;&nbsp;
-        <span
-          @click="timeDate"
-          style="position: absolute; right: 18px; top: 8px"
-        >
-          <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
-        </span>
-      </div>
-      <div style="position: relative; display: inline-block">
-        <span>用户昵称：</span>
-        <el-input
-          style="width: 200px"
-          @keydown.enter.native="timeDate"
-          placeholder="请输入用户昵称"
-          v-model="userName"
-        ></el-input
-        >&nbsp;&nbsp;
-        <span
-          @click="timeDate"
-          style="position: absolute; right: 18px; top: 8px"
-        >
-          <icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
-        </span>
-      </div>
-      <div style="display: inline-block">
-        <span>开始时间：</span>
-        <el-date-picker
-          style="width: 160px; margin-left: 10px"
-          v-model="startTime"
-          align="right"
-          type="datetime"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间"
-        >
-        </el-date-picker
-        >&nbsp;&nbsp;&nbsp;
-        <span>截止时间：</span>
-        <el-date-picker
-          style="width: 160px; margin-left: 10px"
-          v-model="endTime"
-          align="right"
-          type="datetime"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择截止时间"
-        >
-        </el-date-picker>
-        <el-button
-          style="margin-left: 15px"
-          size="mini"
-          type="primary"
-          icon="document"
-          @click="timeDate"
-          >查询
-        </el-button>
-        <el-button
-          style="margin-left: 15px"
-          size="mini"
-          type="primary"
-          icon="document"
-          @click="selectTrigger"
-          >重置
-        </el-button>
-      </div>
-      <el-table v-loading="tableDataLoading" :data="rechargeData">
-        <el-table-column fixed prop="id" label="编号" width="80">
-        </el-table-column>
-        <el-table-column prop="userName" label="用户昵称">
-          <template slot-scope="scope">
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              @click="updates(scope.row.userId)"
-              >{{ scope.row.userName ? scope.row.userName : "未绑定" }}</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="orderId" label="充值订单号" width="250">
-        </el-table-column>
-        <el-table-column prop="money" label="充值金额" width="100">
-        </el-table-column>
-        <el-table-column prop="payDiamond" label="钻石价格" width="100">
-        </el-table-column>
-        <el-table-column prop="diamond" label="是否是钻石支付" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.diamond == 1">是</span>
-            <span v-else>否</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="分类" width="120">
-          <template slot-scope="scope">
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 1"
-              >app微信</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 2"
-              >微信公众号</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 3"
-              >微信小程序</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 4"
-              >app支付宝</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 5"
-              >h5支付宝</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 6"
-              >抖音</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 7"
-              >苹果支付</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 8"
-              >快手支付</span
-            >
-            <span
-              style="color: #4f9dec; cursor: pointer"
-              v-if="scope.row.classify == 9"
-              >系统充值</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" width="120">
-          <template slot-scope="scope">
-            <span style="color: #4f9dec" v-if="scope.row.state == 0"
-              >待充值</span
-            >
-            <span style="color: #4f9dec" v-if="scope.row.state == 1"
-              >充值成功</span
-            >
-            <span style="color: #4f9dec" v-if="scope.row.state == 2"
-              >充值失败</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" width="170">
-        </el-table-column>
-        <el-table-column prop="payTime" label="支付时间" width="170">
-        </el-table-column>
-      </el-table>
-      <div style="text-align: center; margin-top: 10px">
-        <el-pagination
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="limit"
-          :current-page="page"
-          layout="total,sizes, prev, pager, next,jumper"
-          :total="totalnum2"
-        >
-        </el-pagination>
-      </div>
-    </el-tab-pane>
-
-    <el-tab-pane label="抽奖转盘" name="sexth">
-      <div class="">
-        <!-- <el-button type="primary" @click="refAddZhuanpanOpen">添加抽奖项</el-button> -->
-         <el-table :border="true" :data="zhuanpanData">
-           <el-table-column label="名称" prop="name" ></el-table-column>
-           <el-table-column label="类型"  >
+      <el-tab-pane label="抽奖转盘" name="sexth">
+        <div class="">
+          <!-- <el-button type="primary" @click="refAddZhuanpanOpen">添加抽奖项</el-button> -->
+          <el-table :border="true" :data="zhuanpanData">
+            <el-table-column label="名称" prop="name"></el-table-column>
+            <el-table-column label="图片">
+              <template slot-scope="scope">
+                <img style="width: 50px; height: 50px" v-if="scope.row.url" :src="scope.row.url" />
+              </template>
+            </el-table-column>
+            <el-table-column label="类型">
               <template slot-scope="scope">
                 <span>{{ returnTypeName(scope.row.type) }}</span>
               </template>
-           </el-table-column>
-         </el-table>
-      </div>
-    </el-tab-pane>
-  </el-tabs>
+            </el-table-column>
+            <el-table-column label="数量">
+              <template slot-scope="scope">
+                <span>{{ scope.row.number }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="红包金额比例"  >
+              <template slot-scope="scope">
+                <span>{{ scope.row.ratio }}</span>
+              </template>
+           </el-table-column> -->
+            <el-table-column label="中奖概率">
+              <template slot-scope="scope">
+                <span>{{ scope.row.odds }}%</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="编辑">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="refAddZhuanpanOpen(scope.row)"
+                  >编辑</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
 
-  <pop-add-zhuanpan ref="refAddZhuanpan"></pop-add-zhuanpan>
-</div>
+    <pop-add-zhuanpan
+      ref="refAddZhuanpan"
+      @refresh="zhuanPanRefresh"
+    ></pop-add-zhuanpan>
+  </div>
 </template>
 
 <script>
-import $disc from '@/api/disc-spinning.js'
-import popAddZhuanpan from './components/pop-add-zhuanpan.vue'
+import $disc from "@/api/disc-spinning.js";
+import popAddZhuanpan from "./components/pop-add-zhuanpan.vue";
 export default {
-  components:{popAddZhuanpan},
+  components: { popAddZhuanpan },
   data() {
     return {
       //抽奖转盘数据
@@ -919,17 +971,22 @@ export default {
     };
   },
   methods: {
-    returnTypeName(type){
+    zhuanPanRefresh() {
+      this.page = 1;
+      this.limit = 10;
+      this.zhuanPanInit();
+    },
+    returnTypeName(type) {
       const $types = {
-        '1':'谢谢惠顾',
-        '2':'现金红包',
-        '3':'物品',
-      }
-      return $types[type]?$types[type]:''
+        1: "谢谢惠顾",
+        2: "现金红包",
+        3: "物品",
+      };
+      return $types[type] ? $types[type] : "";
     },
     // 转盘添加弹窗show
-    refAddZhuanpanOpen(){
-      this.$refs.refAddZhuanpan.open()
+    refAddZhuanpanOpen(item) {
+      this.$refs.refAddZhuanpan.open(item);
     },
     // 会员详情跳转
     updates(userId) {
@@ -1235,12 +1292,12 @@ export default {
       this.rechargeSelect();
     },
     //转盘数据初始化
-    async zhuanPanInit(){
-      const {data}=await $disc.getList({
-        page:this.page,
-        limit:this.limit
-      })
-      this.zhuanpanData = data.data.records
+    async zhuanPanInit() {
+      const { data } = await $disc.getList({
+        page: this.page,
+        limit: this.limit,
+      });
+      this.zhuanpanData = data.data.records;
     },
     handleClick(tab, event) {
       this.orderId = "";
diff --git a/src/views/mission/mission.vue b/src/views/mission/mission.vue
index c7ac509..c8e9e22 100644
--- a/src/views/mission/mission.vue
+++ b/src/views/mission/mission.vue
@@ -1726,7 +1726,6 @@
 <script>
 import OSS from "@/utils/oss-upload.js";
 import { $getCredentials } from "@/api/oss.js";
-import md5 from "js-md5";
 
 // 加密结果：aa888a86dca6e9d5ae216c23070e8c47
 import { quillEditor } from "vue-quill-editor";