修改主播退公会申请页面字段

src/api/dailyCoinStatistics/dailyCoinStatistics.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================每日数据====================================
+// 列表
+export const diamondStatList = query => {
+    return request({
+        url: '/admin/diamondStat/list',
+        method: 'get',
+        params: query
+    });
+};

src/api/gameWhitelist/gameWhitelist.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================灵小游戏====================================
+// 游戏列表
+export const gameList = query => {
+    return request({
+        url: '/admin/game/list',
+        method: 'get',
+        params: query
+    });
+};
+// 列表
+export const gameFeeRateList = query => {
+    return request({
+        url: '/admin/game/feeRateList',
+        method: 'post',
+        params: query
+    });
+};
+// 保存
+export const gameFeeRate = query => {
+    return request({
+        url: '/admin/game/feeRate',
+        method: 'post',
+        params: query
+    });
+};
+// 设置失效
+export const feeRateInvalid = query => {
+    return request({
+        url: '/admin/game/feeRate/invalid',
+        method: 'get',
+        params: query
+    });
+};

src/api/nobleman/nobleman.js

@@ -278,4 +278,23 @@ export const guildApplyAudit = query => {
         method: 'post',
         params: query
     });
-};
+};
+
+// 主播退公会申请 列表
+export const guildManageQuitList = query => {
+    return request({
+        url: '/admin/guild/manage/quitList',
+        method: 'get',
+        params: query
+    });
+};
+
+// 主播退公会申请审核
+export const guildManageOptQuit = query => {
+    return request({
+        url: '/admin/guild/manage/optQuit',
+        method: 'post',
+        params: query
+    });
+};
+

src/api/statistics/statistics.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================用户新增====================================
+// 列表
+export const dnuPage = query => {
+    return request({
+        url: '/admin/stats/dnu/page',
+        method: 'get',
+        params: query
+    });
+};
+// ==================================用户活跃====================================
+// 列表
+export const dauPage = query => {
+    return request({
+        url: '/admin/stats/dau/page',
+        method: 'get',
+        params: query
+    });
+};
+// ==================================工会数据统计====================================
+// 列表
+export const guiildPage = query => {
+    return request({
+        url: '/admin/stats/guild/page',
+        method: 'get',
+        params: query
+    });
+};

src/views/dailyCoinStatistics/dailyCoinStatistics.vue

