From b9b81a6aa65f88b8327a699ef235199078ae255d Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Mon, 5 May 2025 19:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=9025?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/luckGift/luck25.js                    |  83 +++
 src/views/bravoGift/bravoGiftSet.vue          |   2 +-
 src/views/luckGift/luck25Config.vue           | 700 ++++++++++++++++++
 src/views/luckGift/luck25PersonalData.vue     | 376 ++++++++++
 src/views/luckGift/luck25PlatformData.vue     | 122 +++
 .../{arrange.vue => luckGiftArrange.vue}      |   0
 src/views/luckGift/lucky25Arrange.vue         | 232 ++++++
 src/views/users/GiftManageView.vue            |   6 +-
 8 files changed, 1518 insertions(+), 3 deletions(-)
 create mode 100644 src/api/luckGift/luck25.js
 create mode 100644 src/views/luckGift/luck25Config.vue
 create mode 100644 src/views/luckGift/luck25PersonalData.vue
 create mode 100644 src/views/luckGift/luck25PlatformData.vue
 rename src/views/luckGift/{arrange.vue => luckGiftArrange.vue} (100%)
 create mode 100644 src/views/luckGift/lucky25Arrange.vue

diff --git a/src/api/luckGift/luck25.js b/src/api/luckGift/luck25.js
new file mode 100644
index 0000000..72a53ff
--- /dev/null
+++ b/src/api/luckGift/luck25.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+// 奖池拉框
+export const listType = query => {
+    return request({
+        url: '/admin/lucky25/pool/listType',
+        method: 'get',
+        params: query
+    });
+};
+// 池子列表
+export const list = query => {
+    return request({
+        url: '/admin/lucky25/pool/list',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置
+export const getConfig = query => {
+    return request({
+        url: '/admin/lucky25/config/getConfig',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置-修改
+export const updateSet = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky25/config/update',
+        method: 'post',
+        data: query
+    });
+};
+// 个人数据
+export const personal = query => {
+    return request({
+        url: '/admin/lucky25/record/personal',
+        method: 'get',
+        params: query
+    });
+};
+// 汇总
+export const platform = query => {
+    return request({
+        url: '/admin/lucky25/record/platform',
+        method: 'get',
+        params: query
+    });
+};
+// 保存池子
+export const save = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky25/pool/save',
+        method: 'post',
+        data: query
+    });
+};
+// 赠送用户
+export const updateUserMulti = query => {
+    return request({
+        url: '/admin/lucky25/config/updateUserMulti',
+        method: 'post',
+        params: query
+    });
+};
+// 获取明细
+export const pageRecord = query => {
+    return request({
+        url: '/admin/lucky25/record/page',
+        method: 'get',
+        params: query
+    });
+};
+
+// 导出明细
+export const exportRecord = query => {
+    window.location.href = `/admin/lucky25/record/export?${genQueryParam(query)}`;
+    return;
+};
\ No newline at end of file
diff --git a/src/views/bravoGift/bravoGiftSet.vue b/src/views/bravoGift/bravoGiftSet.vue
index a6c3a3a..86e18da 100644
--- a/src/views/bravoGift/bravoGiftSet.vue
+++ b/src/views/bravoGift/bravoGiftSet.vue
@@ -91,7 +91,7 @@
         </div>
   
         <div class="inquire">
-          <span>幸运24金币库存</span>
+          <span>Bravo金币库存</span>
           <el-input
             v-model="inquire.goldInventory"
             placeholder=""
