新增定制礼物

(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/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/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/activity/ActivityAwardAdminView.vue

@@ -8,149 +8,247 @@
         <section class="content">
           <div id="table"></div>
           <div id="toolbar">
-                        奖品类别：<select name="prizeType" id="prizeType" class="input-m">
+            奖品类别：<select name="prizeType"
+                    id="prizeType"
+                    class="input-m">
               <option value="0">--全部--</option>
               <option value="1">钻石</option>
               <option value="2">线上礼物</option>
               <option value="3">座驾</option>
               <option value="4">头饰</option>
-                            <option value="6">实体奖品</option>
+              <!-- <option value="6">实体奖品</option>
                             <option value="10">锤子</option>
                             <option value="11">贵族爵位</option>
                             <option value="12">萝卜</option>
-                            <option value="13">祝福语</option>
+                            <option value="13">祝福语</option> -->
               <option value="14">铭牌</option>
+              <option value="16">聊天气泡</option>
+              <option value="17">资料卡</option>
+              <option value="18">勋章</option>
+              <option value="19">VIP</option>
             </select>
-                        <button id="add" class="btn btn-default">
+            <button id="add"
+                    class="btn btn-default">
               <i class="glyphicon glyphicon-plus"></i>增加
             </button>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
           </div>
         </section>
       </div>
     </div>
   </section>
-    <div class="modal fade" id="activityAwardModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="activityAwardModal"
+       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">x</span></button>
-                    <h4 class="modal-title" id="modalLabel">活动奖品信息</h4>
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">x</span></button>
+          <h4 class="modal-title"
+              id="modalLabel">活动奖品信息</h4>
         </div>
         <div class="modal-body">
-                    <form class="form-horizontal" id="activityAwardForm">
-                        <div class="form-group" id="addModalLabel">
-                            <label for="addType" class="col-sm-3 control-label">奖品类型：</label>
+          <form class="form-horizontal"
+                id="activityAwardForm">
+            <div class="form-group"
+                 id="addModalLabel">
+              <label for="addType"
+                     class="col-sm-3 control-label">奖品类型：</label>
 
-                            <div class="col-sm-8" style="padding-top:7px;">
-                                <select name="addType" id="addType" data-btn-class="btn btn-warning">
+              <div class="col-sm-8"
+                   style="padding-top:7px;">
+                <select name="addType"
+                        id="addType"
+                        data-btn-class="btn btn-warning">
                   <option value="1">钻石</option>
                   <option value="2">线上礼物</option>
                   <option value="3">座驾</option>
                   <option value="4">头饰</option>
-                                    <option value="6">实体奖品</option>
+                  <!-- <option value="6">实体奖品</option>
                             <option value="10">锤子</option>
                             <option value="11">贵族爵位</option>
                             <option value="12">萝卜</option>
+                            <option value="13">祝福语</option> -->
                   <option value="14">铭牌</option>
+                  <option value="16">聊天气泡</option>
+                  <option value="17">资料卡</option>
+                  <option value="18">勋章</option>
+                  <option value="19">VIP</option>
                 </select>
               </div>
             </div>
 
             <!-- 线上礼物 -->
             <div class="form-group giftChoose awardList">
-                            <label for="giftChoose" class="col-sm-3 control-label">选择礼物：</label>
+              <label for="giftChoose"
+                     class="col-sm-3 control-label">选择礼物：</label>
 
               <div class="col-sm-8">
-                                <select name="giftChoose" id="giftChoose" class="combobox">
+                <select name="giftChoose"
+                        id="giftChoose"
+                        class="combobox">
                 </select>
               </div>
             </div>
 
             <!-- 座驾 -->
             <div class="form-group carChoose awardList">
-                            <label for="carChoose" class="col-sm-3 control-label">选择座驾：</label>
+              <label for="carChoose"
+                     class="col-sm-3 control-label">选择座驾：</label>
 
               <div class="col-sm-8">
-                                <select name="carChoose" id="carChoose" class="combobox">
+                <select name="carChoose"
+                        id="carChoose"
+                        class="combobox">
                 </select>
               </div>
             </div>
 
             <!-- 头饰 -->
             <div class="form-group headwearChoose awardList">
-                            <label for="headwearChoose" class="col-sm-3 control-label">选择头饰：</label>
+              <label for="headwearChoose"
+                     class="col-sm-3 control-label">选择头饰：</label>
 
               <div class="col-sm-8">
-                                <select name="headwearChoose" id="headwearChoose" class="combobox">
-                                </select>
-                            </div>
-                        </div>
-
-                        <!-- 贵族 -->
-                        <div class="form-group nobleChoose awardList">
-                            <label for="nobleChoose" class="col-sm-3 control-label">选择爵位：</label>
-
-                            <div class="col-sm-8">
-                                <select name="nobleChoose" id="nobleChoose" class="combobox">
-                                    <option value="1">男爵</option>
-                                    <option value="2">子爵</option>
-                                    <option value="3">伯爵</option>
-                                    <option value="4">侯爵</option>
-                                    <option value="5">公爵</option>
-                                    <option value="6">国王</option>
-                                    <option value="7">皇帝</option>
+                <select name="headwearChoose"
+                        id="headwearChoose"
+                        class="combobox">
                 </select>
               </div>
             </div>
 
             <!-- 头饰 -->
             <div class="form-group nameplateChoose awardList">
-                            <label for="nameplateChoose" class="col-sm-3 control-label">选择头饰：</label>
+              <label for="nameplateChoose"
+                     class="col-sm-3 control-label">选择铭牌：</label>
 
               <div class="col-sm-8">
-                                <select name="nameplateChoose" id="nameplateChoose" class="combobox">
+                <select name="nameplateChoose"
+                        id="nameplateChoose"
+                        class="combobox">
+                </select>
+              </div>
+            </div>
+
+            <!-- 聊天气泡 -->
+            <div class="form-group chatBubbleChoose awardList">
+              <label for="chatBubbleChoose"
+                     class="col-sm-3 control-label">选择气泡：</label>
+
+              <div class="col-sm-8">
+                <select name="chatBubbleChoose"
+                        id="chatBubbleChoose"
+                        class="combobox">
+                </select>
+              </div>
+            </div>
+
+            <!-- 资料卡 -->
+            <div class="form-group infoCardChoose awardList">
+              <label for="infoCardChoose"
+                     class="col-sm-3 control-label">选择资料卡：</label>
+
+              <div class="col-sm-8">
+                <select name="infoCardChoose"
+                        id="infoCardChoose"
+                        class="combobox">
+                </select>
+              </div>
+            </div>
+
+            <!-- 勋章 -->
+            <div class="form-group medalChoose awardList">
+              <label for="medalChoose"
+                     class="col-sm-3 control-label">选择勋章：</label>
+
+              <div class="col-sm-8">
+                <select name="medalChoose"
+                        id="medalChoose"
+                        class="combobox">
+                </select>
+              </div>
+            </div>
+
+            <!-- 贵族 -->
+            <div class="form-group vipChoose awardList">
+              <label for="vipChoose"
+                     class="col-sm-3 control-label">选择vip等级：</label>
+
+              <div class="col-sm-8">
+                <select name="vipChoose"
+                        id="vipChoose"
+                        class="combobox">
                 </select>
               </div>
             </div>
 
             <div class="form-group">
-                            <label for="prizeName" class="col-sm-3 control-label">奖品名称:</label>
+              <label for="prizeName"
+                     class="col-sm-3 control-label">奖品名称:</label>
               <div class="col-sm-8">
-                                <input type="text" class="form-control validate[required]" name="prizeName" id="prizeName">
-                                <input type="hidden" id="prizeId" name="id">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="prizeName"
+                       id="prizeName">
+                <input type="hidden"
+                       id="prizeId"
+                       name="id">
               </div>
             </div>
 
             <div class="form-group refValue">
-                            <label for="refValue" class="col-sm-3 control-label">使用天数:</label>
+              <label for="refValue"
+                     class="col-sm-3 control-label">使用天数:</label>
               <div class="col-sm-8">
-                                <input type="text" class="form-control" name="refValue" id="refValue">
+                <input type="text"
+                       class="form-control"
+                       name="refValue"
+                       id="refValue">
               </div>
             </div>
 
             <div class="form-group">
               <label class="col-sm-3 control-label">奖品图:</label>
               <div class="col-sm-8">
-                                <img src="" id="imgUrl" style="width:90px;height:90px;" alt="">
-                                <input type="file" id="uploadFile" name="uploadFile"
+                <img src=""
+                     id="imgUrl"
+                     style="width:90px;height:90px;"
+                     alt="">
+                <input type="file"
+                       id="uploadFile"
+                       name="uploadFile"
                        accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
-                                <button class="btn btn-success" type="button" id="uploadBtn">上传</button>
-                                <input type="hidden" id="prizeImgUrl" name="prizeImgUrl"
+                <button class="btn btn-success"
+                        type="button"
+                        id="uploadBtn">上传</button>
+                <input type="hidden"
+                       id="prizeImgUrl"
+                       name="prizeImgUrl"
                        class="form-control validate[required]" />
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-primary" id="save">保存</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">关闭</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="save">保存</button>
         </div>
       </div>
     </div>
   </div>
-    <div id="imgMask"><img src="" alt=""></div>
+  <div id="imgMask"><img src=""
+         alt=""></div>
 </template>
 
 <script>
@@ -190,33 +288,20 @@ export default {
                   case 4:
                     return '头饰';
 
-                                    case 5:
-                                        return '背景';
-
-                                    case 6:
-                                        return '实物';
-
-                                    case 7:
-                                        return '靓号';
-
-                                    case 8:
-                                        return '全麦礼物';
-
-                                    case 9:
-                                        return '随机靓号';
-
-                                    case 10:
-                                        return '锤子';
-
-                                    case 11:
-                                        return '贵族爵位';
-
-                                    case 12:
-                                        return '萝卜';
-
                   case 14:
                     return '铭牌';
 
+                  case 16:
+                    return '气泡';
+
+                  case 17:
+                    return '资料卡';
+
+                  case 18:
+                    return '勋章';
+
+                  case 19:
+                    return 'VIP';
                 }
               }
             },