@@ -0,0 +1,300 @@
+<template>
+  <div class="outer">
+    <!-- 查询 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">开始时间</span>
+        <el-date-picker
+          v-model="inquire.time[0]"
+          type="datetime"
+          placeholder="开始时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">结束时间</span>
+        <el-date-picker
+          v-model="inquire.time[1]"
+          type="datetime"
+          placeholder="结束时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <!-- <el-button style="" type="primary" @click="exportDate()">导出</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 align="center" label="全平台真实消耗" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '全平台金币明细';
+            edi(scope.row, 0);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.totalDiamond }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="阿拉伯区真实消耗" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '阿拉伯区金币明细';
+            edi(scope.row, 2);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.arDiamond }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="英语区真实消耗" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '英语区金币明细';
+            edi(scope.row, 1);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.enDiamond }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="华语区真实消耗" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '华语区金币明细';
+            edi(scope.row, 4);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.zhDiamond }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="土耳其区真实消耗" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '土耳其区金币明细';
+            edi(scope.row, 8);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.trDiamond }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="totalRemainDiamond"
+      align="center"
+      label="全平台库存"
+    />
+    <el-table-column
+      prop="arRemainDiamond"
+      align="center"
+      label="阿拉伯区库存"
+    />
+    <el-table-column prop="enRemainDiamond" align="center" label="英语区库存" />
+    <el-table-column prop="zhRemainDiamond" align="center" label="华语区库存" />
+    <el-table-column
+      prop="trRemainDiamond"
+      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"
+  /> -->
+
+  <!-- 详情 -->
+  <el-dialog v-model="detailsDialog" :title="detailsTitle" width="30%" center>
+    <!-- 内表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableDataIn"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="domainDesc" align="center" label="类型" />
+      <el-table-column prop="addDiamond" align="center" label="增加" />
+      <el-table-column prop="subDiamond" align="center" label="消耗" />
+    </el-table>
+    <!-- 操作 -->
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" class="primary" @click="detailsDialog = false"
+          >关闭</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { diamondStatList } from "@/api/dailyCoinStatistics/dailyCoinStatistics";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+export default {
+  name: "dailyCoinStatistics",
+  data() {
+    return {
+      loading: false,
+      // 查询条件
+      inquire: {
+        time: [],
+      },
+      // 表格
+      tableData: [{ x: "x" }],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   内表格
+      detailsDialog: false,
+      detailsTitle: "金币明细",
+      tableDataIn: [],
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+      diamondStatList({
+        startDate: startTime,
+        endDate: endTime,
+        // pageNo: this.currentPage,
+        // pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          // this.total = res.data.total;
+          this.tableData = res.data;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 详情
+    edi(res, type) {
+      var jsonArr =
+        type == 0
+          ? res.totalDomainDetail
+          : type == 1
+          ? res.enDomainDetail
+          : type == 2
+          ? res.arDomainDetail
+          : type == 4
+          ? res.zhDomainDetail
+          : type == 8
+          ? res.trDomainDetail
+          : `"[""]"`;
+      console.log(jsonArr);
+
+      this.tableDataIn = JSON.parse(jsonArr);
+      this.detailsDialog = true;
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .demonstration {
+    margin-right: 20px;
+  }
+  .inquire {
+    display: flex;
+    justify-content: space-between;
+    white-space: nowrap;
+    float: left;
+    margin-right: 20px;
+  }
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>

src/views/data/guildStatisticsData.vue

@@ -0,0 +1,335 @@
+<template>
+  <!-- 表格 -->
+  <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="totalNewCount"
+      align="center"
+      label="全服公会总新增"
+    />
+
+    <el-table-column align="center" label="阿拉伯公会总新增" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '阿拉伯公会总新增' + scope.row.date;
+            edi(scope.row.arNewCountDetail, false);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.arNewCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="英语区总新增" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '英语区总新增' + scope.row.date;
+            edi(scope.row.enNewCountDetail, false);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.enNewCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="华语区总新增" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '华语区总新增' + scope.row.date;
+            edi(scope.row.zhNewCountDetail, false);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.zhNewCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="土耳其区总新增" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '土耳其区总新增' + scope.row.date;
+            edi(scope.row.trNewCountDetail, false);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.trNewCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      prop="totalActiveCount"
+      align="center"
+      label="全服公会活跃度"
+    />
+
+    <el-table-column align="center" label="阿拉伯公会活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '阿拉伯公会活跃度' + scope.row.date;
+            edi(scope.row.arActiveCountDetail, true);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.arActiveCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="英语区活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '英语区活跃度' + scope.row.date;
+            edi(scope.row.enActiveCountDetail, true);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.enActiveCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="华语区活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '华语区活跃度' + scope.row.date;
+            edi(scope.row.zhActiveCountDetail, true);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.zhActiveCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="土耳其区活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '土耳其区活跃度' + scope.row.date;
+            edi(scope.row.trActiveCountDetail, true);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.trActiveCount }}
+        </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="detailsDialog" :title="detailsTitle" width="50%" center>
+    <!-- 内表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableDataIn"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="endDate" align="center" label="结束时间" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="x" align="center" label="公会长ID" />
+      <el-table-column
+        prop="activeMemberCount"
+        align="center"
+        label="本周收礼主播数"
+      />
+      <el-table-column
+        prop="guildGoldFlow"
+        align="center"
+        label="本周公会钻石流水"
+      />
+      <el-table-column
+        prop="guildDiamondFlow"
+        align="center"
+        label="本周公会金币流水"
+      />
+      <el-table-column
+        prop="lastGuildGoldFlow"
+        align="center"
+        label="上周公会钻石流水"
+        v-if="detailsIsShow"
+      />
+      <el-table-column
+        prop="guildGoldFlowWow"
+        align="center"
+        label="周环比"
+        v-if="detailsIsShow"
+      >
+        <template v-slot="scope">
+          {{
+            scope.row.lastGuildGoldFlow === 0 ? '--'
+              : formatPercentage(scope.row.guildGoldFlow / scope.row.lastGuildGoldFlow) + '%'
+          }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 操作 -->
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" class="primary" @click="detailsDialog = false"
+          >关闭</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { guiildPage } from "@/api/statistics/statistics";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+export default {
+  name: "guildStatisticsData",
+  data() {
+    return {
+      loading: false,
+      // 查询条件
+      inquire: {
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   内表格
+      detailsDialog: false,
+      detailsTitle: "金币明细",
+      tableDataIn: [],
+      detailsIsShow: false,
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+      guiildPage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 详情
+    edi(res, type) {
+      this.detailsIsShow = type;
+      console.log(JSON.parse(res));
+
+      this.tableDataIn = JSON.parse(res);
+      this.detailsDialog = true;
+    },
+    formatPercentage(value) {
+      return parseFloat((value * 100).toFixed(2));
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .demonstration {
+    margin-right: 20px;
+  }
+  .inquire {
+    display: flex;
+    justify-content: space-between;
+    white-space: nowrap;
+    float: left;
+    margin-right: 20px;
+  }
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>

src/views/data/newOverview.vue

@@ -0,0 +1,236 @@
+<template>
+  <!-- 表格 -->
+  <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="accountCount" align="center" label="新总注册" />
+    <el-table-column prop="userCount" align="center" label="新完善资料" />
+    <el-table-column prop="userRatio" align="center" label="完善率" />
+
+    <el-table-column align="center" label="阿拉伯区新注册（完善资料）" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '阿拉伯区注册明细' + scope.row.date;
+            edi(scope.row.arCountDetail, 2);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.arCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="英语区新注册（完善资料）" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '英语区注册明细' + scope.row.date;
+            edi(scope.row.enCountDetail, 1);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.enCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="华语区新注册（完善资料）" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '华语区注册明细' + scope.row.date;
+            edi(scope.row.zhCountDetail, 4);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.zhCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="土耳其区新注册（完善资料）" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '土耳其区注册明细' + scope.row.date;
+            edi(scope.row.trCountDetailt, 8);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.trCount }}
+        </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="detailsDialog" :title="detailsTitle" width="30%" center>
+    <!-- 内表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableDataIn"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="regionDesc" align="center" label="国家" />
+      <el-table-column prop="count" align="center" label="新注册（完善资料）" />
+      <el-table-column prop="ratio" align="center" label="占比">
+        <template v-slot="scope">
+          {{ formatPercentage(scope.row.ratio) }}%
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 操作 -->
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" class="primary" @click="detailsDialog = false"
+          >关闭</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { dnuPage } from "@/api/statistics/statistics";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+export default {
+  name: "newOverview",
+  data() {
+    return {
+      loading: false,
+      // 查询条件
+      inquire: {
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   内表格
+      detailsDialog: false,
+      detailsTitle: "金币明细",
+      tableDataIn: [],
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询
+    getData() {
+      this.loading = true;
+      dnuPage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 详情
+    edi(res, type) {
+      var jsonArr =
+        // type == 0
+        //   ? res.totalDiamondDetail
+        //   : type == 1
+        //   ? res.enDomainDetail
+        //   : type == 2
+        //   ? res.arDomainDetail
+        //   : type == 4
+        //   ? res.zhDomainDetail
+        //   : type == 8
+        //   ? res.trDomainDetail
+        //   : `"[""]"`;
+        (this.tableDataIn = JSON.parse(res));
+      this.detailsDialog = true;
+    },
+    formatPercentage(value) {
+      return parseFloat((value * 100).toFixed(2));
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .demonstration {
+    margin-right: 20px;
+  }
+  .inquire {
+    display: flex;
+    justify-content: space-between;
+    white-space: nowrap;
+    float: left;
+    margin-right: 20px;
+  }
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>

src/views/data/overviewActiveStatistics.vue

@@ -0,0 +1,247 @@
+<template>
+  <!-- 表格 -->
+  <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="totalCount" align="center" label="当天总活跃度">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '当天总活跃度' + scope.row.date;
+            edi(scope.row.totalCountDetail, 2);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.totalCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+
+    <el-table-column align="center" label="阿拉伯区总活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '阿拉伯区总活跃度' + scope.row.date;
+            edi(scope.row.arCountDetail, 2);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.arCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="英语区总活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '英语区总活跃度' + scope.row.date;
+            edi(scope.row.enCountDetail, 1);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.enCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="华语区总活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '华语区总活跃度' + scope.row.date;
+            edi(scope.row.zhCountDetail, 4);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.zhCount }}
+        </el-button>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" label="土耳其区总活跃度" width="">
+      <template v-slot="scope">
+        <el-button
+          @click="
+            detailsTitle = '土耳其区总活跃度' + scope.row.date;
+            edi(scope.row.trCountDetail, 8);
+          "
+          type="text"
+          size="small"
+        >
+          {{ scope.row.trCount }}
+        </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="detailsDialog" :title="detailsTitle" width="30%" center>
+    <!-- 内表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableDataIn"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="regionDesc" align="center" label="国家" />
+      <el-table-column prop="count" align="center" label="活跃度" />
+      <el-table-column prop="ratio" align="center" label="占比">
+        <template v-slot="scope">
+          {{ formatPercentage(scope.row.ratio) }}%
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 操作 -->
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" class="primary" @click="detailsDialog = false"
+          >关闭</el-button
+        >
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { dauPage } from "@/api/statistics/statistics";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+export default {
+  name: "overviewActiveStatistics",
+  data() {
+    return {
+      loading: false,
+      // 查询条件
+      inquire: {
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   内表格
+      detailsDialog: false,
+      detailsTitle: "金币明细",
+      tableDataIn: [],
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询
+    getData() {
+      this.loading = true;
+      dauPage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 详情
+    edi(res, type) {
+      var jsonArr =
+        // type == 0
+        //   ? res.totalDiamondDetail
+        //   : type == 1
+        //   ? res.enDomainDetail
+        //   : type == 2
+        //   ? res.arDomainDetail
+        //   : type == 4
+        //   ? res.zhDomainDetail
+        //   : type == 8
+        //   ? res.trDomainDetail
+        //   : `"[""]"`;
+        (this.tableDataIn = JSON.parse(res));
+      this.detailsDialog = true;
+    },
+    formatPercentage(value) {
+      return parseFloat((value * 100).toFixed(2));
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .demonstration {
+    margin-right: 20px;
+  }
+  .inquire {
+    display: flex;
+    justify-content: space-between;
+    white-space: nowrap;
+    float: left;
+    margin-right: 20px;
+  }
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>

src/views/gameWhitelist/gameWhitelist.vue

@@ -0,0 +1,286 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.validStatus" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
+    <!-- 新增按钮 -->
+    <el-button class="primary" type="primary" @click="addDialog = true"
+      >新增</el-button
+    >
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="uid" align="center" label="UID" />
+      <el-table-column prop="gameId" align="center" label="游戏ID" />
+      <el-table-column prop="gameName" align="center" label="游戏名称" />
+      <el-table-column prop="feeRate" align="center" label="water" />
+      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column prop="createTime" align="center" label="添加时间" />
+      <el-table-column align="center" label="操作" width="100">
+        <template v-slot="scope">
+          <el-button
+            v-show="scope.row.validStatus == 1"
+            @click="invalid(scope.row.id)"
+            class="primary"
+            type="primary"
+            size="default"
+            >失效</el-button
+          >
+          <div v-show="scope.row.validStatus == 0">无效</div>
+          <div v-show="scope.row.validStatus == -1">全部</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="invalidTime" 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>
+
+  <!-- 新增弹窗 -->
+  <el-dialog v-model="addDialog" title="新增" width="30%" center>
+    <el-form label-width="80px">
+      <el-form-item label="用户id">
+        <el-input
+            style="width: 100%;"
+            v-model="adduserID"
+            placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="游戏id">
+        <el-select v-model="gameID" placeholder="请选择" style="width: 100%;">
+          <el-option
+              v-for="item in gameIDArr"
+              :key="item.gameId"
+              :label="item.gameName"
+              :value="item.gameId"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="Water">
+        <el-input
+            style="width: 100%;"
+            v-model="water"
+            placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        （例如water:0.2%，则填0.2即可，water2%，则填2）
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="addDialog = false">取消</el-button>
+        <el-button type="primary" @click="addClick()"> 保存 </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import {
+  gameList,
+  gameFeeRateList,
+  gameFeeRate,
+  feeRateInvalid,
+} from "@/api/gameWhitelist/gameWhitelist";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "gameWhitelist",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+        validStatus: "-1",
+        options: [
+          {
+            label: "无效",
+            value: "0",
+          },
+          {
+            label: "有效",
+            value: "1",
+          },
+          {
+            label: "全部",
+            value: "-1",
+          },
+        ],
+      },
+      //新增所需对象
+      resource: {},
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 新增
+      addDialog: false,
+      adduserID: "",
+      gameID: "",
+      gameIDArr: [],
+      water: "",
+    };
+  },
+  created() {
+    gameList().then((res) => {
+      if (res.code == 200) {
+        this.gameIDArr = res.data;
+      } else {
+        this.butClick = false;
+        ElMessage({
+          showClose: true,
+          message: res.message,
+          type: "error",
+        });
+      }
+    });
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      gameFeeRateList({
+        erbanNo: this.inquire.userId,
+        validStatus: this.inquire.validStatus,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 确认新增按钮
+    addClick() {
+      gameFeeRate({
+        erbanNo: this.adduserID,
+        gameFeeRate: this.water,
+        gameId: this.gameID,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+          this.addDialog = false;
+          ElMessage({
+            showClose: true,
+            message: "新增成功",
+            type: "success",
+          });
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    invalid(id) {
+      feeRateInvalid({ id }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+          ElMessage({
+            showClose: true,
+            message: "设置成功",
+            type: "success",
+          });
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/luckGift/luckGiftSet.vue

@@ -1,6 +1,65 @@
 <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>
@@ -43,77 +102,6 @@
         >
       </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
@@ -250,29 +238,7 @@
         >
       </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
@@ -325,6 +291,53 @@
         </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>
@@ -367,20 +380,19 @@ export default {
         giftId: "",
         platformCommission: "",
         userRevenueRatio: "",
-        supplement: {
-          conditionInput: "",
-          conditionNum: "",
-          supplementMulti: "",
-          supplementNum: "",
-          supplementRatio: "",
-        },
         warnMulti: "",
         followErbanNoList: "",
+        whiteErbanNoProductionRatioMap: "",
+        blackErbanNoList: "",
       },
       editDialog: false,
       editDialogTitle: "",
+      detailsDialog: false,
       value: "",
       type: null,
+      // 详情
+      detailsTable: [],
+      whiteErbanNoProductionRatioMap: null,
     };
   },
   created() {
@@ -394,11 +406,65 @@ export default {
         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();
+        // 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 = {};
@@ -409,7 +475,7 @@ export default {
           if (res.code == 200) {
             ElMessage({
               showClose: true,
-              message:'赠送成功',
+              message: "赠送成功",
               type: "success",
             });
             setTimeout(() => {
@@ -435,19 +501,15 @@ export default {
           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(",");
+        } 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) {
@@ -457,6 +519,7 @@ export default {
               type: "success",
             });
             this.editDialog = false;
+            // this.detailsDialog = false;
             this.getData();
           } else {
             ElMessage({

src/views/nobleman/AnchorQuitApply.vue

@@ -0,0 +1,182 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <el-form ref="searchForm" :model="searchForm" :rules="searchRules" label-width="auto" inline="true">
+      <el-form-item label="ID" prop="erbanNo">
+        <el-input v-model="searchForm.erbanNo" placeholder="" class="input"></el-input>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="searchForm.status" placeholder="请选择">
+          <el-option label="全部" :value="-1"></el-option>
+          <el-option label="未操作" :value="1"></el-option>
+          <el-option label="已同意" :value="2"></el-option>
+          <el-option label="已拒绝" :value="3"></el-option>
+          <el-option label="已过期" :value="4"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="时间" prop="time">
+        <el-date-picker v-model="searchForm.time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <!-- 查询按钮 -->
+        <el-button class="primary" type="primary" @click="getData()">查询</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 表格 -->
+    <el-table v-loading="loading" :data="tableData" border style="width: 100%; margin-top: 25px">
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="uid" align="center" label="UID" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会长昵称" />
+      <el-table-column prop="createTime" align="center" label="申请时间" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <p v-if="scope.row.status == 2" style="color: green;">已同意</p>
+          <p v-if="scope.row.status == 3" style="color: red;">已拒绝</p>
+          <p v-if="scope.row.status == 4" style="color: orange;">已过期</p>
+          <el-button v-if="scope.row.status == 1" @click="optClick(scope.row, 2)" type="primary">同意</el-button><br>
+          <el-button v-if="scope.row.status == 1" @click="optClick(scope.row, 3)" type="warning">拒绝</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="operator" align="center" label="操作人" />
+      <el-table-column prop="updateTime" 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 { guildManageQuitList, guildManageOptQuit } from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessageBox, ElMessage } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "AnchorQuitApply",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      searchForm: {
+        erbanNo: "",
+        status: "",
+        time: "",
+      },
+      // 查询规则
+      searchRules: {
+        // erbanNo: [{ required: true, trigger: 'blur', message: 'ID不能为空' }]
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.searchForm.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.searchForm.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.searchForm.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      guildManageQuitList({
+        erbanNo: this.searchForm.erbanNo,
+        status: this.searchForm.status,
+        startDate: startTime,
+        endDate: endTime,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        this.loading = false;
+      });
+    },
+    // 同意/拒绝
+    optClick(row, val) {
+      let params = {
+        id: row.id,
+        status: val,
+      }
+
+      ElMessageBox.confirm(`确认${val == 2 ? '同意' : '拒绝'}吗？`, "提示", {
+        type: "warning",
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+      })
+        .then(() => {
+          guildManageOptQuit(params).then((res) => {
+            console.log();
+            if (res.code == 200) {
+              this.getData();
+              ElMessage({
+                showClose: true,
+                message: "操作成功！",
+                type: "success",
+              });
+            } else {
+              ElMessage({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
+          });
+        })
+        .catch(() => { });
+
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+
+    span {
+      margin-right: 10px;
+    }
+
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/system/SysconfAdminView.vue

@@ -107,7 +107,9 @@
       </div>
       <div class="userId">
         <span>值</span>
-        <el-input v-model="configValue" style="width: 75%" class="input"></el-input>
+        <el-input type="textarea"
+                  :autosize="{ minRows: 2}"
+                  v-model="configValue" style="width: 75%" class="input"></el-input>
       </div>
       <div class="userId">
         <span>命名空间</span>

src/views/users/GiftManageView.vue

@@ -1283,6 +1283,7 @@ export default {
                     $("input:checkbox[name='partitionFlag']")[0].checked = false;
                     $("input:checkbox[name='partitionFlag']")[1].checked = false;
                     $("input:checkbox[name='partitionFlag']")[2].checked = false;
+                    $("input:checkbox[name='partitionFlag']")[3].checked = false;
                     console.log("btnEdit");
                     var id = $(this).attr("data-id");
                     $this.files = {};
@@ -1441,6 +1442,11 @@ export default {
                                 } else {
                                     $("input:checkbox[name='partitionFlag']")[2].checked = false; 
                                 }
+                                if ((partitionFlag & 8) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[3].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[3].checked = false; 
+                                }
                                 // 打开编辑弹窗
                                 $("#giftModal").modal('show');
                             } else {

src/views/users/UserRecordAdminView.vue

@@ -20,6 +20,14 @@
                    class="input-sm validate[required]"
                    name="deviceId"
                    id="deviceId">
+            IP:<input type="text"
+                   class="input-sm validate[required]"
+                   name="ip"
+                   id="ip">
+            IP地区:<input type="text"
+                   class="input-sm validate[required]"
+                   name="ipRegion"
+                   id="ipRegion">
             查询类型:<select name="loginType"
                     id="loginType"
                     class="input-sm">
@@ -31,8 +39,8 @@
               <option value="5">苹果登录</option>
               <option value="6">ticket登录</option>
             </select>
-            <button id="btnSearch"
-                    class="btn btn-sm btn-primary">查询</button>
+            <button id="btnSearch" class="btn btn-primary">查询</button>
+            <button id="btnExport" class="btn">导出</button>
           </div>
         </section>
       </div>
@@ -59,7 +67,6 @@ export default {
         $('#table').bootstrapTable('destroy');
         $('#table').bootstrapTable({
           columns: [
-            { field: 'recordId', title: 'recordId', align: 'center', valign: 'middle', width: '5%' },
             { field: 'phone', title: '手机号', align: 'center', valign: 'middle', width: '5%' },
             { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '5%' },
             {
@@ -128,6 +135,7 @@ export default {
                 align: 'center', width: '10%',
                 valign: 'middle'
             },*/
+            { field: 'appVersion', title: 'app版本', align: 'center', width: '5%', valign: 'middle' },
             {
               field: 'os',
               title: '系统类型',
@@ -136,7 +144,6 @@ export default {
               valign: 'middle'
             },
             { field: 'osversion', title: '系统版本', align: 'center', width: '5%', valign: 'middle' },
-            { field: 'ispType', title: '运营商类型', align: 'center', width: '5%', valign: 'middle' },
             { field: 'deviceId', title: '设备号', align: 'center', width: '10%', valign: 'middle' },
             { field: 'model', title: '手机型号', align: 'center', width: '10%', valign: 'middle' },
             {
@@ -182,6 +189,8 @@ export default {
               phone: $('#phone').val(),
               erbanNo: $('#erbanNo').val(),
               deviceId: $('#deviceId').val(),
+              ip: $('#ip').val(),
+              ipRegion: $('#ipRegion').val(),
               loginType: $('#loginType').val(),
             };
             return param;
@@ -201,6 +210,17 @@ export default {
         $('#btnSearch').on('click', function () {
           TableHelper.doRefresh('#table');
         })
+
+        // 导出
+        $('#btnExport').on('click', function () {
+          const phone = $('#phone').val();
+          const erbanNo = $('#erbanNo').val();
+          const deviceId = $('#deviceId').val();
+          const ip = $('#ip').val();
+          const ipRegion = $('#ipRegion').val();
+          const loginType = $('#loginType').val();
+          window.location.href = `/admin/accountLoginRecord/export?phone=${phone}&erbanNo=${erbanNo}&deviceId=${deviceId}&ip=${ip}&ipRegion=${ipRegion}&loginType=${loginType}`;
+        })
       })
     }
   },

src/views/world/community/DynamicVerifyView.vue

@@ -355,7 +355,6 @@ export default {
               width: "5%",
             },
             { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
-            { field: "partitionDesc", title: "地区", align: "center", width: "5%" },
             { field: "nick", title: "昵称", align: "center", width: "5%" },
             { field: "gender", title: "性别", align: "center", width: "5%" },
             { field: "worldName", title: "话题", align: "center", width: "5%" },