修复分页异常问题

(cherry picked from commit 8aeb9caa0dcc5bf2fd250af28c2f025bf210e344)

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/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: '/prettyNumberExamine/erban/upload',
+        method: 'post',
+        headers: { 'Content-Type': 'multipart/form-data' },
+        data: query
+    });
+};

src/views/accountApplyManage/accountApplyManage.vue

@@ -0,0 +1,429 @@
+<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="Shaker 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-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="Shaker 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="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" 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 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 {
+      tableLoading: false, // 表格是否加载中
+      tableData: [], // 接口返回的表格数据
+      // 搜索表单相关
+      searchForm: {
+        erbanNo: null,
+        uid: null,
+        level: null,
+        region: null,
+      },
+      pageTotal: 0, // 接口返回的表格总条数
+      pageParams: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  created() {
+    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);
+    },
+  },
+  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/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,8 @@ export default {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = formatDate(searchForm.startTime )
-      searchForm.endTime = formatDate(searchForm.endTime )
+      searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss');
+      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) => {

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

@@ -158,6 +158,7 @@ import {
 } 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
 // 混入
@@ -225,6 +226,8 @@ export default {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
+      searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss');
+      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) => {

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/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();