@@ -339,7 +424,7 @@ export default {
             $awardList.eq(2).find('input[type="hidden"]').val(referenceId);
             $('#refValue').val(data.referenceValue);
             $('.refValue').show();
-                    } else if (prizeType == 11) {
+          } else if (prizeType == 14) {
             $awardList.eq(3).show().siblings('.awardList').hide();
             $awardList.eq(3).find('select').val(data.referenceId);
             $selected = $awardList.eq(3).find('select option:selected');
@@ -349,7 +434,7 @@ export default {
             $awardList.eq(3).find('input[type="hidden"]').val(referenceId);
             $('#refValue').val(data.referenceValue);
             $('.refValue').show();
-                    } else if (prizeType == 14) {
+          } else if (prizeType == 16) {
             $awardList.eq(4).show().siblings('.awardList').hide();
             $awardList.eq(4).find('select').val(data.referenceId);
             $selected = $awardList.eq(4).find('select option:selected');
@@ -359,6 +444,36 @@ export default {
             $awardList.eq(4).find('input[type="hidden"]').val(referenceId);
             $('#refValue').val(data.referenceValue);
             $('.refValue').show();
+          } else if (prizeType == 17) {
+            $awardList.eq(5).show().siblings('.awardList').hide();
+            $awardList.eq(5).find('select').val(data.referenceId);
+            $selected = $awardList.eq(5).find('select option:selected');
+            referenceId = $selected.val();
+            awardName = $selected.text();
+            $awardList.eq(5).find('input[type="text"]').val(awardName);
+            $awardList.eq(5).find('input[type="hidden"]').val(referenceId);
+            $('#refValue').val(data.referenceValue);
+            $('.refValue').show();
+          } else if (prizeType == 18) {
+            $awardList.eq(6).show().siblings('.awardList').hide();
+            $awardList.eq(6).find('select').val(data.referenceId);
+            $selected = $awardList.eq(6).find('select option:selected');
+            referenceId = $selected.val();
+            awardName = $selected.text();
+            $awardList.eq(6).find('input[type="text"]').val(awardName);
+            $awardList.eq(6).find('input[type="hidden"]').val(referenceId);
+            $('#refValue').val(data.referenceValue);
+            $('.refValue').show();
+          } else if (prizeType == 19) {
+            $awardList.eq(7).show().siblings('.awardList').hide();
+            $awardList.eq(7).find('select').val(data.referenceId);
+            $selected = $awardList.eq(7).find('select option:selected');
+            referenceId = $selected.val();
+            awardName = $selected.text();
+            $awardList.eq(7).find('input[type="text"]').val(awardName);
+            $awardList.eq(7).find('input[type="hidden"]').val(referenceId);
+            $('#refValue').val(data.referenceValue);
+            $('.refValue').show();
           } else {
             $awardList.hide();
           }
@@ -390,12 +505,21 @@ export default {
           } else if (val == 4) {
             $awardList.eq(2).show().siblings('.awardList').hide();
             $('.refValue').show();
-                    } else if (val == 11) {
+          } else if (val == 14) {
             $awardList.eq(3).show().siblings('.awardList').hide();
             $('.refValue').show();
-                    } else if (val == 14) {
+          } else if (val == 16) {
             $awardList.eq(4).show().siblings('.awardList').hide();
             $('.refValue').show();
+          } else if (val == 17) {
+            $awardList.eq(5).show().siblings('.awardList').hide();
+            $('.refValue').show();
+          } else if (val == 18) {
+            $awardList.eq(6).show().siblings('.awardList').hide();
+            $('.refValue').show();
+          } else if (val == 19) {
+            $awardList.eq(7).show().siblings('.awardList').hide();
+            $('.refValue').show();
           }
         })
         $('#save').on('click', function () {
@@ -409,7 +533,8 @@ export default {
               return;
             }
             var refValue = $('#refValue').val();
-                        if (prizeType == 3 || prizeType == 4 || prizeType == 11 || prizeType == 14) {
+            if (prizeType == 3 || prizeType == 4 || prizeType == 11 || prizeType == 14 || prizeType == 16
+              || prizeType == 17 || prizeType == 18 || prizeType == 19) {
               if (!refValue) {
                 $("#tipMsg").text("使用天数必填");
                 $("#tipModal").modal('show');
@@ -540,6 +665,54 @@ export default {
             }
             $('#nameplateChoose').combobox();
           })
+
+          $.get('/admin/infocard/total/list', {}, function (res) {
+            if (res.code == 200) {
+              for (var i = 0; i < res.data.length; i++) {
+                //                        car.push(res.data[i]);
+
+                var str = '<option value="' + res.data[i].id + '">' + res.data[i].name + '</option>';
+                $('#infoCardChoose').append(str);
+              }
+            }
+            $('#infoCardChoose').combobox();
+          })
+
+          $.get('/admin/chatbubble/total/list', {}, function (res) {
+            if (res.code == 200) {
+              for (var i = 0; i < res.data.length; i++) {
+                //                        car.push(res.data[i]);
+
+                var str = '<option value="' + res.data[i].id + '">' + res.data[i].name + '</option>';
+                $('#chatBubbleChoose').append(str);
+              }
+            }
+            $('#chatBubbleChoose').combobox();
+          })
+
+          $.get('/admin/medal/listAll', {}, function (res) {
+            if (res.code == 200) {
+              for (var i = 0; i < res.data.length; i++) {
+                //                        car.push(res.data[i]);
+
+                var str = '<option value="' + res.data[i].id + '">' + res.data[i].name + '</option>';
+                $('#medalChoose').append(str);
+              }
+            }
+            $('#medalChoose').combobox();
+          })
+
+          $.get('/admin/vip/listAll', {}, function (res) {
+            if (res.code == 200) {
+              for (var i = 0; i < res.data.length; i++) {
+                //                        car.push(res.data[i]);
+
+                var str = '<option value="' + res.data[i].vipLevel + '">' + res.data[i].vipName + '</option>';
+                $('#vipChoose').append(str);
+              }
+            }
+            $('#vipChoose').combobox();
+          })
         }
 
         function getReferenceIdAndStatus (prizeType) {
@@ -562,14 +735,26 @@ export default {
               val = $form.find('input[name="headwearChoose"]').val();
               referenceId = val ? val : false;
               break;
-                        case 11:
-                            val = $form.find('#nobleChoose').val();
-                            referenceId = val ? val : false;
-                            break;
             case 14:
               val = $form.find('#nameplateChoose').val();
               referenceId = val ? val : false;
               break;
+            case 16:
+              val = $form.find('#chatBubbleChoose').val();
+              referenceId = val ? val : false;
+              break;
+            case 17:
+              val = $form.find('#infoCardChoose').val();
+              referenceId = val ? val : false;
+              break;
+            case 18:
+              val = $form.find('#medalChoose').val();
+              referenceId = val ? val : false;
+              break;
+            case 19:
+              val = $form.find('#vipChoose').val();
+              referenceId = val ? val : false;
+              break;
           }
           return referenceId;
         }

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"
+      <el-input v-model="inquire.userId"
                 placeholder=""
-        class="input"
-      ></el-input>
+                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"
+    <el-table v-loading="loading"
               :data="tableData"
               border
-      style="width: 100%; margin-top: 25px"
-    >
-      <!-- <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"
+              style="width: 100%; margin-top: 25px">
+      <el-table-column prop="id"
                        align="center"
-        label="会长分区"
-      />
-      <el-table-column prop="name" align="center" label="公会昵称" />
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+                       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="公会背景图">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
+          <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"
-          />
+                    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)"
+          <el-button @click="memberDialogFun(scope.row)"
                      type="text"
-            size="default"
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
+                     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)"
+          <el-button @click="ediClick(scope)"
                      class="primary"
                      type="primary"
                      size="default"
