新增定制礼物

充值统计-增加startPay
新增赠送成功toast
2024-09-25 20:10:30 +08:00 · 2024-09-23 22:14:19 +08:00 · 2024-09-20 14:18:20 +08:00 · 2024-09-20 11:43:40 +08:00 · 2024-09-19 19:12:43 +08:00 · 2024-09-18 11:06:59 +08:00
14 changed files with 1587 additions and 379 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
        "knockout": "^3.5.1",
        "less": "^4.2.0",
        "less-loader": "^11.1.3",
+        "moment-timezone": "^0.5.45",
        "node-sass": "^9.0.0",
        "popper.js": "^1.16.1",
        "sass": "^1.67.0",
@@ -8974,6 +8975,25 @@
      "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
      "dev": true
    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.45",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.45.tgz",
+      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/mrmime": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
    "knockout": "^3.5.1",
    "less": "^4.2.0",
    "less-loader": "^11.1.3",
+    "moment-timezone": "^0.5.45",
    "node-sass": "^9.0.0",
    "popper.js": "^1.16.1",
    "sass": "^1.67.0",
--- a/src/api/luckGift/luckGift.js
+++ b/src/api/luckGift/luckGift.js
@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 奖池拉框
+export const listType = query => {
+    return request({
+        url: '/admin/lucky24/pool/listType',
+        method: 'get',
+        params: query
+    });
+};
+// 池子列表
+export const list = query => {
+    return request({
+        url: '/admin/lucky24/pool/list',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置
+export const getConfig = query => {
+    return request({
+        url: '/admin/lucky24/config/getConfig',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置-修改
+export const updateSet = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky24/config/update',
+        method: 'post',
+        data: query
+    });
+};
+// 个人数据
+export const personal = query => {
+    return request({
+        url: '/admin/lucky24/record/personal',
+        method: 'get',
+        params: query
+    });
+};
+// 汇总
+export const platform = query => {
+    return request({
+        url: '/admin/lucky24/record/platform',
+        method: 'get',
+        params: query
+    });
+};
+// 保存池子
+export const save = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky24/pool/save',
+        method: 'post',
+        data: query
+    });
+};
+// 赠送用户
+export const updateUserMulti = query => {
+    return request({
+        url: '/admin/lucky24/config/updateUserMulti',
+        method: 'post',
+        params: query
+    });
+};
--- a/src/views/luckGift/arrange.vue
+++ b/src/views/luckGift/arrange.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/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftArrange",
+  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>
--- a/src/views/luckGift/luckGiftData.vue
+++ b/src/views/luckGift/luckGiftData.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="box">
+    <!-- ID -->
+    <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 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>
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="getData()"
+        >查询
+      </el-button>
+      <el-button
+        @click="
+          inquire.userId = '';
+          inquire.time = '';
+        "
+        >重置筛选
+      </el-button>
+    </div>
+
+    <!-- 表格 -->
+    <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>
+
+    <!-- 分页 -->
+    <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"
+    />
+  </div>
+</template>
+<script>
+import { personal } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftData",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+        time: "",
+        value: 2,
+        options: [
+          {
+            name: "阿拉伯区",
+            type: 2,
+          },
+          {
+            name: "英语区",
+            type: 1,
+          },
+          {
+            name: "华语区",
+            type: 4,
+          },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
+      if (!this.inquire.time) {
+        ElMessage({
+          showClose: true,
+          message: "请选择时间",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      personal({
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        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>
--- a/src/views/luckGift/luckGiftDataAll.vue
+++ b/src/views/luckGift/luckGiftDataAll.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select v-model="inquire.value" placeholder="请选择">
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </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-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="x" align="center" label="退出/进入比例"
+        ><template v-slot="scope">
+          {{ (scope.row.totalOutput / scope.row.totalInput).toFixed(4) }}
+        </template>
+      </el-table-column>
+      <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="得到率"
+        ><template v-slot="scope">
+          {{ scope.row.winRate ? scope.row.winRate : "-" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="stock" align="center" label="数组库存" />
+    </el-table>
+  </div>
+</template>
+<script>
+import { platform } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftDataAll",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        value: 2,
+        options: [
+          {
+            value: 2,
+            label: "阿拉伯区",
+          },
+          {
+            value: 1,
+            label: "英语区",
+          },
+          {
+            value: 4,
+            label: "华语区",
+          },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
+      if (!this.inquire.time) {
+        ElMessage({
+          showClose: true,
+          message: "请选择时间",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      platform({
+        erbanNo: this.inquire.userId,
+        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data;
+        this.loading = false;
+        console.log(this.tableData, 123);
+      });
+    },
+    // 分页导航
+    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>
--- a/src/views/luckGift/luckGiftSet.vue
+++ b/src/views/luckGift/luckGiftSet.vue
@@ -0,0 +1,500 @@
+<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 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>对比值M</span>
+        <el-input
+          v-model="inquire.supplement.supplementRatio"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 5;
+            editDialogTitle = '对比值M';
+            value = inquire.supplement.supplementRatio;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>金币对比值A</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.supplement.conditionInput"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 6;
+            editDialogTitle = '金币对比值A';
+            value = inquire.supplement.conditionInput;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>奖励金币倍数</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.supplement.supplementMulti"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 7;
+            editDialogTitle = '奖励金币倍数';
+            value = inquire.supplement.supplementMulti;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>幸运24金币库存</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 = '幸运24金币库存';
+            value = inquire.goldInventory;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <!-- <div class="inquire">  
+        <span>幸运礼物ID</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 = 8;
+            editDialogTitle = '幸运礼物ID';
+            value = inquire.x;
+          "
+        >
+          编辑</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>通知制定金额</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>用户上线列表</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>赠送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>
+  </div>
+</template>
+<script>
+import { getConfig, updateSet, updateUserMulti } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftSet",
+  data() {
+    return {
+      loading: false,
+      butClick: false,
+      butClickTime: null,
+      //查询所需条件对象
+      inquire: {
+        value: 2,
+        options: [
+          {
+            name: "阿拉伯区",
+            type: 2,
+          },
+          {
+            name: "英语区",
+            type: 1,
+          },
+          {
+            name: "华语区",
+            type: 4,
+          },
+        ],
+        comparisonValue: "",
+        goldInventory: "",
+        giftId: "",
+        platformCommission: "",
+        userRevenueRatio: "",
+        supplement: {
+          conditionInput: "",
+          conditionNum: "",
+          supplementMulti: "",
+          supplementNum: "",
+          supplementRatio: "",
+        },
+        warnMulti: "",
+        followErbanNoList: "",
+      },
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+      type: null,
+    };
+  },
+  created() {
+    this.getData();
+  },
+  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.supplement = res.data.supplement;
+        this.inquire.warnMulti = res.data.warnMulti;
+        this.inquire.followErbanNoList = res.data.followErbanNoList.join();
+      });
+    },
+    // 确认保存
+    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.supplement = this.inquire.supplement;
+          obj.supplement.supplementRatio = this.value;
+        } else if (this.type == 6) {
+          obj.supplement = this.inquire.supplement;
+          obj.supplement.conditionInput = this.value;
+        } else if (this.type == 7) {
+          obj.supplement = this.inquire.supplement;
+          obj.supplement.supplementMulti = this.value;
+        } else if (this.type == 9) {
+          obj.warnMulti = this.value;
+        } else if (this.type == 11) {
+          obj.followErbanNoList = this.value.split(",");
+        }
+        updateSet(obj).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: "保存成功",
+              type: "success",
+            });
+            this.editDialog = 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>
--- a/src/views/lucky/LuckyGiftRangeView.vue
+++ b/src/views/lucky/LuckyGiftRangeView.vue
@@ -306,7 +306,8 @@ export default {
      this.inquire.value1 = e;
      luckyGiftRangeConfigList({ giftId: this.inquire.value1 }).then((res) => {
        this.inquire.giftsNum = res.data;
-        // this.inquire.value2 = res.data[0].id;
+      // this.inquire.value2 = "";
+        this.inquire.value2 = res.data[0].id;
        // this.loading = true;
        // luckyGiftRewardList({
        //   giftId: e,
--- a/src/views/users/ChargeRecordArPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordArPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
            { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
            { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
            { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
            { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
            { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
            { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
--- a/src/views/users/ChargeRecordDailyStatisticsView.vue
+++ b/src/views/users/ChargeRecordDailyStatisticsView.vue
@@ -1,24 +1,29 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <form class="col-sm-12" id="searchForm" action="/admin/chargeRecord/dailyexport" method="get"
-                        target="_blank">
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <form class="col-sm-12"
+                id="searchForm"
+                action="/admin/chargeRecord/dailyexport"
+                method="get"
+                target="_blank">

-                    </form>
-                    <div class="col-sm-12 pull-left">
-                        <h4>
-                            今日充值数据：<span class="totalAmount" style="color: red">0</span>（总金额）/
-                            <span class="totalCount" style="color: red">0</span>（总笔数）
-                            <span style="color: red">(单位：美元)</span>
-                        </h4>
-                    </div>
-                    <!-- <div class="col-sm-3 pull-right">
+          </form>
+          <div class="col-sm-12 pull-left">
+            <h4>
+              今日充值数据：<span class="totalAmount"
+                    style="color: red">0</span>（总金额）/
+              <span class="totalCount"
+                    style="color: red">0</span>（总笔数）
+              <span style="color: red">(单位：美元)</span>
+            </h4>
+          </div>
+          <!-- <div class="col-sm-3 pull-right">
                     <button id="btnSearch" class="btn btn-default">
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
@@ -26,185 +31,194 @@
                         <i class="glyphicon glyphicon-export"></i>导出
                     </button>
                 </div>-->
-                </div>
-                <!-- .content -->
-                <div id="table"></div>
-
-            </div>
        </div>
-    </section>
+        <!-- .content -->
+        <div id="table"></div>

-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </div>
-
-            </div>
-        </div>
+      </div>
    </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>

 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';

 export default {
-    name: "ChargeRecordDailyStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordDailyStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            {
+              field: 'time',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100, 200, 300, 500],
+          search: false,
+          sidePagination: "client", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/dailylist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+            getTotalStatis();
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        {
-                            field: 'time',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 20,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "client", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/dailylist',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                        getTotalStatis();
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });

-                // 导出EXCEL
-                $('#btnExport').on('click', function () {
-                    $("#searchForm").submit();
-                });
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          $("#searchForm").submit();
+        });

-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });

-                $("#table").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {

-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");

-                    var date = new Date().format("yyyy-MM-dd ");
-                    $("#modalLabel").html(date + parseTime(time));
+          var date = new Date().format("yyyy-MM-dd ");
+          $("#modalLabel").html(date + parseTime(time));

-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }

-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/dailydetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/dailydetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });


-            });
-        }
-    },
+      });
+    }
+  },

 };

