修复详情数据异常问题

(cherry picked from commit 8aeb9caa0dcc5bf2fd250af28c2f025bf210e344)

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",

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",

src/api/SsGuild/SsGuild.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 周期选项下拉框
+export const cycleDateList = query => {
+    return request({
+        url: '/admin/ssGuild/cycleDateList',
+        method: 'get',
+        params: query
+    });
+};
+// SS公会列表
+export const list = query => {
+    return request({
+        url: '/admin/ssGuild/list',
+        method: 'get',
+        params: query
+    });
+};
+// 发送金币&批量发送
+export const sendGold = query => {
+    return request({
+        url: '/admin/ssGuild/sendGold',
+        method: 'post',
+        params: query
+    });
+};
+// 导出
+// export const ssGuildExport = query => {
+//     return request({
+//         url: `/admin/ssGuild/export`,
+//         method: 'post',
+//         params: query,
+//         responseType: 'blob'
+//     });
+// };
+// 导出-公会信息
+export const ssGuildExport = query => {
+    window.location.href = `/admin/ssGuild/export?${genQueryParam(query)}`;
+    return;
+};

src/api/lingSmallGames/lingSmallGames.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 获取游戏列表
+export const sysConfKey = query => {
+    return request({
+        url: '/admin/sysConf/key',
+        method: 'get',
+        params: query
+    });
+};
+// 获取列表
+export const statisPage = query => {
+    return request({
+        url: '/admin/miniGame/leadercc/statis/page',
+        method: 'get',
+        params: query
+    });
+};
+// 获取详情列表
+export const detailPage = query => {
+    return request({
+        url: '/admin/miniGame/leadercc/statis/detailPage',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const exportForMiniGame = query => {
+    window.location.href = `/admin/miniGame/leadercc/statis/exportForMiniGame?${genQueryParam(query)}`;
+    return;
+};
+// 导出弹窗
+export const statisExport = query => {
+    window.location.href = `/admin/miniGame/leadercc/statis/export?${genQueryParam(query)}`;
+    return;
+};

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
+    });
+};

src/api/relAgency/relAgency.js

@@ -88,9 +88,16 @@ export const agencyWithdrawExamineExport = query => {
     });
 };
 // 官方提现记录 结算
+// export const agencyWithdrawSet = query => {
+//     return request({
+//         url: '/agencyWithdrawExamine/settle',
+//         method: 'post',
+//         params: query
+//     });
+// };
 export const agencyWithdrawSet = query => {
     return request({
-        url: '/agencyWithdrawExamine/settle',
+        url: '/agencyWithdrawExamine/batchSettle',
         method: 'post',
         params: query
     });
@@ -103,6 +110,14 @@ export const agencyWithdrawBatchSet = query => {
         params: query
     });
 };
+// 官方提现记录 批量驳回
+export const batchReject = query => {
+    return request({
+        url: '/agencyWithdrawExamine/batchReject',
+        method: 'post',
+        params: query
+    });
+};
 
 // 公会开业数据统计
 export const agencyOpenList = query => {
@@ -135,4 +150,27 @@ export const excellentAnchorDetail = query => {
         method: 'get',
         params: query
     });