diff --git a/src/views/luckGift/luck25Config.vue b/src/views/luckGift/luck25Config.vue
new file mode 100644
index 0000000..e97aff9
--- /dev/null
+++ b/src/views/luckGift/luck25Config.vue
@@ -0,0 +1,700 @@
+<template>
+  <div class="box">
+    <div class="condition">
+            <div class="inquire">
+        <span>用户上线列表</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.followErbanNoList"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 11;
+            editDialogTitle = '用户上线列表';
+            value = inquire.followErbanNoList;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+      <div class="inquire">
+        <span>用户W级列表</span>
+        <!-- @input="handleInput" -->
+        <!-- <el-input
+          v-model="inquire.whiteErbanNoProductionRatioMap"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input> -->
+        <el-button class="primary" type="primary" @click="detailsClick">
+          查看详情</el-button
+        >
+      </div>
+      <div class="inquire">
+        <span>用户B级列表</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.blackErbanNoList"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 13;
+            editDialogTitle = '用户B级列表';
+            value = inquire.blackErbanNoList;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="inquire">
+        <span>对比值N</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.comparisonValue"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 1;
+            editDialogTitle = '对比值N';
+            value = inquire.comparisonValue;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>金币库存</span>
+        <el-input
+          v-model="inquire.goldInventory"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 2;
+            editDialogTitle = '金币库存';
+            value = inquire.goldInventory;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>平台抽成</span>
+        <el-input
+          v-model="inquire.platformCommission"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 3;
+            editDialogTitle = '平台抽成';
+            value = inquire.platformCommission;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>用户收益比例</span>
+        <el-input
+          v-model="inquire.userRevenueRatio"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 4;
+            editDialogTitle = '用户收益比例';
+            value = inquire.userRevenueRatio;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>大R数组阈值</span>
+        <el-input
+            v-model="inquire.highRechargeThreshold"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 5;
+            editDialogTitle = '大R数组阈值';
+            value = inquire.highRechargeThreshold;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>比较阈值</span>
+        <el-input
+            v-model="inquire.judgeInputThreshold"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 6;
+            editDialogTitle = '比较阈值';
+            value = inquire.judgeInputThreshold;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>进入保底对比值</span>
+        <el-input
+            v-model="inquire.highPoolEntreProductionRatio"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 15;
+            editDialogTitle = '进入保底对比值';
+            value = inquire.highPoolEntreProductionRatio;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>退出保底对比值</span>
+        <el-input
+            v-model="inquire.highPoolQuitProductionRatio"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 16;
+            editDialogTitle = '退出保底对比值';
+            value = inquire.highPoolQuitProductionRatio;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>进入衰减对比值</span>
+        <el-input
+            v-model="inquire.lowPoolEntreProductionRatio"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 17;
+            editDialogTitle = '进入衰减对比值';
+            value = inquire.lowPoolEntreProductionRatio;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>退出衰减对比值</span>
+        <el-input
+            v-model="inquire.lowPoolQuitProductionRatio"
+            placeholder=""
+            class="input"
+            disabled
+        ></el-input>
+        <el-button
+            class="primary"
+            type="primary"
+            @click="
+            editDialog = true;
+            butClick = false;
+            type = 18;
+            editDialogTitle = '退出衰减对比值';
+            value = inquire.lowPoolQuitProductionRatio;
+          "
+        >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>通知制定金额</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.warnMulti"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 9;
+            editDialogTitle = '通知制定金额';
+            value = inquire.warnMulti;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <!-- <div class="inquire">
+        <span>库存告急通知</span>
+        <el-input
+          v-model="inquire.x"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 10;
+            editDialogTitle = '库存告急通知';
+            value = inquire.x;
+          "
+        >
+          编辑</el-button
+        >
+      </div> -->
+
+
+      <div class="inquire">
+        <span>赠送1000倍奖励</span>
+        <el-button
+          class="primary"
+          type="primary"
+          :disabled="butClick"
+          @click="
+            editDialog = true;
+            type = 12;
+            editDialogTitle = '赠送1000倍奖励';
+            value = inquire.x;
+          "
+        >
+          赠送</el-button
+        >
+      </div>
+    </div>
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 详情弹窗 -->
+    <el-dialog v-model="detailsDialog" title="用户W级列表" width="36%" center>
+      <el-button class="primary" type="primary" @click="addDetail">
+        新增</el-button
+      >
+      <el-table :data="detailsTable" style="width: 100%">
+        <el-table-column label="用户ID">
+          <template v-slot="scope">
+            <el-input
+              v-model="scope.row.userId"
+              type="number"
+              @blur="handleEdit(scope.$index, scope.row)"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="值">
+          <template v-slot="scope">
+            <el-input
+              v-model="scope.row.val"
+              type="number"
+              @blur="handleEdit(scope.$index, scope.row)"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作">
+          <template v-slot="scope">
+            <el-button
+              class="danger"
+              type="danger"
+              @click="delDetail(scope.$index, scope.row)"
+            >
+              删除</el-button
+            >
+          </template>
+        </el-table-column>
+        <!-- 其他列 -->
+      </el-table>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="detailsDialog = false">取消</el-button>
+          <el-button type="primary" :disabled="butClick" @click="sevaDetail()">
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getConfig, updateSet, updateUserMulti } from "@/api/luckGift/luck25";
+import { listAll} from "@/api/partition/partitionInfo";
+import { ElMessage } from "element-plus";
+export default {
+  name: "luck25Config",
+  data() {
+    return {
+      loading: false,
+      butClick: false,
+      butClickTime: null,
+      //查询所需条件对象
+      inquire: {
+        value: 2,
+        options: [
+          // {
+          //   name: "阿拉伯区",
+          //   type: 2,
+          // },
+          // {
+          //   name: "英语区",
+          //   type: 1,
+          // },
+          // {
+          //   name: "华语区",
+          //   type: 4,
+          // },
+          // {
+          //   name: "土耳其区",
+          //   type: 8,
+          // },
+        ],
+        comparisonValue: "",
+        goldInventory: "",
+        giftId: "",
+        platformCommission: "",
+        userRevenueRatio: "",
+        highRechargeThreshold: undefined,
+        judgeInputThreshold: undefined,
+        highPoolEntreProductionRatio: undefined,
+        highPoolQuitProductionRatio: undefined,
+        lowPoolEntreProductionRatio: undefined,
+        lowPoolQuitProductionRatio: undefined,
+        warnMulti: "",
+        followErbanNoList: "",
+        whiteErbanNoProductionRatioMap: "",
+        blackErbanNoList: "",
+      },
+      editDialog: false,
+      editDialogTitle: "",
+      detailsDialog: false,
+      value: "",
+      type: null,
+      // 详情
+      detailsTable: [],
+      whiteErbanNoProductionRatioMap: null,
+    };
+  },
+  created() {
+    this.getData();
+    listAll().then((res) => {
+      this.inquire.options = res.data;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      getConfig({ partitionId: this.inquire.value }).then((res) => {
+        this.inquire.comparisonValue = res.data.productionRatio;
+        this.inquire.goldInventory = res.data.stock;
+        this.inquire.platformCommission = res.data.platformRatio;
+        this.inquire.userRevenueRatio = res.data.receiverRatio;
+        this.inquire.highRechargeThreshold = res.data.highRechargeThreshold;
+        this.inquire.judgeInputThreshold = res.data.judgeInputThreshold;
+        this.inquire.highPoolEntreProductionRatio = res.data.highPoolEntreProductionRatio;
+        this.inquire.highPoolQuitProductionRatio = res.data.highPoolQuitProductionRatio;
+        this.inquire.lowPoolEntreProductionRatio = res.data.lowPoolEntreProductionRatio;
+        this.inquire.lowPoolQuitProductionRatio = res.data.lowPoolQuitProductionRatio;
+        this.inquire.warnMulti = res.data.warnMulti;
+        this.inquire.followErbanNoList = res.data.followErbanNoList.join();
+        // this.inquire.whiteErbanNoProductionRatioMap = res.data.whiteErbanNoProductionRatioMap.join();
+        this.inquire.blackErbanNoList = res.data.blackErbanNoList.join();
+        var newArr = [];
+        var obj = res.data.whiteErbanNoProductionRatioMap;
+        var arr = Object.keys(obj).map((key) => ({
+          userId: key,
+          val: obj[key],
+        }));
+        arr.forEach((res, i) => {
+          newArr[i] = res;
+        });
+        this.detailsTable = newArr;
+      });
+    },
+    // 查看详情按钮
+    detailsClick() {
+      this.getData();
+      this.detailsDialog = true;
+      this.type = 14;
+      // this.value = inquire.whiteErbanNoProductionRatioMap;
+    },
+    // 详情新增按钮
+    addDetail() {
+      this.detailsTable.unshift([]);
+    },
+    // 详情删除按钮
+    delDetail(index, val) {
+      this.detailsTable.splice(index, 1);
+    },
+    // 详情确认保存按钮
+    sevaDetail() {
+      var map = {};
+      var lock = true;
+      this.detailsTable.forEach((res) => {
+        if (res.userId == (undefined || "") || res.val == undefined || "") {
+          lock = false;
+        }
+        map[res.userId] = res.val;
+      });
+      console.log(map);
+      this.whiteErbanNoProductionRatioMap = map;
+      if (lock) {
+        this.editDialogClick();
+      } else {
+        ElMessage({
+          showClose: true,
+          message: "用户ID和值不能为空",
+          type: "error",
+        });
+      }
+    },
+    // 详情编辑监听
+    handleEdit(index, row) {
+      // 这里可以添加保存逻辑，例如调用API更新服务器数据等。
+      console.log(index, "保存行数据", row);
+      // 示例：更新本地数据或其他操作...
+    },
+    // 确认保存
+    editDialogClick() {
+      var obj = {};
+      obj.partitionId = this.inquire.value;
+      if (this.type == 12) {
+        this.butClick = true;
+        updateUserMulti({ erbanNo: this.value }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: "赠送成功",
+              type: "success",
+            });
+            setTimeout(() => {
+              this.butClick = false;
+            }, 3000);
+            this.editDialog = false;
+            this.getData();
+          } else {
+            this.butClick = false;
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else {
+        if (this.type == 1) {
+          obj.productionRatio = this.value;
+        } else if (this.type == 2) {
+          obj.stock = this.value;
+        } else if (this.type == 3) {
+          obj.platformRatio = this.value;
+        } else if (this.type == 4) {
+          obj.receiverRatio = this.value;
+        } else if (this.type == 5) {
+          obj.highRechargeThreshold = this.value;
+        } else if (this.type == 6) {
+          obj.judgeInputThreshold = this.value;
+        } else if (this.type == 15) {
+          obj.highPoolEntreProductionRatio = this.value;
+        } else if (this.type == 16) {
+          obj.highPoolQuitProductionRatio = this.value;
+        } else if (this.type == 17) {
+          obj.lowPoolEntreProductionRatio = this.value;
+        } else if (this.type == 18) {
+          obj.lowPoolQuitProductionRatio = this.value;
+        } else if (this.type == 9) {
+          obj.warnMulti = this.value;
+        } else if (this.type == 11) {
+          obj.followErbanNoList = this.value.split(",");
+        } else if (this.type == 14) {
+          obj.whiteErbanNoProductionRatioMap =
+            this.whiteErbanNoProductionRatioMap;
+        } else if (this.type == 13) {
+          obj.blackErbanNoList = this.value.split(",");
+        }
+        updateSet(obj).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: "保存成功",
+              type: "success",
+            });
+            this.editDialog = false;
+            // this.detailsDialog = false;
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+    },
+    // 监听类型
+    handleChange(value) {
+      this.inquire.value = value;
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      margin-right: 20px;
+      margin-bottom: 20px;
+      span {
+        display: inline-block;
+        width: 110px;
+        margin-right: 10px;
+        // text-align: right;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>
diff --git a/src/views/luckGift/luck25PersonalData.vue b/src/views/luckGift/luck25PersonalData.vue
new file mode 100644
index 0000000..18e564d
--- /dev/null
+++ b/src/views/luckGift/luck25PersonalData.vue
@@ -0,0 +1,376 @@
+<template>
+  <div class="box">
+    <!-- ID -->
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <partition-select v-model:partition-id="inquire.value" />
+      </div>
+      <div class="inquire">
+        <span>MoliStar ID</span>
+        <el-input v-model="inquire.userId" placeholder="" class="input">
+        </el-input>
+      </div>
+      <!-- 送出时间 -->
+      <div class="inquire">
+        <span>送出时间</span>
+        <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
+        </el-date-picker>
+      </div>
+    </div>
+    <el-button type="text">总进入：{{ totalInput }}</el-button>
+    <el-button type="text">总退出：{{ totalOutput }}</el-button>
+    <el-button type="text"
+      >总比例：{{ totalProductionRatio }}</el-button
+    >
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="getData()"
+        >查询
+      </el-button>
+      <el-button
+        @click="
+          inquire.userId = '';
+          inquire.time = '';
+        "
+        >重置筛选
+      </el-button>
+      <el-button
+        class="primary"
+        type="primary"
+        style="margin-left: 20px;"
+        :disabled="butClick"
+        @click="
+          editDialog = true;
+          type = 12;
+          editDialogTitle = '赠送1000倍奖励';
+          value = inquire.x;
+        "
+      >
+        赠送</el-button
+      >
+    </div>
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="recordDialog.show"
+               v-model:title="recordDialog.title"
+               @close="closeRecordDialog"
+               label-width="auto"
+               width="82%" center>
+      <!-- 表格 -->
+      <el-table
+          v-loading="pageRecord.loading"
+          :data="pageRecord.data"
+          border
+          style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="createTime" align="center" label="时间" />
+        <el-table-column prop="partitionDesc" align="center" label="分区" />
+        <el-table-column prop="erbanNo" align="center" label="平台id" />
+        <el-table-column prop="nick" align="center" label="昵称" />
+        <el-table-column prop="receiverErbanNo" align="center" label="收礼者平台id" />
+        <el-table-column prop="receiverNick" align="center" label="收礼者昵称" />
+        <el-table-column prop="roomErbanNo" align="center" label="房间id" />
+        <el-table-column prop="giftId" align="center" label="礼物id" />
+        <el-table-column prop="giftName" align="center" label="礼物名称" />
+        <el-table-column prop="giftGoldPrice" align="center" label="礼物价格" />
+        <el-table-column prop="giftNum" align="center" label="数量" />
+        <el-table-column prop="input" align="center" label="进入" />
+
+        <el-table-column prop="poolId" align="center" label="poolId" />
+        <el-table-column prop="expect" align="center" label="期望值" />
+
+        <el-table-column prop="isSupplement" align="center" label="本次是否后台赠送" />
+        <el-table-column prop="drawMultiple" align="center" label="数组倍数" />
+        <el-table-column prop="afterMultiple" align="center" label="最终倍数" />
+        <el-table-column prop="winGoldNum" align="center" label="退出" />
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+          style="margin-top: 10px"
+          class="paginationClass"
+          v-model:current-page="pageRecord.pageNo"
+          v-model:page-size="pageRecord.pageSize"
+          :page-sizes="[50, 100, 200, 500]"
+          layout="sizes, prev, pager, next"
+          :total="pageRecord.total"
+          @size-change="handleRecordPageChange"
+          @current-change="handleRecordPageChange"
+      />
+    </el-dialog>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="uid" align="center" label="uid" />
+      <el-table-column prop="erbanNo" align="center" label="平台id" />
+      <el-table-column prop="totalInput" align="center" label="进入" />
+      <el-table-column prop="totalOutput" align="center" label="退出" />
+      <el-table-column prop="production" align="center" label="剩余" />
+      <el-table-column
+        prop="productionRatio"
+        align="center"
+        label="退出/进入"
+      />
+      <el-table-column prop="avgInput" align="center" label="每次进入" />
+      <el-table-column prop="num" align="center" label="总次数" />
+      <el-table-column prop="winNum" align="center" label="得到次数" />
+      <el-table-column prop="winRate" align="center" label="得到率" />
+      <el-table-column align="center" label="操作" width="180">
+        <template v-slot="scope">
+          <el-button class="primary" type="primary"  @click="openRecordDialog(scope.row)">明细</el-button>
+          <el-button v-loading="exportLoading" @click="exportRecord(scope.row)">导出</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入用户ID"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { personal, updateUserMulti, pageRecord, exportRecord } from "@/api/luckGift/luck25";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+export default {
+  name: "luck25PersonalData",
+  components: {
+    PartitionSelect
+  },
+  data() {
+    return {
+      loading: false,
+      totalInput: 0,
+      totalOutput: 0,
+      totalProductionRatio: 0,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+        time: "",
+        value: undefined,
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+      butClick:false,
+
+      recordDialog: {
+        show: false,
+        title: "",
+      },
+
+      pageRecord: {
+        uid: undefined,
+        date: undefined,
+        loading: false,
+        data: [],
+        total: 0,
+        pageNo: 1,
+        pageSize: 50,
+      },
+
+      exportLoading: false,
+    };
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      if (!this.inquire.time && this.inquire.userId === '') {
+        ElMessage({
+          showClose: true,
+          message: "时间和ID至少填一项",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      personal({
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        date: this.inquire.time
+          ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+          : null,
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.total = res.data.dataPage.total;
+        this.tableData = res.data.dataPage.rows;
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.loading = false;
+      });
+    },
+    // 确认保存
+    editDialogClick() {
+      this.butClick = true;
+      updateUserMulti({ erbanNo: this.value }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+          setTimeout(() => {
+            this.butClick = false;
+          }, 1000);
+          this.editDialog = false;
+          this.getData();
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+    openRecordDialog(row) {
+      this.recordDialog.show = true;
+      this.recordDialog.title = '[' + row.erbanNo + ']' + row.date + '明细';
+      this.pageRecord.uid = row.uid;
+      this.pageRecord.date = row.date;
+      this.pageRecordData();
+    },
+    closeRecordDialog() {
+      this.recordDialog.show = false;
+      this.recordDialog.title = undefined;
+      this.pageRecord.uid = undefined;
+      this.pageRecord.date = undefined;
+    },
+    // 分页导航
+    handleRecordPageChange() {
+      this.pageRecordData();
+    },
+    pageRecordData() {
+      if (!this.pageRecord.uid && !this.pageRecord.date) {
+        ElMessage({
+          showClose: true,
+          message: "时间和ID至少填一项",
+          type: "error",
+        });
+        return;
+      }
+      this.pageRecord.loading = true;
+      pageRecord({
+        uid: this.pageRecord.uid,
+        date: this.pageRecord.date,
+        pageNo: this.pageRecord.pageNo,
+        pageSize: this.pageRecord.pageSize,
+      }).then((res) => {
+        if (res.code !== 200){
+          throw new Error(res.msg);
+        }
+        this.pageRecord.total = res.data.total;
+        this.pageRecord.data = res.data.rows;
+      }).catch((error) => {
+        ElMessage({
+          showClose: true,
+          message: error.message,
+          type: "error",
+        });
+      }).finally(() => {
+        this.pageRecord.loading = false;
+      });
+    },
+    exportRecord(row){
+      this.exportLoading = true;
+      exportRecord({uid:row.uid, date:row.date})
+      this.exportLoading = false;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>
diff --git a/src/views/luckGift/luck25PlatformData.vue b/src/views/luckGift/luck25PlatformData.vue
new file mode 100644
index 0000000..6b7e9a9
--- /dev/null
+++ b/src/views/luckGift/luck25PlatformData.vue
@@ -0,0 +1,122 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <partition-select v-model:partition-id="inquire.value"
+                          v-model:partition-infos="inquire.options"
+        />
+      </div>
+      <!-- 时间 -->
+      <!-- <div class="inquire">
+        <span>时间</span>
+        <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
+        </el-date-picker>
+      </div> -->
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="getData()"
+        >查询
+      </el-button>
+    </div>
+    <el-button type="text">数组出金币总额：{{ totalInput }}</el-button>
+    <el-button type="text">数组出返币总额：{{ totalOutput }}</el-button>
+    <el-button type="text">投产比：{{ totalProductionRatio }}</el-button>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="totalInput" align="center" label="进入" />
+      <el-table-column prop="totalOutput" align="center" label="退出" />
+      <el-table-column
+        prop="productionRatio"
+        align="center"
+        label="退出/进入比例"
+      />
+      <el-table-column prop="num" align="center" label="参与次数" />
+      <el-table-column prop="count" align="center" label="参与人数" />
+      <el-table-column prop="winCount" align="center" label="得到人数" />
+      <el-table-column prop="winNum" align="center" label="得到次数" />
+      <el-table-column prop="winRate" align="center" label="得到率" />
+    </el-table>
+  </div>
+</template>
+<script>
+import { platform } from "@/api/luckGift/luck25";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+export default {
+  name: "luck25PlatformData",
+  components: {PartitionSelect},
+  data() {
+    return {
+      loading: false,
+      totalInput: "0",
+      totalOutput: "0",
+      totalProductionRatio: "0",
+      //查询所需条件对象
+      inquire: {
+        value: undefined,
+        options: [],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      platform({
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.tableData = res.data.dataList;
+        this.loading = false;
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>
diff --git a/src/views/luckGift/arrange.vue b/src/views/luckGift/luckGiftArrange.vue
similarity index 100%
rename from src/views/luckGift/arrange.vue
rename to src/views/luckGift/luckGiftArrange.vue
diff --git a/src/views/luckGift/lucky25Arrange.vue b/src/views/luckGift/lucky25Arrange.vue
new file mode 100644
index 0000000..c484d4d
--- /dev/null
+++ b/src/views/luckGift/lucky25Arrange.vue
@@ -0,0 +1,232 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>奖池</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          >
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+
+    <!-- 总分组 -->
+    <div class="allArr">
+      目前数组 <span>{{ allArr.length }} </span> 组:
+      <span class="span" v-for="(item, index) in allArr" :key="index">
+        {{ item.expect }},
+      </span>
+    </div>
+
+    <!-- 数组设置 -->
+    <div class="arrSet">数组设置：</div>
+
+    <!-- 数组内容 -->
+    <div class="boxs">
+      <div class="arrContent" v-for="(item, index) in arr" :key="index">
+        <div class="arrBox">
+          <div class="left">
+            <div class="left_in1">
+              期望: <b class="b1">{{ item.expect }}</b> ,
+            </div>
+            <div class="left_in2">
+              得到率: <b class="b2">{{ (item.winRate * 100).toFixed(2) }}%</b> ,
+            </div>
+          </div>
+          <div class="right" v-for="(arrInItem, i) in item.itemList" :key="i">
+            <span>{{ arrInItem.multi }}</span>
+            <el-input
+              @input="handleInput(index, i, $event)"
+              v-model="arrInItem.num"
+              placeholder=""
+              class="input"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="saveFun()"
+        >保存
+      </el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { listType, list, save } from "@/api/luckGift/luck25";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luck25Arrange",
+  data() {
+    return {
+      //查询所需条件对象
+      inquire: {
+        value: "",
+        options: [],
+      },
+      allArr: [], //总数组
+      arr: [], //处理下面总数组
+    };
+  },
+  created() {
+    listType().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.value = res.data[0].type;
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      list({ type: this.inquire.value }).then((res) => {
+        this.allArr = res.data;
+        this.arr = res.data;
+      });
+    },
+    handleInput(index, i, val) {
+      // 期望值 expectedvalue = 倍数 * 5 * num / 2500
+      // 中奖率 winRate =不为θ的倍数的num / 500
+      this.arr[index].expect = this.calculationFun(index, i, val).expect;
+      this.arr[index].winRate = this.calculationFun(index, i, val).winRate;
+    },
+    // 计算函数
+    calculationFun(index, i, val) {
+      var expectNum = 0;
+      var winRate = 0;
+      this.arr[index].itemList.forEach((res) => {
+        expectNum += res.multi * res.num;
+        winRate += Number(res.num);
+      });
+      console.log(winRate);
+      return {
+        expect: (expectNum / 500).toFixed(2),
+        winRate: (winRate / 500).toFixed(4),
+      };
+    },
+    // 保存
+    saveFun() {
+      //
+      save(
+        JSON.stringify({ poolList: this.arr, type: this.inquire.value })
+      ).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "保存成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 监听类型
+    handleChange(value) {
+      this.inquire.value = value;
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  font-size: 18px;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+  .allArr {
+    margin: 20px 0 10px 0;
+    span {
+      color: red;
+    }
+    .span {
+      margin: 0 10px;
+    }
+  }
+  .arrSet {
+    margin-bottom: 0px;
+  }
+  .boxs {
+    display: flex;
+    // justify-content: space-between;
+    flex-wrap: wrap;
+    .arrContent {
+      // margin-bottom: 20px;
+      width: 190px;
+      height: 395px;
+      line-height: 30px;
+      margin-bottom: 20px;
+      .arrBox {
+        .left {
+          // float: left;
+          div {
+            min-width: 100px;
+            display: block;
+            // margin-bottom: -25px;
+            .b1 {
+              color: red;
+            }
+            .b2 {
+              color: blue;
+            }
+          }
+          .left_in2 {
+            margin-bottom: 10px
+          }
+        }
+        .right {
+          float: left;
+          margin-bottom: 15px;
+          span {
+            display: inline-block;
+            width: 45px;
+          }
+          .input {
+            display: inline-block;
+            width: 100px;
+            margin-right: 10px;
+            font-size: 16px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue
index 2bdc4a6..ad1855e 100644
--- a/src/views/users/GiftManageView.vue
+++ b/src/views/users/GiftManageView.vue
@@ -66,10 +66,11 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</option>
-                                    <option value="18">幸运礼物</option>
+                                    <option value="18">幸运24礼物</option>
                                     <option value="19">CP礼物</option>
                                     <option value="20">定制礼物</option>
                                     <option value="21">Bravo礼物</option>
+                                    <option value="22">幸运25礼物</option>
                                 </select>
                             </div>
                             <label for="partitionId" class="col-sm-1 control-label">地区:</label>
@@ -220,10 +221,11 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</option>
-                                    <option value="18">幸运礼物</option>
+                                    <option value="18">幸运24礼物</option>
                                     <option value="19">CP礼物</option>
                                     <option value="20">定制礼物</option>
                                     <option value="21">Bravo礼物</option>
+                                    <option value="22">幸运25礼物</option>
                                 </select>
                             </div>
                         </div>