-function parseTime(val) {
-    if (val < 10) {
-        return '0' + val + ':00-0' + val + ':59';
-    } else {
-        return val + ':00-' + val + ':59';
-    }
+function parseTime (val) {
+  if (val < 10) {
+    return '0' + val + ':00-0' + val + ':59';
+  } else {
+    return val + ':00-' + val + ':59';
+  }
 }
-function getTotalStatis() {
-    $.get('/admin/chargeRecord/dailytotal', function (res) {
-        if (res.code == 200) {
-            console.log(res.data);
-            if (res.data) {
-                $('.totalAmount').html(res.data.amount);
-                $('.totalCount').html(res.data.count);
-            }
-        }
-    })
+function getTotalStatis () {
+  $.get('/admin/chargeRecord/dailytotal', function (res) {
+    if (res.code == 200) {
+      console.log(res.data);
+      if (res.data) {
+        $('.totalAmount').html(res.data.amount);
+        $('.totalCount').html(res.data.count);
+      }
+    }
+  })
 }
 </script>

--- a/src/views/users/ChargeRecordEnPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordEnPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
            { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
            { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
            { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
            { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
            { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
            { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
--- a/src/views/users/ChargeRecordTotalStatisticsView.vue
+++ b/src/views/users/ChargeRecordTotalStatisticsView.vue
@@ -1,228 +1,250 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <div class="col-sm-12">
-                        <div class="pull-left">
-                            <form id="searchForm" class="col-sm-pull-12" action="/admin/chargeRecord/totalexport"
-                                method="get" target="_blank">
-                                <div class="col-sm-11">
-                                    <label for="beginDate" class="col-sm-2 control-label">开始日期:</label>
-                                    <div class="col-sm-4"><input type="text" class="form-control" name="beginDate"
-                                            id="beginDate" placeholder="必填">
-                                    </div>
-                                    <label for="endDate" class="col-sm-2 control-label">结束日期:</label>
-                                    <div class="col-sm-4"><input type="text" class="form-control" name="endDate"
-                                            id="endDate" placeholder="必填"></div>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <div class="col-sm-12">
+            <div class="pull-left">
+              <form id="searchForm"
+                    class="col-sm-pull-12"
+                    action="/admin/chargeRecord/totalexport"
+                    method="get"
+                    target="_blank">
+                <div class="col-sm-11">
+                  <label for="beginDate"
+                         class="col-sm-2 control-label">开始日期:</label>
+                  <div class="col-sm-4"><input type="text"
+                           class="form-control"
+                           name="beginDate"
+                           id="beginDate"
+                           placeholder="必填">
+                  </div>
+                  <label for="endDate"
+                         class="col-sm-2 control-label">结束日期:</label>
+                  <div class="col-sm-4"><input type="text"
+                           class="form-control"
+                           name="endDate"
+                           id="endDate"
+                           placeholder="必填"></div>

-                                </div>
-                            </form>
-                        </div>
-                        <div class="pull-right">
-
-                            <button id="btnSearch" class="btn btn-default">
-                                <i class="glyphicon glyphicon-search"></i>查询
-                            </button>
-                            <button id="btnExport" class="btn btn-default">
-                                <i class="glyphicon glyphicon-export"></i>导出
-                            </button>
-                            <span style="color: red">(单位：美元)</span>
-                        </div>
-
-                    </div>
                </div>
-
-                <!-- .content -->
-                <div id="table"></div>
-
+              </form>
            </div>
-        </div>
-    </section>
-
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </div>
+            <div class="pull-right">

+              <button id="btnSearch"
+                      class="btn btn-default">
+                <i class="glyphicon glyphicon-search"></i>查询
+              </button>
+              <button id="btnExport"
+                      class="btn btn-default">
+                <i class="glyphicon glyphicon-export"></i>导出
+              </button>
+              <span style="color: red">(单位：美元)</span>
            </div>
+
+          </div>
        </div>
+
+        <!-- .content -->
+        <div id="table"></div>
+
+      </div>
    </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>

 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';

 export default {
-    name: "ChargeRecordTotalStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordTotalStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
+            {
+              field: 'timeStr',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100, 200, 300, 500],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize,
+              beginDate: $('#beginDate').val(),
+              endDate: $('#endDate').val()
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/totallist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
-                        {
-                            field: 'timeStr',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 20,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "server", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize,
-                            beginDate: $('#beginDate').val(),
-                            endDate: $('#endDate').val()
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/totallist',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });

-                // 导出EXCEL
-                $('#btnExport').on('click', function () {
-                    if (!$('#beginDate').val() || !$('#endDate').val()) {
-                        $("#tipMsg").text("请输入必填的信息");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    $("#searchForm").submit();
-                });
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          $("#searchForm").submit();
+        });

-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    if (!$('#beginDate').val() || !$('#endDate').val()) {
-                        $("#tipMsg").text("请输入必填的信息");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    TableHelper.doRefresh('#table');
-                });
-                var chargeStart = $('#beginDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          TableHelper.doRefresh('#table');
+        });
+        var chargeStart = $('#beginDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });

-                var chargeEnd = $('#endDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
-                chargeStart.on('changeDate', function () {
-                    var date = $('#beginDate').datepicker('getDate');
-                    chargeEnd.datepicker('setStartDate', date);
-                });
-                chargeEnd.on('changeDate', function () {
-                    var date = $('#endDate').datepicker('getDate');
-                    chargeStart.datepicker('setEndDate', date);
-                });
+        var chargeEnd = $('#endDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
+        chargeStart.on('changeDate', function () {
+          var date = $('#beginDate').datepicker('getDate');
+          chargeEnd.datepicker('setStartDate', date);
+        });
+        chargeEnd.on('changeDate', function () {
+          var date = $('#endDate').datepicker('getDate');
+          chargeStart.datepicker('setEndDate', date);
+        });

-                $("#table").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {

-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");

-                    $("#modalLabel").html(time);
+          $("#modalLabel").html(time);

-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }

-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/totaldetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
-            });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/totaldetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });
+      });

-        }
-    },
+    }
+  },

 };
 </script>