-            :disabled="!scope.row.enable"
-            >编辑</el-button
-          >
-          <el-button
-            @click="
+                     :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
-          >
+                     :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"
+        <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>
+                  class="input"></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -186,13 +186,13 @@
       <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"
+    <el-pagination style="margin-top: 10px"
                    class="paginationClass"
                    v-model:current-page="currentPage"
                    v-model:page-size="pageSize"
@@ -200,174 +200,159 @@
                    layout="sizes, prev, pager, next"
                    :total="total"
                    @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+                   @current-change="handleCurrentChange" />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
-      <!-- 会长ID -->
+    <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.leaderId"
+        <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>
+                  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>
       </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"
+        <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>
+                  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"
+        <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>
+                  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"
+        <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>
+                   :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"
+        <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>
+                  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"
+    <el-dialog v-model="payAccountDialog"
                :title="payAccountTitle"
                width="28%"
-      center
-    >
+               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"
+        <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>
+                  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"
+        <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>
+                  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"
+        <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>
+                  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"
+        <el-input v-model="member.userID"
                   placeholder="请输入新增平台id"
-          class="input"
-        ></el-input>
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+                  class="input"></el-input>
+        <el-button type="primary"
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
-        v-loading="loading"
+      <el-table v-loading="loading"
                 :data="member.tableData"
                 border