+};
+// 官方提现-国家
+export const adminCountry = query => {
+    return request({
+        url: '/admin/country/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// =====================================钻石充值流水=======================================
+// 查询
+export const diamondStatistics = query => {
+    return request({
+        url: '/admin/guild/diamondStatistics',
+        method: 'get',
+        params: query
+    });
+};
+//  导出
+export const diamondStatisticsExport = query => {
+    window.location.href = `/admin/guild/diamondStatistics/export?${genQueryParam(query)}`;
+    return;
 };

src/api/relPrivilegeManage/relPrivilegeManage.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request';
+import qs from 'qs';
+// 靓号申请管理 列表
+export const getPrettyNumberExamineList = query => {
+    return request({
+        url: '/admin/prettyNumber/examine/list',
+        method: 'get',
+        params: query
+    });
+};
+// 靓号申请管理 通过
+export const prettyNumberExaminePass = query => {
+    return request({
+        url: '/admin/prettyNumber/examine/pass',
+        method: 'post',
+        params: query
+    }); 
+};
+// 靓号申请管理 删除
+export const prettyNumberExamineDelete = query => {
+    return request({
+        url: '/admin/prettyNumber/examine/delete',
+        method: 'get',
+        params: query
+    });
+};
+// 靓号申请管理 拒绝
+export const prettyNumberExamineReject = query => {
+    return request({
+        url: '/admin/prettyNumber/examine/reject',
+        method: 'post',
+        params: query
+    });
+};
+// 靓号导入
+export const erbanUpload = query => {
+    return request({
+        url: '/admin/prettyNumber/upload',
+        method: 'post',
+        headers: { 'Content-Type': 'multipart/form-data' },
+        data: query
+    });
+};

src/views/accountApplyManage/accountApplyManage.vue

@@ -0,0 +1,457 @@
+<template>
+  <div class="account-apply-manage">
+    <div class="container">
+      <div class="region-box">
+        <el-radio-group v-model="region">
+          <el-radio v-for="(item, index) in userAreaRegion"
+                    :key="index"
+                    :label="item.value">{{ item.name }}</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="handle-box">
+        <el-form ref="searchForm"
+                 :model="searchForm"
+                 label-width="90px"
+                 :disabled="tableLoading">
+          <div class="search-line">
+            <el-form-item label="MoliStar ID"
+                          prop="erbanNo">
+              <el-input v-model.trim="searchForm.erbanNo"
+                        placeholder="Please enter"></el-input>
+            </el-form-item>
+            <el-form-item label="UID"
+                          prop="uid">
+              <el-input v-model.trim="searchForm.uid"
+                        placeholder="Please enter"></el-input>
+            </el-form-item>
+            <el-form-item label="SID"
+                          prop="sid">
+              <el-input v-model.trim="searchForm.sid"
+                        placeholder="Please enter"></el-input>
+            </el-form-item>
+            <el-form-item label="Region"
+                          prop="partitionId">
+              <el-select v-model="searchForm.partitionId">
+                <el-option label="全部"
+                           value=""></el-option>
+                <el-option v-for="item in partitionInfoList"
+                           :key="item.id"
+                           :label="item.desc"
+                           :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label-width="40px">
+              <el-button type="primary"
+                         @click="handSearch">Search</el-button>
+              <el-button plain
+                         @click="resetSearchForm">Reset Search</el-button>
+              <el-upload class="file-uploader"
+                         action="#"
+                         list-type="picture-card"
+                         :show-file-list="false"
+                         :on-change="handleExcel"
+                         accept=".xls, .xlsx"
+                         :auto-upload="false">
+                <el-button type="primary">Import</el-button>
+              </el-upload>
+            </el-form-item>
+          </div>
+        </el-form>
+        <!-- <el-upload
+          class="file-uploader"
+          action="#"
+          list-type="picture-card"
+          :show-file-list="false"
+          :on-change="handleExcel"
+          accept=".xls, .xlsx"
+          :auto-upload="false"
+        >
+          <el-button type="primary" class="el-icon-upload">Import</el-button>
+        </el-upload> -->
+      </div>
+      <div class="table">
+        <el-table :data="tableData"
+                  border
+                  v-loading="tableLoading"
+                  @header-click="headerCopy"
+                  style="width: 100%">
+          <el-table-column align="center"
+                           prop="id"
+                           label="No.">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="erbanNo"
+                           label="MoliStar ID">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="uid"
+                           label="UID">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="level"
+                           label="SID Level">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="nick"
+                           label="Nickname">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="partitionInfo"
+                           label="Region">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="Apply time">
+            <template v-slot="scope">{{
+              convertTimestamp(scope.row.createTime)
+            }}</template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="prettyNo"
+                           label="SID">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="status"
+                           label="State">
+            <template v-slot="scope">
+              <el-tag :type="applyStateTag(scope.row.status)">{{
+                applyStateText(scope.row.status)
+              }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="updateTime"
+                           label="Review time">
+            <template v-slot="scope">{{
+              convertTimestamp(scope.row.updateTime)
+            }}</template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="operater"
+                           label="Operator">
+          </el-table-column>
+          <el-table-column align="center"
+                           label="Operate">
+            <template v-slot="scope">
+              <el-button type="text"
+                         v-if="scope.row.status == 0"
+                         @click="handlePass(scope.$index, scope.row)">
+                Pass
+              </el-button>
+              <el-button type="text"
+                         v-if="scope.row.status == 0"
+                         @click="handleReject(scope.$index, scope.row)">
+                Reject
+              </el-button>
+              <el-button type="text"
+                         v-if="scope.row.status == 1"
+                         class="red"
+                         @click="handleDelete(scope.$index, scope.row)">
+                Delete
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <table-pagination :pageParams="pageParams"
+                          :pageTotal="pageTotal"
+                          :ifShowSizes="true"
+                          @handleSizeChange="handleSizeChange"
+                          @handlePageChange="handlePageChange"></table-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getPrettyNumberExamineList,
+  prettyNumberExaminePass,
+  prettyNumberExamineDelete,
+  prettyNumberExamineReject,
+  erbanUpload,
+} from "@/api/relPrivilegeManage/relPrivilegeManage.js";
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import TablePagination from "@/components/common/TablePagination";
+import { formatDate } from "@/utils/relDate";
+import { ElMessageBox, ElMessage } from "element-plus"; // 正确引入 ElM
+// 混入
+// import Mixin from '../../mixin/mixRegion.js';
+
+export default {
+  name: "accountApplyManage",
+  // mixins: [Mixin],
+  components: { TablePagination },
+  data () {
+    return {
+      partitionInfoList: [],
+      tableLoading: false, // 表格是否加载中
+      tableData: [], // 接口返回的表格数据
+      // 搜索表单相关
+      searchForm: {
+        erbanNo: null,
+        uid: null,
+        sid: null,
+        partitionId: null,
+      },
+      pageTotal: 0, // 接口返回的表格总条数
+      pageParams: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  created () {
+    this.initPartition();
+    this.getData();
+  },
+  methods: {
+    getData () {
+      this.tableLoading = true;
+
+      let { pageParams, searchForm } = this;
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          !searchForm[item] ||
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+
+      getPrettyNumberExamineList(pageParams).then((res) => {
+        this.tableLoading = false;
+        if (res.code == 200) {
+          let data = res.data;
+          console.log(data);
+          this.tableData = data.rows;
+          this.pageTotal = data.total;
+        }
+      });
+    },
+    //导入表格
+    handleExcel (file) {
+      let formData = new FormData(); //声明一个FormDate对象
+      formData.append("file", file.raw); //把文件信息放入对象中
+      console.log(file.raw);
+      erbanUpload(formData)
+        .then((res) => {
+          if (res.code == 200) {
+            this.getData();
+            this.$message.success("Operation successful");
+          }
+        })
+        .catch((err) => {
+          // that.$message({
+          //     type: 'error',
+          //     message: 'Operation failed'
+          // });
+        });
+    },
+    // 通过
+    handlePass (index, row) {
+      ElMessageBox.confirm("Are you sure you want to pass?", "Prompt", {
+        type: "warning",
+        confirmButtonText: "Sure",
+        cancelButtonText: "Cancel",
+      })
+        .then(() => {
+          prettyNumberExaminePass({ id: row.id }).then((res) => {
+            if (res.code == 200) {
+              this.getData();
+              ElMessage({
+                showClose: true,
+                message: "Operation successful",
+                type: "success",
+              });
+            } else {
+              ElMessage({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    // 拒绝
+    handleReject (index, row) {
+      ElMessageBox.confirm("Are you sure you want to refuse?", "Prompt", {
+        type: "warning",
+        confirmButtonText: "Sure",
+        cancelButtonText: "Cancel",
+      })
+        .then(() => {
+          prettyNumberExamineReject({ id: row.id }).then((res) => {
+            if (res.code == 200) {
+              this.getData();
+              ElMessage({
+                showClose: true,
+                message: "Operation successful",
+                type: "success",
+              });
+            } else {
+              ElMessage({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    // 删除操作
+    handleDelete (index, row) {
+      // 二次确认删除
+      ElMessageBox.confirm("Are you sure you want to delete?", "Prompt", {
+        type: "warning",
+        confirmButtonText: "Sure",
+        cancelButtonText: "Cancel",
+      })
+        .then(() => {
+          prettyNumberExamineDelete({ id: row.id }).then((res) => {
+            if (res.code == 200) {
+              this.getData();
+              ElMessage({
+                showClose: true,
+                message: "Operation successful",
+                type: "success",
+              });
+            } else {
+              ElMessage({
+                showClose: true,
+                message: res.message,
+                type: "error",
+              });
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    // 点击搜索
+    handSearch () {
+      this.$refs["searchForm"].validate((valid) => {
+        if (valid) {
+          this.pageParams.pageNo = 1;
+          this.getData();
+        }
+      });
+    },
+    // 重置搜索表单
+    resetSearchForm () {
+      this.$refs["searchForm"].resetFields();
+      this.pageParams.pageNo = 1;
+      this.getData();
+    },
+    // 分页导航
+    handleSizeChange (val) {
+      this.pageParams.pageNo = val;
+      this.getData();
+    },
+    handlePageChange (val) {
+      this.pageParams.pageNo = val;
+      this.getData();
+    },
+    headerCopy (column, e) {
+      this.$copy(column.label);
+    },
+    initPartition () {
+      getPartitionInfoList().then(res => {
+        let data = res.data;
+        this.partitionInfoList = data;
+      });
+    },
+  },
+  computed: {
+    applyStateTag () {
+      return function (val) {
+        let text = "";
+        switch (val) {
+          case 0:
+            text = "warning";
+            break;
+          case 1:
+            text = "success";
+            break;
+          case 2:
+            text = "info";
+            break;
+          case 3:
+            text = "danger";
+            break;
+        }
+        return text;
+      };
+    },
+    applyStateText () {
+      return function (val) {
+        let text = "";
+        switch (val) {
+          case 0:
+            text = "In Review";
+            break;
+          case 1:
+            text = "Passed";
+            break;
+          case 2:
+            text = "Rejected";
+            break;
+          case 3:
+            text = "Deleted";
+            break;
+        }
+        return text;
+      };
+    },
+    convertTimestamp () {
+      return function (time) {
+        let date = new Date(time);
+        return formatDate(date);
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.red {
+  color: rgb(241, 19, 19);
+}
+
+// ::v-deep {
+//   .el-upload--picture-card {
+//     background-color: transparent;
+//     border: 0;
+//     border-radius: 0;
+//     box-sizing: border-box;
+//     width: 0;
+//     height: 45px;
+//     line-height: 0;
+//     vertical-align: top;
+//   }
+// }
+.file-uploader {
+  display: block;
+  margin-left: 51px;
+  input {
+    display: none;
+  }
+  .el-upload {
+    background-color: transparent;
+    border: 0;
+    border-radius: 0;
+    box-sizing: border-box;
+    width: 0;
+    height: 45px;
+    line-height: 0;
+    vertical-align: top;
+  }
+  span {
+    display: block;
+  }
+}
+</style>

src/views/car/CarGoodsAdminView.vue

@@ -1046,11 +1046,11 @@ export default {
                             $("#tipModal").modal('show');
                             return;
                         }
-                        if (!effect) {
-                            $("#tipMsg").text("请上传动画图片");
-                            $("#tipModal").modal('show');
-                            return;
-                        }
+                        // if (!effect) {
+                        //     $("#tipMsg").text("请上传动画图片");
+                        //     $("#tipModal").modal('show');
+                        //     return;
+                        // } 
                         if (!days || days <= 0) {
                             $("#tipMsg").text("请输入合理的购买天数");
                             $("#tipModal").modal('show');

src/views/games/lingSmallGames.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>游戏</span>
+      <el-select v-model="inquire.gameArrVal" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.gamesArr"
+          :key="item.gameId"
+          :label="item.gameName"
+          :value="item.gameId"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <span class="demonstration">日期</span>
+      <el-date-picker
+        v-model="inquire.time"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
+      </el-date-picker>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        tableData = [];
+        currentPage = 1;
+        isFinished = false;
+        getData();
+      "
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="dateTime" align="center" label="日期" />
+      <el-table-column prop="userCount" align="center" label="人数" />
+      <el-table-column prop="consumeNum" align="center" label="货币消耗" />
+      <el-table-column prop="settleNum" align="center" label="结算总量" />
+      <el-table-column prop="platformNum" align="center" label="平台收入" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            class="primary"
+            type="primary"
+            @click="
+              detailPageFunArr = scope.row;
+              tableDataDetails = [];
+              currentPage2 = 1;
+              isFinished2 = false;
+              detailPageFun();
+            "
+            size="default"
+            >查看详情</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="[1, 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 v-if="!isFinished" class="pagination">
+      <el-button
+        class="pagination_in"
+        @click="loadMore"
+        type="primary"
+        :loading="isLoading"
+        >加载更多</el-button
+      >
+    </div>
+    <div v-else class="pagination">
+      <span class="pagination_in">没有更多数据了</span>
+    </div>
+  </div>
+
+  <!-- 内嵌单个工会详情 -->
+  <el-dialog :title="detailsTitle" v-model="detailsDialog">
+    <el-table
+      v-loading="loading2"
+      :data="tableDataDetails"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用户平台ID" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="consumeNum" align="center" label="货币消耗" />
+      <el-table-column prop="settleNum" align="center" label="结算总量" />
+      <el-table-column prop="platformNum" align="center" label="平台收入" />
+    </el-table>
+    <!-- 分页 -->
+    <!-- <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage2"
+      v-model:page-size="pageSize2"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total2"
+      @size-change="handleSizeChange2"
+      @current-change="handleCurrentChange2"
+    /> -->
+    <!-- 加载更多按钮 -->
+    <div v-if="!isFinished2" class="pagination">
+      <el-button
+        class="pagination_in"
+        @click="loadMore2"
+        type="primary"
+        :loading="isLoading2"
+        >加载更多</el-button
+      >
+    </div>
+    <div v-else class="pagination">
+      <span class="pagination_in">没有更多数据了</span>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="detailsDialog = false">关闭</el-button>
+        <el-button type="primary" @click="confirmExport2Excel2()"
+          >导出</el-button
+        >
+      </div></template
+    >
+  </el-dialog>
+</template>
+<script>
+import {
+  statisPage,
+  sysConfKey,
+  detailPage,
+  exportForMiniGame,
+  statisExport,
+} from "@/api/lingSmallGames/lingSmallGames";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "lingSmallGames",
+  data() {
+    return {
+      loading: false,
+      loading2: false,
+      //查询所需条件对象
+      inquire: {
+        time: "",
+        gameArrVal: "",
+        gamesArr: [],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      isLoading: false, // 加载状态
+      isFinished: false, // 是否加载完成
+      //   弹窗
+      detailsDialog: false,
+      detailsTitle: "",
+      tableDataDetails: [],
+      dateTimePub: null,
+      detailPageFunArr: {},
+      // 分页
+      total2: 0, //总页数
+      currentPage2: 1, //页码
+      pageSize2: 10, //条数
+      isLoading2: false, // 加载状态
+      isFinished2: false, // 是否加载完成
+    };
+  },
+  created() {
+    sysConfKey({ configId: "leadercc_game" }).then((res) => {
+      this.inquire.gamesArr = JSON.parse(res.data.configValue);
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.isLoading = true;
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      statisPage({
+        gameId: this.inquire.gameArrVal,
+        startTime: startTime,
+        endTime: endTime,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          // 判断返回的记录是否为空数组
+          const records = res.data.records;
+          if (records.length > 0) {
+            // 如果有数据，追加到表格数据中
+            this.tableData = [...this.tableData, ...records];
+            this.currentPage++; // 更新当前页码
+          } else {
+            // 如果数据长度为 0，停止加载
+            this.isFinished = true;
+          }
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+        this.isLoading = false;
+      });
+    },
+    // 加载下一页数据
+    loadMore() {
+      if (!this.isFinished) {
+        this.currentPage = this.currentPage++;
+        this.getData(this.currentPage);
+      }
+    },
+    // 加载下一页数据
+    loadMore2() {
+      if (!this.isFinished2) {
+        this.currentPage2 = this.currentPage2++;
+        this.detailPageFun(this.currentPage2);
+      }
+    },
+    // 导出
+    confirmExport2Excel() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      exportForMiniGame({
+        gameId: this.inquire.gameArrVal,
+        startTime: startTime,
+        endTime: endTime,
+      }).then();
+    },
+    // 导出弹窗
+    confirmExport2Excel2() {
+      statisExport({
+        dateTime: this.dateTimePub,
+        gameId: this.inquire.gameArrVal,
+      }).then();
+    },
+    // 详情接口
+    detailPageFun() {
+      this.isLoading2 = true;
+      this.detailsDialog = true;
+      this.loading2 = true;
+      this.detailsTitle = this.dateTimePub = this.detailPageFunArr.dateTime;
+      detailPage({
+        gameId: this.detailPageFunArr.gameId,
+        dateTime: this.detailPageFunArr.dateTime,
+        pageNum: this.currentPage2,
+        pageSize: this.pageSize2,
+      }).then((res) => {
+        if (res.code == 200) {
+          // 判断返回的记录是否为空数组
+          const records2 = res.data.records;
+          if (records2.length > 0) {
+            // 如果有数据，追加到表格数据中
+            this.tableDataDetails = [...this.tableDataDetails, ...records2];
+            this.currentPage2++; // 更新当前页码
+          } else {
+            // 如果数据长度为 0，停止加载
+            this.isFinished2 = true;
+          }
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading2 = false;
+        this.isLoading2 = false;
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+    handleSizeChange2() {
+      this.detailPageFun();
+    },
+    handleCurrentChange2() {
+      this.detailPageFun();
+    },
+  },
+};
+</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;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
+</style>

src/views/guildOperationManagement/agentSendSalary.vue

@@ -113,6 +113,7 @@
 import { chargeAgentList, chargeAgentSum } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
+import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 import { ref } from "vue";
@@ -176,8 +177,13 @@ export default {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = formatDate(searchForm.startTime )
-      searchForm.endTime = formatDate(searchForm.endTime )
+      console.log(searchForm);
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -197,7 +203,7 @@ export default {
           let data = res.data;
           this.tableData = data.records;
           this.pageTotal = data.total;
-        }else {
+        } else {
           ElMessage({
             showClose: true,
             message: res.message,
@@ -208,7 +214,7 @@ export default {
       chargeAgentSum(pageParams).then((res) => {
         if (res.code == 200) {
           this.total = res.data;
-        }else {
+        } else {
           ElMessage({
             showClose: true,
             message: res.message,

src/views/guildOperationManagement/diamondFlow.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>公会ID</span>
+      <el-input
+        v-model="inquire.guildId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会长ID</span>
+      <el-input
+        v-model="inquire.guildBoosId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 时间选择器 -->
+    <!-- <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div> -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">开始时间</span>
+        <el-date-picker
+          v-model="inquire.time[0]"
+          type="date"
+          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="date"
+          placeholder="结束时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+
+    <!-- 查询按钮 -->
+    <el-button class="primary but" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.guildId = '';
+        inquire.guildBoosId = '';
+        inquire.time = [];
+        getData();
+      "
+      >重置查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="diamondStatisticsExportFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column type="index" width="100" align="center" label="序号" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="memberNum" align="center" label="主播人数" />
+      <el-table-column prop="diamondNum" 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 {
+  diamondStatistics,
+  diamondStatisticsExport,
+} from "@/api/relAgency/relAgency";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "diamondFlow",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        guildId: "",
+        guildBoosId: "",
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 5, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      console.log(this.inquire.time, 111111);
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd")
+          : null;
+      }
+      diamondStatistics({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 导出
+    diamondStatisticsExportFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      diamondStatisticsExport({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 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;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/guildOperationManagement/guildInfo.vue

@@ -3,11 +3,9 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
-        v-model="inquire.userId"
-        placeholder=""
-        class="input"
-      ></el-input>
+      <el-input v-model="inquire.userId"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <!-- <div class="inquire">
       <span>推荐人</span>
@@ -32,57 +30,65 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-    <el-button class="primary" type="primary" @click="addDialog = true"
-      >添加</el-button
-    >
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
-      >导出</el-button
-    >
+    <el-button class="primary"
+               type="primary"
+               @click="getData()">查询</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="addDialog = true">添加</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="exportInfoFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
+    <el-table v-loading="loading"
+              :data="tableData"
+              border
+              style="width: 100%; margin-top: 25px">
+      <el-table-column prop="id"
+                       align="center"
+                       label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-      <el-table-column
-        prop="ownerPartitionName"
-        align="center"
-        label="会长分区"
-      />
-      <el-table-column prop="name" align="center" label="公会昵称" />
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+      <el-table-column prop="ownerErbanNo"
+                       align="center"
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.backgroundUrl"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.backgroundUrl]"
-            fit="cover"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.backgroundUrl"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.backgroundUrl]"
+                    fit="cover"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
+                       align="center"
+                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" label="成员数量/上限">
+      <el-table-column align="center"
+                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button
-            @click="memberDialogFun(scope.row)"
-            type="text"
-            size="default"
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
+          <el-button @click="memberDialogFun(scope.row)"
+                     type="text"
+                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
         </template>
       </el-table-column>
+      <el-table-column prop="adminName"
+                       align="center"
+                       label="操作人" />
       <!-- <el-table-column align="center" label="收款账户" width="300">
         <template v-slot="scope">
           <el-button
@@ -121,43 +127,37 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="!scope.row.enable"
-            >编辑</el-button
-          >
-          <el-button
-            @click="
+          <el-button @click="ediClick(scope)"
+                     class="primary"
+                     type="primary"
+                     size="default"
+                     :disabled="!scope.row.enable">编辑</el-button>
+          <el-button @click="
               delDialog = true;
               delDialogData = scope.row;
             "
-            :class="scope.row.enable ? 'danger' : 'info'"
-            :type="scope.row.enable ? 'danger' : 'info'"
-            size="default"
-            :disabled="!scope.row.enable"
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
+                     :class="scope.row.enable ? 'danger' : 'info'"
+                     :type="scope.row.enable ? 'danger' : 'info'"
+                     size="default"
+                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
+        <el-input v-model="resource.id"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -186,188 +186,173 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <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-pagination style="margin-top: 10px"
+                   class="paginationClass"
+                   v-model:current-page="currentPage"
+                   v-model:page-size="pageSize"
+                   :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+                   layout="sizes, prev, pager, next"
+                   :total="total"
+                   @size-change="handleSizeChange"
+                   @current-change="handleCurrentChange" />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
+    <el-dialog v-model="editDialog"
+               title="编辑"
+               width="28%"
+               center>
+      <!-- 公会ID -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会ID</span>
+        <el-input v-model="ediObj.id"
+                  style="width: 75%"
+                  class="input"
+                  disabled></el-input>
+      </div>
       <!-- 会长ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >会长ID</span
-        >
-        <el-input
-          v-model="ediObj.leaderId"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长ID</span>
+        <el-input v-model="ediObj.leaderId"
+                  style="width: 75%"
+                  class="input"
+                  disabled></el-input>
       </div>
       <!-- 会长昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >会长昵称</span
-        >
-        <el-input
-          v-model="ediObj.leaderNick"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长昵称</span>
+        <el-input v-model="ediObj.leaderNick"
+                  style="width: 75%"
+                  class="input"
+                  disabled></el-input>
       </div>
       <!-- 公会昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >公会昵称</span
-        >
-        <el-input
-          v-model="ediObj.guildNick"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会昵称</span>
+        <el-input v-model="ediObj.guildNick"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <span class="left"
+              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
-          class="avatar-uploader"
-          action="/admin/tencent/cos/upload/file"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
-        >
-          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
-          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        <el-upload class="avatar-uploader"
+                   action="/admin/tencent/cos/upload/file"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess"
+                   :before-upload="beforeAvatarUpload"
+                   :on-error="handleAvatarError">
+          <img v-if="ediObj.imageUrl1"
+               :src="ediObj.imageUrl1"
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
         </el-upload>
       </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >成员数量上限</span
-        >
-        <el-input
-          v-model="ediObj.guildNumber"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">成员数量上限</span>
+        <el-input v-model="ediObj.guildNumber"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
+          <el-button type="primary"
+                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+    <el-dialog v-model="delDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog
-      v-model="payAccountDialog"
-      :title="payAccountTitle"
-      width="28%"
-      center
-    >
+    <el-dialog v-model="payAccountDialog"
+               :title="payAccountTitle"
+               width="28%"
+               center>
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >Payoneer</span
-        >
-        <el-input
-          v-model="payAccount.payoneer"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">Payoneer</span>
+        <el-input v-model="payAccount.payoneer"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >USDT-ERC20</span
-        >
-        <el-input
-          v-model="payAccount.usdt"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">USDT-ERC20</span>
+        <el-input v-model="payAccount.usdt"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >PayPal</span
-        >
-        <el-input
-          v-model="payAccount.payPal"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">PayPal</span>
+        <el-input v-model="payAccount.payPal"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary" @click="payAccountClick()">
+          <el-button type="primary"
+                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+    <el-dialog v-model="memberDialog"
+               :title="memberTitle"
+               width="36%"
+               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input
-          v-model="member.userID"
-          placeholder="请输入新增平台id"
-          class="input"
-        ></el-input>
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+        <el-input v-model="member.userID"
+                  placeholder="请输入新增平台id"
+                  class="input"></el-input>
+        <el-button type="primary"
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
-        v-loading="loading"
-        :data="member.tableData"
-        border
-        style="width: 100%; margin-top: 25px"
-      >
-        <el-table-column align="center" label="用户平台ID">
+      <el-table v-loading="loading"
+                :data="member.tableData"
+                border
+                style="width: 100%; margin-top: 25px">
+        <el-table-column align="center"
+                         label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -380,53 +365,61 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick" align="center" label="用户昵称" />
-        <el-table-column prop="createTime" align="center" label="加入时间" />
-        <el-table-column align="center" label="操作" width="300">
+        <el-table-column prop="nick"
+                         align="center"
+                         label="用户昵称" />
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="加入时间" />
+        <el-table-column prop="adminName"
+                         align="center"
+                         label="操作人" />
+        <el-table-column align="center"
+                         label="操作"
+                         width="300">
           <template v-slot="scope">
-            <el-button
-              @click="setMemberFun(scope.row)"
-              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >{{
+            <el-button @click="setMemberFun(scope.row)"
+                       :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button
-            >
-            <el-button
-              @click="
+              }}</el-button>
+            <el-button @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
-              class="danger"
-              type="danger"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >删除</el-button
-            >
+                       class="danger"
+                       type="danger"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="memberDialog = false">
+          <el-button type="primary"
+                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
+    <el-dialog v-model="memberRemoveDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary" @click="delmemberRemoveClick()">
+          <el-button type="primary"
+                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -453,7 +446,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildInfoNew",
-  data() {
+  data () {
     return {
       loading: false,
       delDialog: false,
@@ -510,12 +503,12 @@ export default {
       memberRemoveObj: {},
     };
   },
-  created() {
+  created () {
     this.getData();
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -539,7 +532,7 @@ export default {
       });
     },
     // 打开成员信息弹窗
-    memberDialogFun(val) {
+    memberDialogFun (val) {
       var than = this;
       than.memberTitle = `【${val.name}】成员信息`;
       than.memberNew = val;
@@ -551,7 +544,7 @@ export default {
       });
     },
     // 二次确认删除成员
-    delmemberRemoveClick() {
+    delmemberRemoveClick () {
       removeMember({
         guildMemberId: this.memberRemoveObj.guildMemberId,
       }).then((res) => {
@@ -577,7 +570,7 @@ export default {
       });
     },
     // 设置管理员
-    setMemberFun(val) {
+    setMemberFun (val) {
       setManager({
         guildMemberId: val.guildMemberId,
         status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
@@ -604,7 +597,7 @@ export default {
       });
     },
     // 新增成员
-    addMemberFun() {
+    addMemberFun () {
       addMember({
         erbanNo: this.member.userID,
         guildId: this.memberNew.id,
@@ -631,7 +624,7 @@ export default {
       });
     },
     // 打开收款账户弹窗
-    payAccountDialogFun(val) {
+    payAccountDialogFun (val) {
       this.payAccountTitle = `(${val.ownerNick}【ID:${val.ownerErbanNo}】)的收款账户`;
       this.payAccount.payoneer = val.payAccount.payoneer;
       this.payAccount.usdt = val.payAccount.usdt;
@@ -640,7 +633,7 @@ export default {
       this.payAccountNew = val;
     },
     // 保存收款账户
-    payAccountClick() {
+    payAccountClick () {
       savePayAccount({
         id: this.payAccountNew.payAccount.familyId,
         payPal: this.payAccount.payPal,
@@ -665,7 +658,7 @@ export default {
       });
     },
     // 导出
-    exportInfoFun() {
+    exportInfoFun () {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -679,20 +672,33 @@ export default {
         familyName: this.inquire.nick,
         // startDate: startTime,
         // endDate: endTime,
-      }).then((res) => {});
+      }).then((res) => { });
     },
     // 添加
-    add() {
+    add () {
       this.addDialog = false;
       create({
         erbanNo: this.resource.id,
         referrer: this.resource.referrer,
       }).then((res) => {
-        this.getData();
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "添加成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
       });
     },
     // 编辑按钮
-    ediClick(res) {
+    ediClick (res) {
       var obj = res.row;
       this.ediObj.leaderId = obj.ownerErbanNo;
       this.ediObj.leaderNick = obj.ownerNick;
@@ -703,7 +709,7 @@ export default {
       this.editDialog = true;
     },
     // 二次确认弹窗
-    editDialogClick() {
+    editDialogClick () {
       console.log(this.ediObj);
       update({
         id: this.ediObj.id,
@@ -730,9 +736,9 @@ export default {
       });
     },
     // 解散按钮
-    delClick() {
+    delClick () {
       console.log(this.delDialogData.id);
-      var guildId  = this.delDialogData.id ;
+      var guildId = this.delDialogData.id;
       dismiss({ guildId }).then((res) => {
         console.log();
         if (res.code == 200) {
@@ -752,21 +758,21 @@ export default {
         this.delDialog = false;
       });
     },
-    beforeAvatarUpload() {
+    beforeAvatarUpload () {
       ElMessage({
         showClose: true,
         message: "上传中~",
         type: "warning",
       });
     },
-    handleAvatarError() {
+    handleAvatarError () {
       ElMessage({
         showClose: true,
         message: "上传失败！",
         type: "error",
       });
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       console.log(file);
       // this.ediObj.imageUrl1 = URL.createObjectURL();
       this.ediObj.imageUrl1 = file.response.data;
@@ -777,10 +783,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -20,16 +20,36 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
-            <el-form-item label="公会长ID" prop="agencyOwnerErbanNo">
+            <el-form-item label="MoliStar ID" prop="agencyOwnerErbanNo">
               <el-input
                 v-model.trim="searchForm.agencyOwnerErbanNo"
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label="状态" prop="status">
+            <el-form-item label="提现状态" prop="status">
               <el-select v-model="searchForm.status">
-                <el-option label="已结算" value="1"></el-option>
-                <el-option label="未结算" value="0"></el-option>
+                <el-option label="审核中" value="0"></el-option>
+                <el-option label="审核通过" value="1"></el-option>
+                <el-option label="未通过" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="提现账户" prop="accountType">
+              <el-select v-model="searchForm.accountType">
+                <el-option label="Vodafone" value="VODAFONE"></el-option>
+                <el-option label="Payonner" value="PAYONNER"></el-option>
+                <el-option label="USD" value="USDT"></el-option>
+                <el-option label="Bank" value="BANK"></el-option>
+                <el-option label="Other" value="OTHER"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="国家" prop="country">
+              <el-select v-model="searchForm.country">
+                <el-option
+                  v-for="(item, index) in adminCountryArr"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="时间" class="large">
@@ -52,17 +72,30 @@
 
             <el-form-item label-width="40px">
               <el-button type="primary" @click="handSearch">搜索</el-button>
-              <el-button plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button  type="primary" plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button
+                type="primary"
+                class="exportBtn"
+                @click="confirmExport2Excel"
+                >导出</el-button
+              >
+              <el-button @click="handleChangeAll()" type="info" plain
+                >批量发放</el-button
+              >
+              <el-button
+                @click="
+                  centerDialogVisible = true;
+                  centerDialogVisibleType = 1;
+                "
+                type="info"
+                plain
+                >批量驳回</el-button
+              >
             </el-form-item>
           </div>
         </el-form>
-        <el-button type="primary" class="exportBtn" @click="confirmExport2Excel"
-          >导出</el-button
-        >
-        <el-button @click="handleChangeAll()" type="info" plain
-          >批量操作</el-button
-        >
       </div>
+      <!-- 表格 -->
       <div class="table">
         <el-table
           :data="tableData"
@@ -70,74 +103,88 @@
           v-loading="tableLoading"
           @header-click="headerCopy"
           @selection-change="handleSelectionChange"
-          style="width: 100%"
+          style="width: 100%;overflow-x: auto;"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区服">
-            <template v-slot="scope">
-              {{ regionType(scope.row.region) }}
-            </template>
-          </el-table-column>-->
-          <el-table-column align="center" prop="agencyId" label="公会ID">
-          </el-table-column>
-          <el-table-column align="center" prop="erbanNo" label="公会长ID">
-          </el-table-column>
-          <el-table-column align="center" prop="nick" label="公会长昵称">
-          </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区域">
-          </el-table-column>
-          <el-table-column align="center" prop="abbr" label="国家">
-          </el-table-column> -->
-          <el-table-column align="center" prop="guildUsdNum" label="提现薪资">
-            <template v-slot="scope">
-              {{ scope.row.guildUsdNum }}
-            </template>
-          </el-table-column>
+          <el-table-column type="selection"> </el-table-column>
+          <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
+          <el-table-column align="center" prop="nick" label="昵称" />
+          <el-table-column align="center" prop="accountCountry" label="国家" />
           <el-table-column
             align="center"
-            prop="createTime"
-            label="创建时间"
-            width="160"
+            prop="blocked"
+            label="用户当前账户状态"
           >
             <template v-slot="scope">
-              {{ convertTimestamp(scope.row.createTime) }}
+              {{ scope.row.blocked ? "封禁" : "正常" }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="status" label="状态">
-            <template v-slot="scope">
-              {{ scope.row.status == 0 ? "未结算" : "已结算" }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="hallSalary" label="操作">
-            <template v-slot="scope">
-              <el-button
-                v-if="scope.row.status == 0"
-                @click="handleChange(scope.row)"
-                type="text"
-                size="mini"
-              >
-                结算
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="updateTime"
-            label="操作时间"
-            width="160"
-          >
+          <el-table-column align="center" prop="status" label="申请状态">
             <template v-slot="scope">
               {{
-                scope.row.updateTime
-                  ? convertTimestamp(scope.row.updateTime)
-                  : ""
+                scope.row.status == 0
+                  ? "审核中"
+                  : scope.row.status == 1
+                  ? "通过"
+                  : "未通过"
               }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="operator" label="操作人">
+          <el-table-column align="center" prop="createTime" label="申请时间" />
+          <el-table-column
+            align="center"
+            prop="accountType"
+            label="提现类型  "
+          />
+          <el-table-column
+            align="center"
+            prop="guildUsdNum"
+            label="提现薪资US"
+          />
+          <el-table-column align="center" prop="currency" label="发放币种" />
+          <el-table-column align="center" prop="currencyNum" label="发放金额" />
+          <el-table-column align="center" prop="withdrawRate" label="手续费" />
+          <el-table-column align="center" prop="withdrawNum" label="核销薪资" />
+          <el-table-column align="center" prop="remark" label="驳回理由">
+            <template v-slot="scope">
+              {{ scope.row.remark ? scope.row.remark : "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="hallSalary" label="操作" width="150">
+            <template v-slot="scope">
+              <div v-if="scope.row.status == 0">
+                <el-button
+                  @click="handleChange(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  发放
+                </el-button>
+                <el-button
+                  @click="
+                    centerDialogVisible = true;
+                    centerDialogVisibleType = 2;
+                    centerDialogVisibleID = scope.row.id;
+                  "
+                  type="text"
+                  size="mini"
+                >
+                  驳回
+                </el-button>
+              </div>
+              <div>
+                <el-button
+                  @click="accountInfosFun(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  查看详情
+                </el-button>
+              </div>
+            </template>
           </el-table-column>
         </el-table>
       </div>
+      <!-- 分页 -->
       <table-pagination
         :pageParams="pageParams"
         :pageTotal="pageTotal"
@@ -145,6 +192,46 @@
         @handleSizeChange="handleSizeChange"
         @handlePageChange="handlePageChange"
       ></table-pagination>
+      <!-- 驳回弹窗 -->
+      <el-dialog v-model="centerDialogVisible" title="提示" width="30%" center>
+        <span> 请选择驳回理由:</span>
+        <div class="boxs">
+          <el-radio class="radios" v-model="radio" label="用户消息提供不足"
+            >用户消息提供不足</el-radio
+          >
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="dialogClick()"> 确认 </el-button>
+          </span>
+        </template>
+      </el-dialog>
+      <!-- 提现详情弹窗 -->
+      <el-dialog v-model="centerDialogVisible2" title="提现详情">
+        <div class="boxs2">
+          <div>申请提现时间：{{ accountDetails.createTime }}</div>
+          <div>申请ID：{{ accountDetails.erbanNo }}</div>
+          <div>country：{{ accountDetails.country }}</div>
+          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
+          <div>Bank Name：{{ accountDetails.bank_name }}</div>
+          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
+          <div>payeeName:：{{ accountDetails.full_name }}</div>
+          <div>address：{{ accountDetails.address }}</div>
+          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
+          <div>
+            发放金额：{{ accountDetails.currency }}
+            {{ accountDetails.currencyNum }}
+          </div>
+          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
+          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible2 = false">确认</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -155,11 +242,14 @@ import {
   agencyWithdrawExamineExport,
   agencyWithdrawSet,
   agencyWithdrawBatchSet,
+  batchReject,
+  adminCountry,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
+import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
-import { ElMessageBox } from 'element-plus'; // 正确引入 ElM
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
 // 混入
 // import Mixin from '../../mixin/mixRegion.js';
 
@@ -173,19 +263,27 @@ export default {
       btnLoading: false, // 导出弹出框(dialog)的确认按钮
       tableLoading: false, // 表格是否加载中
 
-      tableData: [], // 接口返回的表格数据
+      tableData: [], // 接口  返回的表格数据
       pageTotal: 0, // 接口返回的表格总条数
       pageParams: {
         pageNo: 1,
         pageSize: 20,
       },
+      centerDialogVisible: false, //驳回弹窗
+      centerDialogVisibleType: null, //驳回弹窗
+      centerDialogVisibleID: null, //驳回弹窗
+      centerDialogVisible2: false, //操作弹窗
+      radio: "用户消息提供不足", //驳回原因
       // 搜索表单相关
       searchForm: {
         agencyOwnerErbanNo: null,
         status: null,
         startTime: null,
         endTime: null,
+        adminCountry: null,
+        country: null,
       },
+      adminCountryArr: [],
       searchRule: {
         startTime: [
           {
@@ -215,16 +313,41 @@ export default {
         ],
       },
       idStr: [], //批量删除ID
+      // 查看薪资弹窗数据存储
+      accountDetails: {
+        createTime: null,
+        erbanNo: null,
+        country: null,
+        bank_account: null,
+        bank_name: null,
+        swift_code: null,
+        full_name: null,
+        address: null,
+        guildUsdNum: null,
+        currency: null,
+        currencyNum: null,
+        withdrawRate: null,
+        withdrawNum: null,
+      },
     };
   },
   created() {
-    // this.getData();
+    adminCountry().then((res) => {
+      this.adminCountryArr = res.data;
+      this.getData();
+    });
   },
   methods: {
     getData() {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -236,7 +359,8 @@ export default {
         }
       });
       Object.assign(pageParams, searchForm);
-
+      console.log(pageParams);
+      console.log(searchForm);
       agencyWithdrawList(pageParams).then((res) => {
         this.tableLoading = false;
         if (res.code == 200) {
@@ -281,6 +405,61 @@ export default {
           });
         });
     },
+    // 查看详情处理函数
+    accountInfosFun(res) {
+      var obj = JSON.parse(res.accountInfos);
+      console.log(obj);
+      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
+      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
+      this.accountDetails.country = obj.country ? obj.country : "-";
+      this.accountDetails.bank_account = obj.bank_account
+        ? obj.bank_account
+        : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.address = obj.address ? obj.address : "-";
+      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
+      this.accountDetails.currency = res.currency ? res.currency : "-";
+      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
+      this.accountDetails.withdrawRate = res.withdrawRate
+        ? res.withdrawRate
+        : "-";
+      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
+      this.centerDialogVisible2 = true;
+    },
+    // 批量驳回
+    dialogClick() {
+      batchReject({
+        ids:
+          this.centerDialogVisibleType == 1
+            ? this.idStr
+            : this.centerDialogVisibleID,
+        remark: this.radio,
+      })
+        .then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.getData();
+            this.centerDialogVisible = false;
+            this.idStr = null;
+          } else {
+            ElMessage({
+              type: "error",
+              message: res.message,
+            });
+          }
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
     handleChange(row) {
       ElMessageBox.confirm("确定要结算吗", "提示", {
         confirmButtonText: "确定",
@@ -288,7 +467,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          agencyWithdrawSet({ id: row.id }).then((res) => {
+          agencyWithdrawSet({ ids: row.id }).then((res) => {
             if (res.success === true) {
               ElMessage({
                 type: "success",
@@ -402,13 +581,34 @@ export default {
 
 <style scope>
 .exportBtn {
-  margin-bottom: 20px;
+  margin-bottom: 0;
+}
+.text {
+  margin-left: 20px;
 }
-
 .container {
   width: 100%;
 }
 .search-line {
   width: 38%;
 }
+.boxs {
+  margin-top: 10px;
+  width: 100%;
+  word-wrap: break-word; /* 允许在单词内换行 */
+  overflow-wrap: break-word; /* 同上，现代浏览器推荐使用 */
+  white-space: normal; /* 允许换行 */
+}
+.radios {
+  display: block !important;
+  width: 100% !important;
+  word-wrap: break-word !important; /* 允许在单词内换行 */
+  overflow-wrap: break-word !important; /* 同上，现代浏览器推荐使用 */
+  white-space: normal !important; /* 允许换行 */
+  height: auto !important;
+}
+.boxs2 div {
+  margin-bottom: 10px;
+  font-size: 16px;
+}
 </style>

src/views/login/index.vue

@@ -72,7 +72,7 @@ export default {
   name: "LoginView",
   data () {
     return {
-      smsSwitch: true,
+      smsSwitch: false,
     };
   },
   setup () {

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>

src/views/luckGift/luckGiftData.vue

@@ -0,0 +1,265 @@
+<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>
+      <el-button
+        class="primary"
+        type="primary"
+        style="margin-left=20px;"
+        :disabled="butClick"
+        @click="
+          editDialog = true;
+          type = 12;
+          editDialogTitle = '赠送1000倍奖励';
+          value = inquire.x;
+        "
+      >
+        赠送</el-button
+      >
+    </div>
+
+    <!-- 表格 -->
+    <el-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"
+    />
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入用户ID"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { personal, updateUserMulti } 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, //条数
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+    };
+  },
+  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;
+      });
+    },
+    // 确认保存
+    editDialogClick() {
+      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",
+          });
+        }
+      });
+    },
+    // 分页导航
+    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>

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>

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>

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,

src/views/pretty/PrettyNoRecordAdminView.vue

@@ -1,155 +1,163 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </div>
-                <div class="content">
-                    <div id="table"></div>
-                    <div id="toolbar">
-                        <label for="prettyNo" class="control-label">目标平台号：</label>
-                        <input type="text" name="goodNum" id="targetPrettyNo">
-                        <label for="prettyNo" class="control-label">原平台号：</label>
-                        <input type="text" id="currentPrettyNo">
-                        <label for="operator" class="control-label">操作类型:</label>
-                        <select name="status" id="operator" class="input-m">
-                            <option value="">全部</option>
-                            <option value="1">绑定</option>
-                            <option value="2">解绑</option>
-                        </select>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                    </div>
-                </div>
-            </div>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="content-header">
+          <h1 id="itemTitle"></h1>
         </div>
-    </section>
+        <div class="content">
+          <div id="table"></div>
+          <div id="toolbar">
+            <label for="prettyNo"
+                   class="control-label">目标平台号：</label>
+            <input type="text"
+                   name="goodNum"
+                   id="targetPrettyNo">
+            <label for="prettyNo"
+                   class="control-label">原平台号：</label>
+            <input type="text"
+                   id="currentPrettyNo">
+            <label for="operator"
+                   class="control-label">操作类型:</label>
+            <select name="status"
+                    id="operator"
+                    class="input-m">
+              <option value="">全部</option>
+              <option value="1">绑定</option>
+              <option value="2">解绑</option>
+            </select>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrettyNoRecordAdminView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
-        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '5%' },
-                        { field: 'currentErbanNo', title: '原平台号', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'operator',
-                            title: '操作',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                switch (val) {
-                                    case 1:
-                                        return '绑定';
-                                 
-                                    case 2:
-                                        return '解绑';
-                            
-                                }
-                            }
-                        },
-                        { field: 'targetErbanNo', title: '目标平台号', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'prettyRecordDesc', title: '备注', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'startTime',
-                            title: '开始时间(绑定时显示)',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        {
-                            field: 'endTime',
-                            title: '结束时间(绑定时显示)',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        {
-                            field: 'createTime',
-                            title: '创建时间',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        { field: 'createdBy', title: '操作者', align: 'center', width: '10%', valign: 'middle' }
+  name: "PrettyNoRecordAdminView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'currentErbanNo', title: '原平台号', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'operator',
+              title: '操作',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                switch (val) {
+                  case 1:
+                    return '绑定';
 
-                    ],
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 10,
-                    pagination: true,
-                    pageList: [10, 20, 30, 50],
-                    sidePagination: "server", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageSize: params.pageSize,
-                            pageNumber: params.pageNumber,
-                            targetPrettyNo: $('#targetPrettyNo').val(),
-                            currentPrettyNo: $('#currentPrettyNo').val(),
-                            operator: $('#operator').val()
-                        };
-                        return param;
-                    },
-                    uniqueId: 'id',
-                    toolbar: '#toolbar',
-                    url: '/admin/pretty/record/getList',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                })
+                  case 2:
+                    return '解绑';
 
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                })
-            })
-        }
-    },
+                }
+              }
+            },
+            { field: 'targetErbanNo', title: '目标平台号', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'prettyRecordDesc', title: '备注', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'startTime',
+              title: '开始时间(绑定时显示)',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            {
+              field: 'endTime',
+              title: '结束时间(绑定时显示)',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            {
+              field: 'createTime',
+              title: '创建时间',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            { field: 'createdBy', title: '操作者', align: 'center', width: '10%', valign: 'middle' }
+
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 10,
+          pagination: true,
+          pageList: [10, 20, 30, 50],
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageSize: params.pageSize,
+              pageNumber: params.pageNumber,
+              targetPrettyNo: $('#targetPrettyNo').val(),
+              currentPrettyNo: $('#currentPrettyNo').val(),
+              operator: $('#operator').val()
+            };
+            return param;
+          },
+          uniqueId: 'id',
+          toolbar: '#toolbar',
+          url: '/admin/prettyNumber/record/getList',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
+        })
+
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        })
+      })
+    }
+  },
 
 };
 </script>

src/views/record/OfficicalGoldView.vue

@@ -245,7 +245,7 @@ export default {
               $("#tipModal").modal('show');
               return;
             }
-            if (actualGold != parseInt(actualAmount * 1000)) {
+            if (actualGold != parseInt(actualAmount * 7000)) {
               $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
               $("#tipModal").modal('show');
               return;
@@ -332,15 +332,8 @@ export default {
               $("#tipModal").modal('show');
               return;
             }
-            var minGold = parseInt(actualAmount * 800);
-            var maxGold = parseInt(actualAmount * 1200);
-            var actualGold = parseInt(num);
-            if (actualGold < minGold || actualGold > maxGold) {
-              $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
-              $("#tipModal").modal('show');
-              return;
-            }
-            if (actualGold != parseInt(actualAmount * 1000)) {
+            const actualGold = parseInt(num);
+            if (actualGold != parseInt(actualAmount * 7000)) {
               $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
               $("#tipModal").modal('show');
               return;

src/views/ssGuild/SsGuild.vue

@@ -0,0 +1,374 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>主播ID</span>
+      <el-input
+        v-model="inquire.anchorId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会ID</span>
+      <el-input
+        v-model="inquire.guildId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会长ID</span>
+      <el-input
+        v-model="inquire.guildUserId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>周期</span>
+      <el-select v-model="inquire.weekTime" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.weekTimeOptions"
+          :key="item.cycleDateBegin"
+          :label="item.cycleDateShow"
+          :value="item.cycleDateBegin"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>发放状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.statusOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
+      >导出</el-button
+    >
+    <el-button class="warning" type="warning " @click="sendGoldFun()"
+      >批量发放</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column type="selection" :selectable="callback" label="选择" />
+      <el-table-column prop="cycleDate" align="center" label="周期" />
+      <el-table-column prop="erbanNo" align="center" label="主播ID" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column
+        prop="guildDiamondNum"
+        align="center"
+        label="公会总流水"
+      />
+      <el-table-column prop="ssLevelName" align="center" label="公会等级" />
+      <el-table-column prop="diamondNum" align="center" label="主播流水" />
+      <el-table-column prop="memberLevelName" align="center" label="主播档位" />
+      <el-table-column prop="goldNum" align="center" label="主播获得奖励" />
+      <el-table-column align="center" prop="giftInfo" label="发放状态">
+        <template v-slot="scope">
+          {{ scope.row.sendStatusStr }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="sendUser" align="center" label="发放人" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="sendGoldOneFun(scope.row)"
+            :class="scope.row.sendStatusStr == '未发放' ? 'primary' : 'info'"
+            :type="scope.row.sendStatusStr == '未发放' ? 'primary' : 'info'"
+            size="default"
+            :disabled="scope.row.sendStatusStr == '未发放' ? false : true"
+            >{{
+              scope.row.sendStatusStr == "未发放" ? "发放" : "已发放"
+            }}</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"
+    />
+  </div>
+</template>
+<script>
+import {
+  cycleDateList,
+  list,
+  ssGuildExport,
+  sendGold,
+} from "@/api/SsGuild/SsGuild";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "SsGuild",
+  data() {
+    return {
+      loading: false,
+      delDialog: false,
+      delDialogData: null,
+      selectedRows: [], //存储选中行数据
+      //查询所需条件对象
+      inquire: {
+        anchorId: "",
+        guildId: "",
+        guildUserId: "",
+        weekTime: "",
+        weekTimeOptions: [],
+        status: "",
+        statusOptions: [
+          { value: 0, label: "未发放" },
+          { value: 1, label: "已发放" },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    cycleDateList().then((res) => {
+      this.inquire.weekTimeOptions = res.data;
+    });
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      list({
+        erbanNo: this.inquire.anchorId,
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildUserId,
+        cycleDate: this.inquire.weekTime,
+        status: this.inquire.status,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    handleSelectionChange(val) {
+      this.selectedRows = val;
+      console.log("Selected rows:", this.selectedRows);
+    },
+    handleGetSelection() {
+      // 获取选中的行数据
+      console.log("Current selected rows:", this.selectedRows);
+    },
+    // 确认导出
+    confirmExport2Excel() {
+      ElMessageBox.confirm("确定导出Excel吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          ssGuildExport({
+            erbanNo: this.inquire.anchorId,
+            guildId: this.inquire.guildId,
+            ownerErbanNo: this.inquire.guildUserId,
+            cycleDate: this.inquire.weekTime,
+            status: this.inquire.status,
+          })
+            .then((res) => {
+              // if (res) {
+              //   this.exportVisible = false;
+              //   this.btnLoading = false;
+              //   let alink = document.createElement("a");
+              //   alink.download = `SS公会奖励发放.xls`;
+              //   alink.style.display = "none";
+              //   const blob = new Blob([res.data]);
+              //   alink.href = URL.createObjectURL(blob);
+              //   document.body.appendChild(alink);
+              //   alink.click();
+              //   URL.revokeObjectURL(alink.href);
+              // }
+            })
+            .catch((err) => {
+              console.error(err); // 打印错误信息
+              ElMessage.error("导出失败");
+            });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "info",
+            message: "取消",
+          });
+        });
+    },
+    callback(row) {
+      return row.sendStatusStr == "未发放" ? true : false;
+    },
+    // 确认批量发放
+    sendGoldFun() {
+      ElMessageBox.confirm("确定发放奖励吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          var str = "";
+          this.selectedRows.forEach((res) => {
+            str += `${res.id},`;
+          });
+          sendGold({ ids: str })
+            .then((res) => {
+              if (res.code == 200) {
+                ElMessage({
+                  showClose: true,
+                  message: "发放成功",
+                  type: "success",
+                });
+                this.getData();
+              } else {
+                ElMessage({
+                  showClose: true,
+                  message: res.message,
+                  type: "error",
+                });
+              }
+            })
+            .catch((err) => {
+              console.error(err); // 打印错误信息
+              ElMessage.error("发放失败");
+            });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "info",
+            message: "取消",
+          });
+        });
+    },
+    // 确认单个发放
+    sendGoldOneFun(val) {
+      ElMessageBox.confirm("确定发放奖励吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          sendGold({ ids: val.id })
+            .then((res) => {
+              if (res.code == 200) {
+                ElMessage({
+                  showClose: true,
+                  message: "发放成功",
+                  type: "success",
+                });
+                this.getData();
+              } else {
+                ElMessage({
+                  showClose: true,
+                  message: res.message,
+                  type: "error",
+                });
+              }
+            })
+            .catch((err) => {
+              console.error(err); // 打印错误信息
+              ElMessage.error("发放失败");
+            });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "info",
+            message: "取消",
+          });
+        });
+    },
+    // 分页导航
+    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;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

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%' },

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>
 

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%' },

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>

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%' },

src/views/users/GiftManageView.vue

@@ -66,6 +66,9 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</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>
@@ -208,6 +211,9 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</option>
+                                    <option value="18">幸运礼物</option>
+                                    <option value="19">CP礼物</option>
+                                    <option value="20">定制礼物</option>
                                 </select>
                             </div>
                         </div>

src/views/vip/VipGive.vue

@@ -91,6 +91,24 @@
         </el-select>
       </div>
 
+      <!-- 赠送天数 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >赠送天数</span
+        >
+        <el-select v-model="editObj.value2" placeholder="请选择">
+          <el-option
+            v-for="item in editObj.options2"
+            :key="item.day"
+            :label="item.dayName"
+            :value="item.day"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
       <div>
         <!-- 用户昵称 -->
         <div style="margin-bottom: 25px; margin-top: 10px">
@@ -183,6 +201,33 @@ export default {
         userId: "",
         value: "",
         options: [],
+        value2: "",
+        options2: [
+          {
+            dayName: "1天",
+            day: 1,
+          },
+          {
+            dayName: "3天",
+            day: 3,
+          },
+          {
+            dayName: "5天",
+            day: 5,
+          },
+          {
+            dayName: "7天",
+            day: 7,
+          },
+          {
+            dayName: "15天",
+            day: 15,
+          },
+          {
+            dayName: "30天",
+            day: 30,
+          },
+        ],
         nick: "",
         time: "",
         region: "",
@@ -248,6 +293,7 @@ export default {
       vipSendSend({
         uid: this.editObj.uid,
         vipLevel: this.editObj.value,
+        days: this.editObj.value2,
       }).then((res) => {
         if (res.code == 200) {
           this.getData();