--- a/src/views/users/ChargeRecordZhPartitionStatisticsView.vue
+++ b/src/views/users/ChargeRecordZhPartitionStatisticsView.vue
@@ -103,6 +103,7 @@ export default {
            { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
            { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
            { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
            { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
            { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
            { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
--- a/src/views/users/GiftManageView.vue
+++ b/src/views/users/GiftManageView.vue
@@ -66,7 +66,9 @@
                                    <option value="15">线性福袋礼物</option>
                                    <option value="16">超级幸运礼物</option>
                                    <option value="17">国家礼物</option>
-                                    <option value="18">CP礼物</option>
+                                    <option value="18">幸运礼物</option>
+                                    <option value="19">CP礼物</option>
+                                    <option value="20">定制礼物</option>
                                </select>
                            </div>
                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
@@ -209,7 +211,9 @@
                                    <option value="15">线性福袋礼物</option>
                                    <option value="16">超级幸运礼物</option>
                                    <option value="17">国家礼物</option>
-                                    <option value="18">CP礼物</option>
+                                    <option value="18">幸运礼物</option>
+                                    <option value="19">CP礼物</option>
+                                    <option value="20">定制礼物</option>
                                </select>
                            </div>
                        </div>
Author	SHA1	Message	Date
dragon	4d5fb57ddf	新增定制礼物	2024-09-25 20:10:30 +08:00
khalil	b174c9818e	充值统计-增加startPay	2024-09-23 22:14:19 +08:00
dragon	c6f979c094	新增赠送成功toast	2024-09-20 14:18:20 +08:00
dragon	475ee45a44	新增对比值M	2024-09-20 11:43:40 +08:00
dragon	c4209d6c24	新增基础配置	2024-09-19 19:12:43 +08:00
dragon	e77165a1d7	优化超级幸运礼物下拉框	2024-09-18 11:06:59 +08:00
dragon	8a2c1381e9	修改标题	2024-09-14 23:46:27 +08:00
dragon	e062c2afa3	修复基础设置异常	2024-09-14 23:29:38 +08:00
dragon	591495edcc	新增幸运礼物和cp	2024-09-14 22:45:54 +08:00
dragon	25e828f7e4	修复显示异常	2024-09-14 22:36:00 +08:00
dragon	1ab319d372	修复总览没数据问题	2024-09-14 22:07:01 +08:00
dragon	9b6ee433d7	修复样式异常	2024-09-14 20:12:04 +08:00
dragon	9c4aa4efb9	完善幸运礼物	2024-09-14 19:03:04 +08:00
dragon	f228aad967	幸运礼物24暂存	2024-09-14 16:10:09 +08:00