-        style="width: 100%; margin-top: 25px"
-      >
-        <el-table-column align="center" label="用户平台ID">
+                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)"
+            <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"
-              >{{
+                       :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
-            >
+                       :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>
@@ -688,7 +681,20 @@ export default {
         erbanNo: this.resource.id,
         referrer: this.resource.referrer,
       }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "添加成功",
+            type: "success",
+          });
           this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
       });
     },
     // 编辑按钮

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/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,183 @@
+<template>
+  <div class="box">
+    <!-- ID -->
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>MoliStar ID</span>
+        <el-input v-model="inquire.userId" placeholder="" class="input">
+        </el-input>
+      </div>
+      <!-- 送出时间 -->
+      <div class="inquire">
+        <span>送出时间</span>
+        <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="getData()"
+        >查询
+      </el-button>
+      <el-button
+        @click="
+          inquire.userId = '';
+          inquire.time = '';
+        "
+        >重置筛选
+      </el-button>
+    </div>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="uid" align="center" label="uid" />
+      <el-table-column prop="erbanNo" align="center" label="平台id" />
+      <el-table-column prop="totalInput" align="center" label="进入" />
+      <el-table-column prop="totalOutput" align="center" label="退出" />
+      <el-table-column prop="production" align="center" label="剩余" />
+      <el-table-column prop="productionRatio" align="center" label="退出/进入" />
+      <el-table-column prop="avgInput" align="center" label="每次进入" />
+      <el-table-column prop="num" align="center" label="总次数" />
+      <el-table-column prop="winNum" align="center" label="得到次数" />
+      <el-table-column prop="winRate" align="center" label="得到率" />
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import { personal } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftData",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+        time: "",
+        value: 2,
+        options: [
+          {
+            name: "阿拉伯区",
+            type: 2,
+          },
+          {
+            name: "英语区",
+            type: 1,
+          },
+          {
+            name: "华语区",
+            type: 4,
+          },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
+      if (!this.inquire.time) {
+        ElMessage({
+          showClose: true,
+          message: "请选择时间",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      personal({
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        this.loading = false;
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>

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/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

@@ -7,14 +7,19 @@
           <h1 id="itemTitle"></h1>
         </section>
         <div id="toolbar">
-                    <form class="col-sm-12" id="searchForm" action="/admin/chargeRecord/dailyexport" method="get"
+          <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 class="totalAmount"
+                    style="color: red">0</span>（总金额）/
+              <span class="totalCount"
+                    style="color: red">0</span>（总笔数）
               <span style="color: red">(单位：美元)</span>
             </h4>
           </div>
@@ -34,14 +39,22 @@
     </div>
   </section>
 
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
+  <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 type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
           </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
         </div>
         <div class="modal-body">
           <div id="detailtable"></div>
@@ -85,6 +98,7 @@ export default {
             { 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%' },
             {

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

@@ -9,26 +9,39 @@
         <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">
+              <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="必填">
+                  <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>
+                  <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">
+              <button id="btnSearch"
+                      class="btn btn-default">
                 <i class="glyphicon glyphicon-search"></i>查询
               </button>
-                            <button id="btnExport" class="btn btn-default">
+              <button id="btnExport"
+                      class="btn btn-default">
                 <i class="glyphicon glyphicon-export"></i>导出
               </button>
               <span style="color: red">(单位：美元)</span>
@@ -44,14 +57,22 @@
     </div>
   </section>
 
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
+  <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 type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
           </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
         </div>
         <div class="modal-body">
           <div id="detailtable"></div>
@@ -96,6 +117,7 @@ export default {
             { 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%' },

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