新增礼物面板管理

(cherry picked from commit 9a45da5db2ef34daba843c8e07670a238be237f1)

package-lock.json

@@ -25,6 +25,7 @@
         "popper.js": "^1.16.1",
         "sass": "^1.67.0",
         "sass-loader": "^13.3.2",
+        "unplugin-element-plus": "^0.8.0",
         "vue-router": "^4.0.3",
         "vuex": "^4.0.0",
         "xlsx": "^0.18.5"
@@ -2193,7 +2194,6 @@
       "version": "5.0.5",
       "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
       "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
-      "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -12376,7 +12376,6 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.5.0.tgz",
       "integrity": "sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==",
-      "dev": true,
       "dependencies": {
         "acorn": "^8.10.0",
         "chokidar": "^3.5.3",
@@ -12448,6 +12447,28 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/unplugin-element-plus": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmmirror.com/unplugin-element-plus/-/unplugin-element-plus-0.8.0.tgz",
+      "integrity": "sha512-jByUGY3FG2B8RJKFryqxx4eNtSTj+Hjlo8edcOdJymewndDQjThZ1pRUQHRjQsbKhTV2jEctJV7t7RJ405UL4g==",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.2",
+        "es-module-lexer": "^1.3.0",
+        "magic-string": "^0.30.1",
+        "unplugin": "^1.3.2"
+      },
+      "engines": {
+        "node": ">=14.19.0"
+      }
+    },
+    "node_modules/unplugin-element-plus/node_modules/magic-string": {
+      "version": "0.30.10",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      }
+    },
     "node_modules/unplugin-vue-components": {
       "version": "0.25.2",
       "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.25.2.tgz",
@@ -12527,8 +12548,7 @@
     "node_modules/unplugin/node_modules/webpack-virtual-modules": {
       "version": "0.5.0",
       "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw=="
-      "dev": true
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",

package.json

@@ -25,6 +25,7 @@
     "popper.js": "^1.16.1",
     "sass": "^1.67.0",
     "sass-loader": "^13.3.2",
+    "unplugin-element-plus": "^0.8.0",
     "vue-router": "^4.0.3",
     "vuex": "^4.0.0",
     "xlsx": "^0.18.5"

src/api/GiftPanelManagement/GiftPanelManagement.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+// 列表
+export const list = query => {
+    return request({
+        url: '/giftPanelTab/list',
+        method: 'get',
+        params: query
+    });
+};
+// 保存
+export const update = query => {
+    return request({
+        url: '/giftPanelTab/update',
+        method: 'post',
+        params: query
+    });
+};

src/api/VipGive/VipGive.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+// 查询用户接口
+export const getByErbanNo = query => {
+    return request({
+        url: '/admin/user/getByErbanNo',
+        method: 'get',
+        params: query
+    });
+};
+// 获取VIP列表接口
+export const listAll = query => {
+    return request({
+        url: '/admin/vip/listAll',
+        method: 'get',
+        params: query
+    });
+};
+// 获取列表接口
+export const pageRecord = query => {
+    return request({
+        url: '/vipSend/pageRecord',
+        method: 'get',
+        params: query
+    });
+};
+// 赠送VIP接口
+export const vipSendSend = query => {
+    return request({
+        url: '/vipSend/send',
+        method: 'post',
+        params: query
+    });
+};

src/api/gameInfo/gameInfo.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================每日数据====================================
+// 列表
+export const page = query => {
+    return request({
+        url: '/admin/gamePartner/info/page',
+        method: 'get',
+        params: query
+    });
+};
+// 编辑修改
+export const save = query => {
+    return request({
+        url: '/admin/gamePartner/info/save',
+        method: 'post',
+        data: query
+    });
+};
+// 删除
+export const delGame = query => {
+    return request({
+        url: '/admin/gamePartner/info/delGame',
+        method: 'get',
+        params: query
+    });
+};

src/api/medal/medal.js

@@ -0,0 +1,58 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+// 地区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 勋章信息-列表
+export const medalPage = query => {
+    return request({
+        url: '/admin/medal/page',
+        method: 'get',
+        params: query
+    });
+};
+// 勋章信息-新增&保存
+export const medalSave = query => {
+    return request({
+        url: '/admin/medal/save',
+        method: 'post',
+        params: query
+    });
+};
+// 勋章信息-发放
+export const medalSend = query => {
+    return request({
+        url: '/admin/medal/send',
+        method: 'post',
+        params: query
+    });
+};
+// 勋章记录-撤销
+export const rollback = query => {
+    return request({
+        url: '/admin/medalRecord/rollback',
+        method: 'post',
+        params: query
+    });
+};
+// 勋章记录-列表
+export const medalRecordPage = query => {
+    return request({
+        url: '/admin/medalRecord/page',
+        method: 'get',
+        params: query
+    });
+};
+// 勋章记录-勋章列表
+export const listAll = query => {
+    return request({
+        url: '/admin/medal/listAll',
+        method: 'get',
+        params: query
+    });
+};

src/api/nobleman/nobleman.js

@@ -102,6 +102,14 @@ export const addRecord = query => {
         params: query
     });
 };
+// 保存收款账户
+export const savePayAccount = query => {
+    return request({
+        url: '/admin/family/manage/savePayAccount',
+        method: 'post',
+        params: query
+    });
+};
 // 违规类查询
 export const listRecord = query => {
     return request({
@@ -115,3 +123,132 @@ export const exportFamilyMember = query => {
     window.location.href = `/admin/family/manage/exportFamilyMember?${genQueryParam(query)}`;
     return;
 };
+// 导出-公会信息
+export const exportInfo = query => {
+    window.location.href = `/admin/family/manage/exportFamily?${genQueryParam(query)}`;
+    return;
+};
+
+
+// 工资梯度-列表
+export const manageList = query => {
+    return request({
+        url: '/admin/family/manage/list',
+        method: 'get',
+        params: query
+    });
+};
+// 工资梯度-新增
+export const manageAdd = query => {
+    return request({
+        url: '/admin/family/manage/add',
+        method: 'post',
+        params: query
+    });
+};
+// 工资梯度-删除
+export const manageDelete = query => {
+    return request({
+        url: '/admin/family/manage/delete',
+        method: 'post',
+        params: query
+    });
+};
+// 工会统计-列表
+export const statPageFamily = query => {
+    return request({
+        url: '/admin/family/wage/stat/pageFamily',
+        method: 'get',
+        params: query
+    });
+};
+// 工会统计-单个工会详情
+export const listFamilyMember = query => {
+    return request({
+        url: '/admin/family/wage/stat/listFamilyMember',
+        method: 'get',
+        params: query
+    });
+};
+// 工会统计-单个工会导出
+export const statExportFamilyMember = query => {
+    window.location.href = `/admin/family/wage/stat/exportFamilyMember?${genQueryParam(query)}`;
+    return;
+};
+// 工会统计-每日工会详情
+export const listFamilyMemberDaily = query => {
+    return request({
+        url: '/admin/family/wage/stat/listFamilyMemberDaily',
+        method: 'get',
+        params: query
+    });
+};
+// 工会统计-单每日会导出
+export const exportFamilyMemberDaily = query => {
+    window.location.href = `/admin/family/wage/stat/exportFamilyMemberDaily?${genQueryParam(query)}`;
+    return;
+};
+// 工会统计-导出公会工资统计
+export const statExportFamily = query => {
+    window.location.href = `/admin/family/wage/stat/exportFamily?${genQueryParam(query)}`;
+    return;
+};
+// 工会统计-导出家族流水
+export const incomeExportFamilys = query => {
+    window.location.href = `/admin/family/income/exportFamily?${genQueryParam(query)}`;
+    return;
+};
+// 金币流水-列表
+export const incomePageFamily = query => {
+    return request({
+        url: '/admin/family/income/pageFamily',
+        method: 'get',
+        params: query
+    });
+};
+// 金币流水-详情
+export const incomeListFamilyMember = query => {
+    return request({
+        url: '/admin/family/income/listFamilyMember',
+        method: 'get',
+        params: query
+    });
+};
+// 金币流水-导出成员流水信息
+export const incomeExportFamily = query => {
+    window.location.href = `/admin/family/income/exportFamilyMember?${genQueryParam(query)}`;
+    return;
+};
+// 成员信息-弹窗详情
+export const manageListFamilyMember = query => {
+    return request({
+        url: '/admin/family/manage/listFamilyMember',
+        method: 'get',
+        params: query
+    });
+};
+
+// 成员信息-新增成员
+export const addMember = query => {
+    return request({
+        url: '/admin/family/manage/addMember',
+        method: 'post',
+        params: query
+    });
+};
+// 成员信息-设置管理员
+export const setManager = query => {
+    return request({
+        url: '/admin/family/manage/setManager',
+        method: 'post',
+        params: query
+    });
+};
+// 成员信息-删除管理员
+export const removeMember = query => {
+    return request({
+        url: '/admin/family/manage/removeMember',
+        method: 'post',
+        params: query
+    });
+};

src/store/modules/menu.js

@@ -51,6 +51,7 @@ export default {
         },
         getViewComponent(context, path) {
             let component = path;
+            console.log(component)
             if (path && path.endsWith('.html')) {
                 const pathArray = path.split('/');
                 const routeName = toCamelCase(pathArray[pathArray.length - 1].replace('.html', ''));

src/views/GiftPanelManagement/GiftPanelManagement.vue

@@ -0,0 +1,238 @@
+<template>
+  <div class="box">
+    <!-- 选择分区 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">选择分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.inquireonInfos"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="seq" align="center" label="排序" />
+      <el-table-column prop="name" align="center" label="礼物面板类型" />
+      <el-table-column prop="enable" align="center" label="是否生效">
+        <template v-slot="scope">{{ scope.row.enable ? "是" : "否" }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button
+            @click="ediClick(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >编辑</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="eidDialog" :title="eidDialogTitle" width="30%" center>
+      <!-- 礼物面板类型 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; white-space: nowrap; margin-right: 70px"
+          class="col-sm-2 control-label"
+          >礼物面板类型</span
+        >
+        <el-input
+          v-model="eidObj.type"
+          style="width: 60%"
+          class="input"
+          placeholder="请输入"
+          disabled
+        ></el-input>
+      </div>
+      <!-- 面板排序 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; white-space: nowrap; margin-right: 70px"
+          class="col-sm-2 control-label"
+          >面板排序-{{ eidText }}</span
+        >
+        <el-input
+          v-model="eidObj.seq"
+          style="width: 60%"
+          class="input"
+          placeholder="请输入"
+        ></el-input>
+      </div>
+      <!-- 是否生效 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; white-space: nowrap; margin-right: 70px"
+          class="col-sm-2 control-label"
+          >是否生效</span
+        >
+        <el-select
+          v-model="eidObj.value"
+          style="width: 60%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in eidObj.option"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="eidDialog = false">取消</el-button>
+          <el-button type="primary" @click="eidDialogClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { list, update } from "@/api/GiftPanelManagement/GiftPanelManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "GiftPanelManagement",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: 4,
+        inquireonInfos: [
+          { desc: "英语区", id: 1 },
+          { desc: "阿拉伯区", id: 2 },
+          { desc: "华语区", id: 4 },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 编辑
+      eidDialog: false,
+      eidDialogTitle: "",
+      eidText: "",
+      eidObjNew: {},
+      eidObj: {
+        type: "",
+        clientName: "",
+        seq: "",
+        value: "",
+        option: [
+          {
+            desc: "是",
+            id: true,
+          },
+          {
+            desc: "否",
+            id: false,
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.eidDialogTitle = `编辑礼物面板信息-华语区`;
+    this.eidText = `华语区`;
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      list({
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {
+        this.tableData = res.data;
+        this.loading = false;
+      });
+    },
+    ediClick(val) {
+      this.eidDialog = true;
+      this.eidObj.type = val.name;
+      this.eidObj.seq = val.seq;
+      this.eidObj.value = val.enable;
+      this.eidObjNew = val;
+    },
+    eidDialogClick() {
+      update({
+        enable: this.eidObj.value,
+        id: this.eidObjNew.id,
+        seq: this.eidObj.seq,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "编辑成功",
+            type: "success",
+          });
+          this.eidDialog = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    handleChange(val) {
+      console.log(val);
+      if (val == 1) {
+        this.eidDialogTitle = `编辑礼物面板信息-英语区`;
+        this.eidText = `英语区`;
+      } else if (val == 2) {
+        this.eidDialogTitle = `编辑礼物面板信息-阿拉伯区`;
+        this.eidText = `阿拉伯区`;
+      } else if (val == 4) {
+        this.eidDialogTitle = `编辑礼物面板信息-华语区`;
+        this.eidText = `华语区`;
+      }
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 70px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/dressShop/DressShopAdminView.vue

@@ -1,100 +1,136 @@
 <template>
-    <section class="content">
+  <section class="content">
-        <div class="box box-primary">
+    <div class="box box-primary">
-            <div class="box-body">
+      <div class="box-body">
-                <!-- Content Header (Page header) -->
+        <!-- Content Header (Page header) -->
-                <section class="content-header">
+        <section class="content-header">
-                    <h1 id="itemTitle"></h1>
+          <h1 id="itemTitle"></h1>
-                </section>
+        </section>
-                <div id="toolbar">
+        <div id="toolbar">
-                    <div class="col-sm-12">
+          <div class="col-sm-12">
-                        <button id="btnAdd" class="btn btn-default">
+            <button id="btnAdd"
-                            <i class="glyphicon glyphicon-plus"></i>增加
+                    class="btn btn-default">
-                        </button>
+              <i class="glyphicon glyphicon-plus"></i>增加
-                    </div>
+            </button>
-
+          </div>
-
-                </div>
-            </div>
-
-            <!-- .content -->
-            <div id="table"></div>
 
         </div>
-    </section>
+      </div>
 
-    <div class="modal fade" id="roomTagModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+      <!-- .content -->
-        <div class="modal-dialog" role="document">
+      <div id="table"></div>
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel">新增</h4>
-                </div>
-                <div class="modal-body">
-                    <form class="form-horizontal" id="addForm">
-                        <input type="hidden" name="id" id="id" />
-                        <div class="form-group">
-                            <label for="dressType" class="col-sm-3 control-label">装扮类型:</label>
-                            <div class="col-sm-9">
-                                <select name="dressType" id="dressType">
-                                    <option value="">-- 请选择 --</option>
-                                    <option value="0">头饰</option>
-                                    <option value="1">座驾</option>
-                                    <option value="2">铭牌</option>
-                                    <option value="3">资料卡</option>
-                                    <option value="4">聊天气泡</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="form-group" id="txtBox">
-                            <label for="dressId" class="col-sm-3 control-label">装扮id<font color="red">*</font>：</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control validate[required]" name="dressId" id="dressId"
-                                    placeholder="请输入对应的装扮id">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="dressSeq" class="col-sm-3 control-label">展示排序<font color="red">*</font>：</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control validate[required]" name="dressSeq" id="dressSeq"
-                                    placeholder="数字小的排前面，必填">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="dressPrice" class="col-sm-3 control-label">装扮价格:</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control validate[required]" name="dressPrice" id="dressPrice"
-                                    placeholder="请输入价格">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="dressDay" class="col-sm-3 control-label">有效期（天）:</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control validate[required]" name="dressDay" id="dressDay"
-                                    placeholder="请输入天数">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="dressLimitStatus" class="col-sm-3 control-label">装扮限时状态:</label>
-                            <div class="col-sm-9">
-                                <select name="dressType" id="dressLimitStatus">
-                                    <option value="0">是</option>
-                                    <option value="1">否</option>
-                                </select>
-                            </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="add">确定</button>
-                </div>
 
-            </div>
-        </div>
     </div>
+  </section>
+
+  <div class="modal fade"
+       id="roomTagModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel">新增</h4>
+        </div>
+        <div class="modal-body">
+          <form class="form-horizontal"
+                id="addForm">
+            <input type="hidden"
+                   name="id"
+                   id="id" />
+            <div class="form-group">
+              <label for="dressType"
+                     class="col-sm-3 control-label">装扮类型:</label>
+              <div class="col-sm-9">
+                <select name="dressType"
+                        id="dressType">
+                  <option value="">-- 请选择 --</option>
+                  <option value="0">头饰</option>
+                  <option value="1">座驾</option>
+                  <option value="2">铭牌</option>
+                  <option value="3">资料卡</option>
+                  <option value="4">聊天气泡</option>
+                </select>
+              </div>
+            </div>
+            <div class="form-group"
+                 id="txtBox">
+              <label for="dressId"
+                     class="col-sm-3 control-label">装扮id<font color="red">*</font>：</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="dressId"
+                       id="dressId"
+                       placeholder="请输入对应的装扮id">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="dressSeq"
+                     class="col-sm-3 control-label">展示排序<font color="red">*</font>：</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="dressSeq"
+                       id="dressSeq"
+                       placeholder="数字小的排前面，必填">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="dressPrice"
+                     class="col-sm-3 control-label">装扮价格:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="dressPrice"
+                       id="dressPrice"
+                       placeholder="请输入价格">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="dressDay"
+                     class="col-sm-3 control-label">有效期（天）:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="dressDay"
+                       id="dressDay"
+                       placeholder="请输入天数">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="dressLimitStatus"
+                     class="col-sm-3 control-label">装扮限时状态:</label>
+              <div class="col-sm-9">
+                <select name="dressType"
+                        id="dressLimitStatus">
+                  <option value="0">是</option>
+                  <option value="1">否</option>
+                </select>
+              </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="add">确定</button>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -102,326 +138,326 @@ import TableHelper from '@/utils/bootstrap-table-helper';
 import { serverError } from '@/utils/maintainer';
 
 export default {
-    name: "DressShopAdminView",
+  name: "DressShopAdminView",
-    setup() {
+  setup () {
-        return {};
+    return {};
-    },
+  },
-    created() {
+  created () {
-        this.$nextTick(function () {
+    this.$nextTick(function () {
-            this.initData();
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' },
+            { field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%' },
+            { field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%' },
+            {
+              field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%',
+              formatter: function (val, row, index) {
+                if (null != val && val != '') {
+                  return '<img src="' + val + '" alt="" style="width: 30px; height: 30px;">';
+                }
+                return '-';
+              }
+            },
+            {
+              field: 'dressType',
+              title: '装扮类型',
+              align: 'center',
+              width: '5%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val == '0') {
+                  return "头饰";
+                } else if (val == '1') {
+                  return '座驾';
+                } else if (val == '2') {
+                  return '铭牌';
+                } else if (val == '3') {
+                  return '资料卡';
+                } else if (val == '4') {
+                  return '聊天气泡';
+                } else {
+                  return '-';
+                }
+              }
+
+            },
+            { field: 'dressSeq', title: '装扮排序', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'dressPrice', title: '装扮展示价值', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'dressDay', title: '装扮有效期（天）', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'buyNum', title: '购买数量', align: '购买数量   ', valign: 'middle', width: '10%' },
+            { field: 'userDonateNum', title: '购买赠送用户数量', align: '购买数量', valign: 'middle', width: '10%' },
+            {
+              field: 'dressLimitStatus',
+              title: '装扮限时状态',
+              align: 'center',
+              width: '5%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val == '0') {
+                  return "有效";
+                } else {
+                  return '无效';
+                }
+              }
+
+            },
+            {
+              field: 'id',
+              title: '操作',
+              align: 'center',
+              width: '10%',
+              formatter: function (val, row, index) {
+                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
+                  '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val + ' data-new-status=' + 2 +
+                  '><i class="glyphicon glyphicon-remove"></i>删除</button>';
+
+              }
+            }
+          ],
+          undefinedText: "-",
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 50,
+          pagination: true,
+          pageList: [20, 50, 100],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize
+            };
+            return param;
+          },
+          ajax: function (request) {                    //使用ajax请求
+            $.ajax({
+              type: "GET",
+              url: '/admin/dress/shop/list',
+              contentType: 'application/json;charset=utf-8',
+              dataType: 'json',
+              data: request.data,
+              success: function (res) {
+                apiResult(res);
+                console.log(res)
+                request.success({
+                  total: res.data.total,
+                  rows: res.data.rows.map(i => {
+                    let value = i.name;
+                    if (value.startsWith('{') && value.endsWith('}')) {
+                      i.name = JSON.parse(i.name);
+                    } else {
+                      i.name = {
+                        zh: i.name,
+                        ar: i.name,
+                        en: i.name,
+                      };
+                    }
+                    return i;
+                  })
+                });
+              },
+              error: function (req) {
+                serverError(req);
+              }
+            })
+          },
+          toolbar: '#toolbar',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' },
-                        {field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%'},
-                        {field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%'},
-                        {field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%'},
-                        {
-                            field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%',
-                            formatter: function (val, row, index) {
-                                if (null != val && val != '') {
-                                    return '<img src="' + val + '" alt="" style="width: 30px; height: 30px;">';
-                                }
-                                return '-';
-                            }
-                        },
-                        {
-                            field: 'dressType',
-                            title: '装扮类型',
-                            align: 'center',
-                            width: '5%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val == '0') {
-                                    return "头饰";
-                                } else if (val == '1') {
-                                    return '座驾';
-                                } else if (val == '2') {
-                                    return '铭牌';
-                                } else if (val == '3') {
-                                    return '资料卡';
-                                } else if (val == '4') {
-                                    return '聊天气泡';
-                                } else {
-                                    return '-';
-                                }
-                            }
-
-                        },
-                        { field: 'dressSeq', title: '装扮排序', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'dressPrice', title: '装扮展示价值', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'dressDay', title: '装扮有效期（天）', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'buyNum', title: '购买数量', align: '购买数量   ', valign: 'middle', width: '10%' },
-                        { field: 'userDonateNum', title: '购买赠送用户数量', align: '购买数量', valign: 'middle', width: '10%' },
-                        {
-                            field: 'dressLimitStatus',
-                            title: '装扮限时状态',
-                            align: 'center',
-                            width: '5%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val == '0') {
-                                    return "有效";
-                                } else {
-                                    return '无效';
-                                }
-                            }
-
-                        },
-                        {
-                            field: 'id',
-                            title: '操作',
-                            align: 'center',
-                            width: '10%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
-                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val + ' data-new-status=' + 2 +
-                                    '><i class="glyphicon glyphicon-remove"></i>删除</button>';
-
-                            }
-                        }
-                    ],
-                    undefinedText: "-",
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 50,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "server", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize
-                        };
-                        return param;
-                    },
-                    ajax: function (request) {                    //使用ajax请求
-                        $.ajax({
-                            type: "GET",
-                            url: '/admin/dress/shop/list',
-                            contentType: 'application/json;charset=utf-8',
-                            dataType: 'json',
-                            data: request.data,
-                            success: function (res) {
-                                apiResult(res);
-                                console.log(res)
-                                request.success({
-                                    "rows": res.data.rows.map(i=>{
-                                        let value = i.name;
-                                        if (value.startsWith('{') && value.endsWith('}')) {
-                                            i.name = JSON.parse(i.name);
-                                        } else {
-                                            i.name = {
-                                                zh: i.name,
-                                                ar: i.name,
-                                                en: i.name,
-                                            };
-                                        }
-                                        return i;
-                                    }),
-                                    "total": res.total
-                                });
-                            },
-                            error: function (req) {
-                                serverError(req);
-                            }
-                        })
-                    },
-                    toolbar: '#toolbar',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
 
-                // 查询刷新
+        // 查询刷新
-                $('#btnSearch').on('click', function () {
+        $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
+          TableHelper.doRefresh('#table');
-                });
+        });
 
 
-                //新建标签
+        //新建标签
-                $("#btnAdd").click(function () {
+        $("#btnAdd").click(function () {
-                    clearModal();
+          clearModal();
-                    $("#roomTagModal").modal('show');
+          $("#roomTagModal").modal('show');
-                });
+        });
 
-                $("#add").click(function () {
+        $("#add").click(function () {
-                    var id = $("#id").val();
+          var id = $("#id").val();
-                    var dressType = $('#dressType').val();
+          var dressType = $('#dressType').val();
-                    var dressId = $("#dressId").val();
+          var dressId = $("#dressId").val();
-                    var dressSeq = $('#dressSeq').val();
+          var dressSeq = $('#dressSeq').val();
-                    var dressPrice = $('#dressPrice').val();
+          var dressPrice = $('#dressPrice').val();
-                    var dressDay = $('#dressDay').val();
+          var dressDay = $('#dressDay').val();
-                    var dressLimitStatus = $('#dressLimitStatus').val();
+          var dressLimitStatus = $('#dressLimitStatus').val();
 
-                    if ($("#addForm").validationEngine('validate')) {
+          if ($("#addForm").validationEngine('validate')) {
-                        $.ajax({
+            $.ajax({
-                            type: "post",
+              type: "post",
-                            url: "/admin/dress/shop/saveOrUpdate",
+              url: "/admin/dress/shop/saveOrUpdate",
-                            data: {
+              data: {
-                                id: id,
+                id: id,
-                                dressId: dressId,
+                dressId: dressId,
-                                dressType: dressType,
+                dressType: dressType,
-                                dressSeq: dressSeq,
+                dressSeq: dressSeq,
-                                dressPrice: dressPrice,
+                dressPrice: dressPrice,
-                                dressDay: dressDay,
+                dressDay: dressDay,
-                                dressLimitStatus: dressLimitStatus,
+                dressLimitStatus: dressLimitStatus,
-                            },
+              },
-                            dataType: "json",
+              dataType: "json",
-                            success: function (json) {
+              success: function (json) {
-                                if (json.code == 200) {
+                if (json.code == 200) {
-                                    $("#tipMsg").text("保存成功");
+                  $("#tipMsg").text("保存成功");
-                                    $("#tipModal").modal('show');
+                  $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
+                  TableHelper.doRefresh("#table");
-                                    $("#roomTagModal").modal('hide');
+                  $("#roomTagModal").modal('hide');
-                                } else {
+                } else {
-                                    $("#tipMsg").text("保存失败." + json.message);
+                  $("#tipMsg").text("保存失败." + json.message);
-                                    $("#tipModal").modal('show');
+                  $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
+                  TableHelper.doRefresh("#table");
-                                    $("#roomTagModal").modal('hide');
+                  $("#roomTagModal").modal('hide');
-                                }
-                            }
-                        });
-                    }
-
-                });
-
-                $("#table").on("click", '.opt-edit', function () {
-                    var id = $(this).attr("data-id");
-                    clearModal();
-
-                    $.ajax({
-                        type: "get",
-                        url: "/admin/dress/shop/getById",
-                        data: { id: id },
-                        dataType: "json",
-                        success: function (res) {
-                            var json = res.data;
-                            if (json) {
-                                $("#id").val(id);
-                                $('#dressId').val(json.dressId);
-                                $('#dressType').val(json.dressType);
-                                $('#dressSeq').val(json.dressSeq);
-                                $('#dressPrice').val(json.dressPrice);
-                                $('#dressDay').val(json.dressDay);
-                                $('#dressLimitStatus').val(json.dressLimitStatus);
-                                // 打开编辑弹窗
-                                $("#roomTagModal").modal('show');
-                                $("#modalLabel").text("编辑");
-                            } else {
-                                $("#tipMsg").text("获取信息出错");
-                                $("#tipModal").modal('show');
-                            }
-                        }
-                    });
-                });
-
-                $("#table").on("click", '.opt-remove', function () {
-                    var id = $(this).attr("data-id");
-
-                    if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
-                        const requestParam = {
-                            id: id
-                        }
-
-                        $.ajax({
-                            type: "get",
-                            url: "/admin/dress/shop/delById",
-                            data: requestParam,
-                            dataType: "json",
-                            contentType: 'application/json',
-                            success: function (json) {
-                                if (json.code == 200) {
-                                    $("#tipMsg").text("修改成功");
-                                    $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                } else {
-                                    $("#tipMsg").text("修改失败." + json.message);
-                                    $("#tipModal").modal('show');
-                                }
-                            }
-                        });
-                    }
-                });
-
-
-
-                function apiResult(json) {
-                    if (json.code == 200 && json.message == 'success') {
-                        return true;
-                    }
-                    $("#tipMsg").text("请求失败，错误信息：" + json.message);
-                    $("#tipModal").modal('show');
-                    return false;
                 }
-
+              }
-
-                $('#iconBtn').on('click', function () {
-                    if ($('#iconFile').val() == '') {
-                        $('#tipMsg').text('上传图片为空');
-                        $('#tipModal').modal('show');
-                        return;
-                    }
-                    $.ajaxFileUpload({
-                        fileElementId: 'iconFile',    //需要上传的文件域的ID，即<input type="file">的ID。
-                        url: '/admin/upload/img', //后台方法的路径
-                        type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                        dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                        secureuri: false,   //是否启用安全提交，默认为false。
-                        async: true,   //是否是异步
-                        success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
-                            if (json.path) {
-                                $('#iconUrl').val(json.path);
-                                $('#iconImgUrl').attr("src", json.path);
-
-                                console.log(json.path);
-
-                            } else {
-                                $("#tipMsg").text(json.msg);
-                                $("#tipModal").modal('show');
-                            }
-                        },
-                        error: function (data, status, e) {  //提交失败自动执行的处理函数。
-                            console.error(e);
-                        }
-                    });
-                })
-
-                function clearModal() {
-                    $('#iconImgUrl').attr('src', '');
-
-                    $('#addForm').find('input[type=text],input[type=hidden],input[type=file]').each(function () {
-                        $(this).val('');
-                    })
-
-                    $('#type').val(1);
-
-                }
-
-
-                $("#type").change(function () {
-                    var optVal = $(this).val();
-                });
-
-
-
             });
+          }
+
+        });
+
+        $("#table").on("click", '.opt-edit', function () {
+          var id = $(this).attr("data-id");
+          clearModal();
+
+          $.ajax({
+            type: "get",
+            url: "/admin/dress/shop/getById",
+            data: { id: id },
+            dataType: "json",
+            success: function (res) {
+              var json = res.data;
+              if (json) {
+                $("#id").val(id);
+                $('#dressId').val(json.dressId);
+                $('#dressType').val(json.dressType);
+                $('#dressSeq').val(json.dressSeq);
+                $('#dressPrice').val(json.dressPrice);
+                $('#dressDay').val(json.dressDay);
+                $('#dressLimitStatus').val(json.dressLimitStatus);
+                // 打开编辑弹窗
+                $("#roomTagModal").modal('show');
+                $("#modalLabel").text("编辑");
+              } else {
+                $("#tipMsg").text("获取信息出错");
+                $("#tipModal").modal('show');
+              }
+            }
+          });
+        });
+
+        $("#table").on("click", '.opt-remove', function () {
+          var id = $(this).attr("data-id");
+
+          if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
+            const requestParam = {
+              id: id
+            }
+
+            $.ajax({
+              type: "get",
+              url: "/admin/dress/shop/delById",
+              data: requestParam,
+              dataType: "json",
+              contentType: 'application/json',
+              success: function (json) {
+                if (json.code == 200) {
+                  $("#tipMsg").text("修改成功");
+                  $("#tipModal").modal('show');
+                  TableHelper.doRefresh("#table");
+                } else {
+                  $("#tipMsg").text("修改失败." + json.message);
+                  $("#tipModal").modal('show');
+                }
+              }
+            });
+          }
+        });
+
+
+
+        function apiResult (json) {
+          if (json.code == 200 && json.message == 'success') {
+            return true;
+          }
+          $("#tipMsg").text("请求失败，错误信息：" + json.message);
+          $("#tipModal").modal('show');
+          return false;
         }
-    },
+
+
+        $('#iconBtn').on('click', function () {
+          if ($('#iconFile').val() == '') {
+            $('#tipMsg').text('上传图片为空');
+            $('#tipModal').modal('show');
+            return;
+          }
+          $.ajaxFileUpload({
+            fileElementId: 'iconFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+            url: '/admin/upload/img', //后台方法的路径
+            type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+            dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+            secureuri: false,   //是否启用安全提交，默认为false。
+            async: true,   //是否是异步
+            success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+              if (json.path) {
+                $('#iconUrl').val(json.path);
+                $('#iconImgUrl').attr("src", json.path);
+
+                console.log(json.path);
+
+              } else {
+                $("#tipMsg").text(json.msg);
+                $("#tipModal").modal('show');
+              }
+            },
+            error: function (data, status, e) {  //提交失败自动执行的处理函数。
+              console.error(e);
+            }
+          });
+        })
+
+        function clearModal () {
+          $('#iconImgUrl').attr('src', '');
+
+          $('#addForm').find('input[type=text],input[type=hidden],input[type=file]').each(function () {
+            $(this).val('');
+          })
+
+          $('#type').val(1);
+
+        }
+
+
+        $("#type").change(function () {
+          var optVal = $(this).val();
+        });
+
+
+
+      });
+    }
+  },
 
 };
 </script>

src/views/gamepartner/GameInfo.vue

@@ -0,0 +1,475 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <!-- 时间选择器 -->
+    <!-- <div class="inquire">
+      <div class="block">
+        <span class="demonstration">创建时间</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </div>
+    </div> -->
+    <div class="inquire">
+      <span>游戏昵称</span>
+      <el-input
+        v-model="inquire.gameName"
+        placeholder="请输入..."
+        class="input"
+      ></el-input>
+    </div>
+
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()">
+      查询</el-button
+    >
+    <!-- 添加 -->
+    <el-button class="primary" type="primary" @click="add()"> 添加</el-button>
+  </div>
+
+  <!-- 表格 -->
+  <el-table
+    v-loading="loading"
+    :data="tableData"
+    border
+    style="width: 100%; margin-top: 25px"
+  >
+    <el-table-column prop="gameName" align="center" label="游戏名称" />
+    <!-- <el-table-column prop="x" align="center" label="分区" /> -->
+    <el-table-column align="center" prop="giftInfo" label="游戏icon">
+      <template v-slot="scope">
+        <el-image
+          v-if="scope.row.logo"
+          style="width: 100px; height: 100px"
+          :src="scope.row.logo"
+          :zoom-rate="1.1"
+          :preview-src-list="scope.row.logo"
+          fit="cover"
+          preview-teleported="true"
+          hide-on-click-modal="true"
+        />
+        <div v-else>/</div>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" prop="giftInfo" label="游戏背景">
+      <template v-slot="scope">
+        <el-image
+          v-if="scope.row.background"
+          style="width: 100px; height: 100px"
+          :src="scope.row.background"
+          :zoom-rate="1.1"
+          :preview-src-list="scope.row.background"
+          fit="cover"
+          preview-teleported="true"
+          hide-on-click-modal="true"
+        />
+        <div v-else>/</div>
+      </template>
+    </el-table-column>
+    <el-table-column align="center" prop="giftInfo" label="下单弹窗背景">
+      <template v-slot="scope">
+        <el-image
+          v-if="scope.row.pic"
+          style="width: 100px; height: 100px"
+          :src="scope.row.pic"
+          :zoom-rate="1.1"
+          :preview-src-list="scope.row.pic"
+          fit="cover"
+          preview-teleported="true"
+          hide-on-click-modal="true"
+        />
+        <div v-else>/</div>
+      </template>
+    </el-table-column>
+    <!-- <el-table-column prop="x" align="center" label="创建日期" />
+    <el-table-column prop="x" align="center" label="添加人" /> -->
+    <el-table-column align="center" label="操作">
+      <template v-slot="scope">
+        <el-button
+          @click="eir(scope.row)"
+          class="primary"
+          type="primary"
+          size="default"
+          >编辑
+        </el-button>
+        <el-button
+          @click="
+            delObj = scope.row;
+            delDialog = true;
+          "
+          class="danger"
+          type="danger"
+          size="default"
+          >删除
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+
+  <!-- 分页 -->
+  <el-pagination
+    style="margin-top: 10px"
+    class="paginationClass"
+    v-model:current-page="currentPage"
+    v-model:page-size="pageSize"
+    :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+    layout="sizes, prev, pager, next"
+    :total="total"
+    @size-change="handleSizeChange"
+    @current-change="handleCurrentChange"
+  />
+
+  <!-- 二次确认 -->
+  <el-dialog v-model="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="sureClick()"> 确认 </el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+  <!-- 添加和编辑弹窗 -->
+  <el-dialog
+    v-model="operationDialog"
+    :title="operationTitle"
+    width="30%"
+    center
+  >
+    <!-- 地区 -->
+    <!-- <div class="selectBox">
+      <span class="left" style="margin-right: 20px">地区</span>
+       <el-checkbox-group v-model="operation.checkList">
+        <el-checkbox label="1">英语</el-checkbox>
+        <el-checkbox label="2">阿语</el-checkbox>
+        <el-checkbox label="4">华语</el-checkbox>
+      </el-checkbox-group>
+    </div> -->
+    <!-- 游戏昵称 -->
+    <div class="selectBox">
+      <span class="left" style="margin-right: 20px">游戏昵称</span>
+      <el-input
+        v-model="operation.gameName"
+        size="default"
+        placeholder="请输入游戏昵称..."
+        class="right"
+        style="width: 70%"
+      ></el-input>
+    </div>
+    <!-- 游戏icon -->
+    <div class="selectBox selectBoxImg">
+      <span class="left" style="margin-right: 20px">游戏icon</span>
+      <!-- action="/admin/tencent/cos/upload/file" -->
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="operation.imageUrl1"
+          :src="operation.imageUrl1"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+    </div>
+    <!-- 游戏背景 -->
+    <div class="selectBox selectBoxImg">
+      <span class="left" style="margin-right: 20px">游戏背景</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess2"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="operation.imageUrl2"
+          :src="operation.imageUrl2"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+    </div>
+    <!-- 下单弹窗icon -->
+    <div class="selectBox selectBoxImg">
+      <span class="left" style="margin-right: 20px">下单弹窗icon</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess3"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="operation.imageUrl3"
+          :src="operation.imageUrl3"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+    </div>
+    <!-- 操作 -->
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="operationDialog = false">取消</el-button>
+        <el-button type="primary" @click="operationClick()"> 确认 </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { page, save, delGame } from "@/api/gameInfo/gameInfo";
+import { Plus } from "@element-plus/icons-vue";
+import { uploadQiNiuFile } from "@/api/common/upload";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+
+export default {
+  name: "GameInfo",
+  components: {
+    Plus,
+  },
+  data() {
+    return {
+      inquire: {
+        time: "",
+        gameName: "",
+      },
+      loading: false,
+      // 表格数据
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 二次确认
+      delDialog: false,
+      //操作和编辑
+      operationDialog: false,
+      operationType: 1, //1添加2编辑
+      operationTitle: "编辑&添加",
+      operatioObj: {},
+      operation: {
+        gameName: "",
+        imageUrl1: "",
+        imageUrl2: "",
+        imageUrl3: "",
+      },
+      delObj: {},
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let startTime = "";
+      let endTime = "";
+      if (this.inquire.time && this.inquire.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");
+      }
+      page({
+        gameName: this.inquire.gameName,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.tableData = res.data.rows;
+          this.total = res.data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    add() {
+      this.operationDialog = true;
+      this.operationType = 1;
+      this.operationTitle = "添加";
+      this.operation = {
+        gameName: "",
+        imageUrl1: "",
+        imageUrl2: "",
+        imageUrl3: "",
+      };
+    },
+    eir(val) {
+      this.operatioObj = val;
+      this.operationDialog = true;
+      this.operationType = 2;
+      this.operationTitle = "编辑";
+      this.operation = {
+        gameName: this.operatioObj.gameName,
+        imageUrl1: this.operatioObj.logo,
+        imageUrl2: this.operatioObj.background,
+        imageUrl3: this.operatioObj.pic,
+      };
+    },
+    operationClick() {
+      save({
+        gameId: this.operationType == 1 ? null : this.operatioObj.gameId,
+        gameName: this.operation.gameName,
+        logo: this.operation.imageUrl1,
+        background: this.operation.imageUrl2,
+        pic: this.operation.imageUrl3,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.operationDialog = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    sureClick() {
+      delGame({ gameId: this.delObj.gameId }).then((res) => {
+        if (res.code === 200) {
+          this.delDialog = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    JsonFunc(val) {
+      var res = JSON.parse(val);
+      return res;
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.operation.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      // this.operation.imageUrl2 = URL.createObjectURL(file.raw);
+      this.operation.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess3(res, file) {
+      // this.operation.imageUrl3 = URL.createObjectURL(file.raw);
+      this.operation.imageUrl3 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    // 分页导航
+    handleSizeChange(size) {
+      this.pageSize = size;
+      this.getData();
+    },
+    handleCurrentChange(page) {
+      this.currentPage = page;
+      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;
+    }
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+  width: 150px;
+  height: 150px;
+}
+
+.avatar-uploader .el-upload .el-upload__input {
+  display: none;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+</style>

src/views/gamepartner/GamePartnerOrderDetailView.vue

@@ -0,0 +1,230 @@
+<template>
+    <section class="content">
+        <div class="box box-primary">
+            <div class="box-body">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <!-- .content -->
+                <div id="table"></div>
+                <div id="toolbar">
+                    <form id="searchForm1" action="/admin/gamePartner/order/dayExport" method="get" target="_blank">
+                        <div class="col-sm-12">
+                            <label for="startTime" class="col-sm-2 control-label">日期:</label>
+                            <div class="col-sm-4"><input type="text" class="form-control" name="startTime" id="startTime">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">-</label>
+                            <div class="col-sm-4"><input type="text" class="form-control" name="endTime" id="endTime"></div>
+                        </div>
+                    </form>
+                    <button id="btnSearch" class="btn btn-default">
+                        <i class="glyphicon glyphicon-search"></i>查询
+                    </button>
+                    <button id="btnExport" class="btn btn-default">
+                        <i class="glyphicon glyphicon-export"></i>导出
+                    </button>
+                </div>
+            </div>
+        </div>
+    </section>
+
+
+    <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content" style="width: 190%; left: 50%; transform: translateX(-50%);">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span>
+                    </button>
+                    <h4 class="modal-title" id="modalLabel">订单详情</h4>
+                </div>
+                <form id="searchForm2" action="/admin/gamePartner/order/dayDetailExport" method="get" target="_blank">
+                    <input type="hidden" name="orderDate" id="orderDate" />
+                    <div class="modal-body">
+                        <!-- .content -->
+                        <div id="detailTable"></div>
+                    </div>
+                </form>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-primary" id="detailExport">导出</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="tipModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">提示信息</h4>
+                </div>
+                <div class="modal-body" id="tipMsg"></div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import TableHelper from '@/utils/bootstrap-table-helper';
+export default {
+    name: "GamePartnerOrderDetailView",
+    setup() { },
+    created() {
+        this.$nextTick(function () {
+            this.initData();
+        });
+    },
+    methods: {
+        initData() {
+            $(function () {
+                $('#table').bootstrapTable('destroy');
+                // 清空分页组件的容器
+                $('.fixed-table-pagination').empty();
+                $('#table').bootstrapTable({
+                    columns: [
+                        { field: 'orderTime', title: '日期', align: 'center', width: '5%' },
+                        { field: 'orderNum', title: '下单用户数', align: 'center', width: '5%' },
+                        { field: 'totalInning', title: '累积下单局数', align: 'center', width: '5%' },
+                        { field: 'orderCount', title: '累积下单次数', align: 'center', width: '5%' },
+                        { field: 'totalAmount', title: '累积下单金额（钻）', align: 'center', width: '5%' },
+                        {
+                            field: 'handle',
+                            title: '详情',
+                            align: 'center',
+                            width: '5%',
+                            valign: 'middle',
+                            formatter: function (val, row, index) {
+                                return '<button class="btn btn-sm btn-default opt-detail" data-index="' + index + '">详情</button>';
+                            }
+                        }
+                    ],
+                    cache: false,
+                    striped: true,
+                    showRefresh: false,
+                    pageSize: 20,
+                    pagination: true,
+                    pageList: [20, 50, 100],
+                    search: false,
+                    sidePagination: "server", //表示服务端请求
+                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+                    //设置为limit可以获取limit, offset, search, sort, order
+                    queryParamsType: "undefined",
+                    queryParams: function queryParams(params) {   //设置查询参数
+                        var param = {
+                            page: params.pageNumber,
+                            pageSize: params.pageSize,
+                            startTime: $('#startTime').val(),
+                            endTime: $('#endTime').val(),
+                        };
+                        return param;
+                    },
+                    toolbar: '#toolbar',
+                    url: '/admin/gamePartner/order/dayPage',
+                    onLoadSuccess: function () {  //加载成功时执行
+                        console.log("load success");
+                    },
+                    onLoadError: function () {  //加载失败时执行
+                        console.log("load fail");
+                    }
+                });
+                var picker1 = $("#startTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true,
+                });
+                var picker2 = $("#endTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true
+                });
+                picker1.on('changeDate', function () {
+                    var date = $('#startTime').datepicker('getDate');
+                    picker2.datepicker('setStartDate', date);
+                });
+                picker2.on('changeDate', function () {
+                    var date = $('#endTime').datepicker('getDate');
+                    picker1.datepicker('setEndDate', date);
+                });
+                $('#table').on('click', '.opt-detail', function () {
+                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
+                    var orderTime = currentData.orderTime;
+                    $('#orderDate').val(orderTime);
+                    $("#detailModal").modal('show');
+                    $('#detailTable').bootstrapTable('destroy');
+                    // 清空分页组件的容器
+                    $('.fixed-table-pagination').empty();
+                    $('#detailTable').bootstrapTable({
+                        columns: [
+                            { field: 'fromErBanNo', title: '下单用户id', align: 'center', width: '5%' },
+                            { field: 'fromNick', title: '下单用户昵称', align: 'center', width: '5%' },
+                            { field: 'toErBanNo', title: '接单用户id', align: 'center', width: '5%' },
+                            { field: 'toNick', title: '接单用户昵称', align: 'center', width: '5%' },
+                            { field: 'hallErBanNo', title: '房主id', align: 'center', width: '5%' },
+                            { field: 'hallRoomName', title: '房间名称', align: 'center', width: '5%' },
+                            { field: 'gameName', title: '下单游戏', align: 'center', width: '5%' },
+                            { field: 'amount', title: '下单金额（钻）', align: 'center', width: '5%' },
+                            { field: 'orderTime', title: '下单时间', align: 'center', width: '5%' },
+                        ],
+                        cache: false,
+                        striped: true,
+                        showRefresh: false,
+                        pageSize: 20,
+                        pagination: true,
+                        pageList: [20, 50, 100],
+                        search: false,
+                        //表示服务端请求
+                        sidePagination: "server",
+                        //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+                        //设置为limit可以获取limit, offset, search, sort, order
+                        queryParamsType: "undefined",
+                        //设置查询参数
+                        queryParams: function queryParams(params) {
+                            var param = {
+                                page: params.pageNumber,
+                                pageSize: params.pageSize,
+                                orderDate: orderTime
+                            };
+                            return param;
+                        },
+                        url: '/admin/gamePartner/order/dayDetailPage',
+                        //加载成功时执行
+                        onLoadSuccess: function () {
+                            console.log("load success");
+                        },
+                        //加载失败时执行
+                        onLoadError: function () {
+                            console.log("load fail");
+                        }
+                    });
+                });
+                // 查询刷新
+                $('#btnSearch').on('click', function () {
+                    TableHelper.doRefresh('#table');
+                });
+                //导出功能
+                $("#btnExport").on('click', function () {
+                    $("#searchForm1").submit();
+                });
+                //导出功能
+                $("#detailExport").on('click', function () {
+                    $("#searchForm2").submit();
+                });
+            });
+        }
+    }
+};
+</script>
+
+<style scoped>
+.fixed-table-pagination .page-list {
+    display: block !important;
+}
+
+.fixed-table-pagination div.pagination,
+.fixed-table-pagination .pagination-detail {
+    display: block !important;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+</style>

src/views/gamepartner/GamePartnerOrderView.vue

@@ -0,0 +1,175 @@
+<template>
+    <section class="content">
+        <div class="box box-primary">
+            <div class="box-body">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <!-- .content -->
+                <div id="table"></div>
+                <div id="toolbar">
+                    <form id="searchForm" action="/admin/gamePartner/order/orderExport" method="get" target="_blank">
+                        <div class="col-sm-12">
+                            <label for="fromErBanNo" class="col-sm-2 control-label">下单用户id:</label>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="fromErBanNo"
+                                    id="fromErBanNo"></div>
+                            <label for="gameId" class="col-sm-2 control-label">下单游戏:</label>
+                            <div class="col-sm-2">
+                                <select name="gameId" id="gameId" data-btn-class="btn-warning" class="form-control">
+                                    <option value="" selected="selected">全部</option>
+                                </select>
+                            </div>
+                            <label for="orderNo" class="col-sm-2 control-label">订单号:</label>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="orderNo" id="orderNo"></div>
+                        </div>
+                        <div class="col-sm-12">
+                            <label for="startTime" class="col-sm-2 control-label">下单时间:</label>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="startTime" id="startTime">
+                            </div>
+                            <label for="endTime" class="col-sm-2 control-label">-</label>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
+                            <label for="toErBanNo" class="col-sm-2 control-label">接单用户id:</label>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="toErBanNo" id="toErBanNo">
+                            </div>
+                        </div>
+                    </form>
+                    <button id="btnSearch" class="btn btn-default">
+                        <i class="glyphicon glyphicon-search"></i>查询
+                    </button>
+                    <button id="btnExport" class="btn btn-default">
+                        <i class="glyphicon glyphicon-export"></i>导出
+                    </button>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class="modal fade" id="tipModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title">提示信息</h4>
+                </div>
+                <div class="modal-body" id="tipMsg"></div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import TableHelper from '@/utils/bootstrap-table-helper';
+export default {
+    name: "GamePartnerOrderView",
+    setup() { },
+    created() {
+        this.$nextTick(function () {
+            this.initData();
+        });
+    },
+    methods: {
+        initData() {
+            $(function () {
+                getGamePartnerInfo();
+                $('#table').bootstrapTable('destroy');
+                // 清空分页组件的容器
+                $('.fixed-table-pagination').empty();
+                $('#table').bootstrapTable({
+                    columns: [
+                        { field: 'orderNo', title: '订单号', align: 'center', width: '5%' },
+                        { field: 'fromErBanNo', title: '下单用户id', align: 'center', width: '5%' },
+                        { field: 'fromNick', title: '下单用户昵称', align: 'center', width: '5%' },
+                        { field: 'toErBanNo', title: '接单用户id', align: 'center', width: '5%' },
+                        { field: 'toNick', title: '接单用户昵称', align: 'center', width: '5%' },
+                        { field: 'income', title: '接单用户收益（水晶）', align: 'center', width: '5%' },
+                        { field: 'gameName', title: '下单游戏', align: 'center', width: '5%' },
+                        { field: 'inning', title: '下单局数', align: 'center', width: '5%' },
+                        { field: 'amount', title: '下单金额', align: 'center', width: '5%' },
+                        { field: 'orderTime', title: '下单时间', align: 'center', width: '5%' },
+                    ],
+                    cache: false,
+                    striped: true,
+                    showRefresh: false,
+                    pageSize: 20,
+                    pagination: true,
+                    pageList: [20, 50, 100],
+                    search: false,
+                    sidePagination: "server", //表示服务端请求
+                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+                    //设置为limit可以获取limit, offset, search, sort, order
+                    queryParamsType: "undefined",
+                    queryParams: function queryParams(params) {   //设置查询参数
+                        var param = {
+                            page: params.pageNumber,
+                            pageSize: params.pageSize,
+                            fromErBanNo: $('#fromErBanNo').val(),
+                            toErBanNo: $('#toErBanNo').val(),
+                            gameId: $('#gameId').val(),
+                            orderNo: $('#orderNo').val(),
+                            startTime: $('#startTime').val(),
+                            endTime: $('#endTime').val(),
+                        };
+                        return param;
+                    },
+                    toolbar: '#toolbar',
+                    url: '/admin/gamePartner/order/orderPage',
+                    onLoadSuccess: function () {  //加载成功时执行
+                        console.log("load success");
+                    },
+                    onLoadError: function () {  //加载失败时执行
+                        console.log("load fail");
+                    }
+                });
+                var picker1 = $("#startTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true,
+                });
+                var picker2 = $("#endTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true
+                });
+                picker1.on('changeDate', function () {
+                    var date = $('#startTime').datepicker('getDate');
+                    picker2.datepicker('setStartDate', date);
+                });
+                picker2.on('changeDate', function () {
+                    var date = $('#endTime').datepicker('getDate');
+                    picker1.datepicker('setEndDate', date);
+                });
+                //导出功能
+                $("#btnExport").on('click', function () {
+                    $("#searchForm").submit();
+                });
+                // 查询刷新
+                $('#btnSearch').on('click', function () {
+                    TableHelper.doRefresh('#table');
+                });
+                //游戏
+                function getGamePartnerInfo() {
+                    var array;
+                    $.ajax({
+                        type: "get",
+                        url: "/admin/gamePartner/info/listAll",
+                        dataType: "json",
+                        async: false,
+                        success: function (json) {
+                            if (json.success == 'true' || json.code == 200) {
+                                array = json.data;
+                            }
+                        }
+                    });
+                    var $select = $('#gameId');
+                    for (let i = 0; i < array.length; i++) {
+                        var $option = $('<option value="' + array[i].gameId + '" />');
+                        $option.html(array[i].gameName);
+                        $select.append($option);
+                    }
+                    return array;
+                }
+            });
+        }
+    }
+};
+</script>
+

src/views/gamepartner/UserGamePartnerInfoAdminView.vue

@@ -0,0 +1,501 @@
+<template>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <div class="col-sm-12">
+            <label for="erbanNo"
+                   class="col-sm-1 control-label">用户ID:</label>
+            <div class="col-sm-2">
+              <input type="number"
+                     class="form-control"
+                     name="erbanNo"
+                     id="erbanNo">
+            </div>
+            <label for="gameId"
+                   class="col-sm-1 control-label">游戏类型:</label>
+            <div class="col-sm-2">
+              <select name="gameId"
+                      id="gameId"
+                      class="form-control"></select>
+            </div>
+          </div>
+          <div class="col-sm-12">
+            <label for="startTime"
+                   class="col-sm-1 control-label">添加日期:</label>
+            <div class="col-sm-2">
+              <input type="text"
+                     class="input-sm form-control"
+                     name="startTime"
+                     id="startTime">
+            </div>
+
+            <label for="endTime"
+                   class="col-sm-1 control-label">至:</label>
+            <div class="col-sm-2">
+              <input type="text"
+                     class="input-sm form-control"
+                     name="endTime"
+                     id="endTime">
+            </div>
+          </div>
+          <div class="col-sm-12">
+            <button id="btnSearch"
+                    class="btn btn-default">
+              <i class="glyphicon glyphicon-search"></i>查询
+            </button>
+            <button id="btnAdd"
+                    class="btn btn-default">
+              <i class="glyphicon glyphicon-plus"></i>增加
+            </button>
+            <button id="btnBatchInvaild"
+                    class="btn btn-danger">
+              <i class="glyphicon glyphicon-remove"></i>批量失效
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <!-- .content -->
+      <div id="table"></div>
+
+    </div>
+  </section>
+
+  <div class="modal fade"
+       id="userModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title"
+              id="modalLabel">添加陪玩</h4>
+        </div>
+        <div class="modal-body">
+          <form class="form-horizontal"
+                id="modalForm">
+            <input type="hidden"
+                   name="uid"
+                   id="uid" />
+            <div class="form-group">
+              <label for="modalErbanNo"
+                     class="col-sm-3 control-label">用户ID:</label>
+              <div class="col-sm-9">
+                <input type="number"
+                       class="form-control validate[required]"
+                       name="modalErbanNo"
+                       id="modalErbanNo"
+                       onchange="inputErbanNo(this)">
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-12">
+                <input type="button"
+                       class="form-control"
+                       value="添加游戏"
+                       id="modalAddBtn"
+                       onclick="addGameInfo()" />
+              </div>
+            </div>
+            <div id="modalGames"></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="submit">确定</button>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import TableHelper from '@/utils/bootstrap-table-helper';
+
+let modalData = {};
+var gameInfoList = [];
+var gameInfoMap = {};
+export default {
+  name: "UserGamePartnerInfoAdminView",
+  setup () {
+    function selectGameId (select, index) {
+      const gameId = select.options[select.selectedIndex].value;
+      const gameInfo = gameInfoMap[gameId];
+      modalData.games[index] = { gameId: gameInfo.gameId, tags: Object.assign([], gameInfo.tags) }
+      freshUserModal()
+    }
+    function inputErbanNo (input) {
+      modalData.erbanNo = input.value;
+    }
+    function inputPrice (input, index) {
+      modalData.games[index].price = input.value;
+    }
+    function inputProficiency (input, index) {
+      modalData.games[index].proficiency = input.value;
+    }
+    function inputTag (input, index, tagIndex) {
+      modalData.games[index].tags[tagIndex].tagVal = input.value;
+    }
+    function addGameInfo () {
+      if (!modalData.games) {
+        modalData.games = [];
+      }
+      const hasAddGameId = modalData.games.map(game => game.gameId);
+      const gameInfo = gameInfoList.filter(gameInfo => !hasAddGameId.includes(gameInfo.gameId))[0];
+      modalData.games.push({ gameId: gameInfo.gameId, tags: Object.assign([], gameInfo.tags) })
+      freshUserModal()
+    }
+    window.selectGameId = selectGameId;
+    window.inputErbanNo = inputErbanNo;
+    window.inputPrice = inputPrice;
+    window.inputProficiency = inputProficiency;
+    window.inputTag = inputTag;
+    window.addGameInfo = addGameInfo;
+    return {
+      selectGameId,
+      inputErbanNo,
+      inputPrice,
+      inputProficiency,
+      inputTag,
+      addGameInfo,
+    };
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        cacheGameInfo();
+        $('#table').bootstrapTable('destroy');
+        // 清空分页组件的容器
+        $('.fixed-table-pagination').empty();
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'checkBox', title: 'id', align: 'center', checkbox: true, width: '5%' },
+            { field: 'erbanNo', title: '用户ID', align: 'center', width: '5%' },
+            { field: 'nick', title: '昵称', align: 'center', width: '10%' },
+            { field: 'games', title: '支持游戏', align: 'center', width: '60%', formatter: gameFormatter },
+            { field: 'updateTime', title: '更新时间', align: 'center', width: '10%' },
+            { field: 'adminName', title: '操作人', align: 'center', width: '10%' },
+            { field: 'status', title: '状态', align: 'center', width: '5%', formatter: function (val) { return val ? '有效' : '无效'; } },
+            {
+              field: 'operate',
+              title: '操作',
+              align: 'center',
+              width: '10%',
+              formatter: function (val, row, index) {
+                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm opt-edit" data-id=' + row.uid + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>&nbsp;&nbsp;' +
+                  (row.status ?
+                    '<button class="btn btn-sm btn-danger opt-invaild" data-id=' + row.uid +
+                    '><i class="glyphicon glyphicon-remove"></i>失效</button>'
+                    :
+                    '<button class="btn btn-sm btn-success opt-vaild" data-id=' + row.uid +
+                    '><i class="glyphicon glyphicon-save"></i>生效</button>'
+                  )
+              }
+            }
+          ],
+          uniqueId: 'uid',
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize,
+              erbanNo: $('#erbanNo').val(),
+              gameId: $('#gameId').val(),
+              startTime: $('#startTime').val(),
+              endTime: $('#endTime').val()
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/gamePartner/user/page',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
+        });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });
+        var chargeStart = $('#startTime').datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        });
+        var chargeEnd = $('#endTime').datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        });
+        $("#btnBatchInvaild").click(function () {
+          const row = $('#table').bootstrapTable('getSelections');
+          if (!row || row.length < 1) {
+            $("#tipMsg").text("未勾选任何用户");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (confirm("确认批量失效吗? ")) {
+            const uidStr = row.map(row => row.uid).join(",");
+            console.info(uidStr)
+            $.ajax({
+              type: 'post',
+              url: "/admin/gamePartner/user/changeStatus",
+              data: { uidStr: uidStr, status: 0 },
+              success: function (json) {
+                if (json.code === 200) {
+                  $("#tipMsg").text("操作成功");
+                  $("#tipModal").modal('show');
+                } else {
+                  $("#tipMsg").text("操作失败." + json.message);
+                  $("#tipModal").modal('show');
+                }
+                TableHelper.doRefresh("#table");
+                $("#userModal").modal('hide');
+              }
+            });
+          }
+        });
+        //新建标签
+        $("#btnAdd").click(function () {
+          openUserModal()
+        });
+        $("#submit").click(function () {
+          if ($("#modalForm").validationEngine('validate')) {
+            $.ajax({
+              type: "post",
+              url: "/admin/gamePartner/user/save",
+              data: JSON.stringify(modalData),
+              dataType: "json",
+              contentType: "application/json; charset=utf-8",
+              success: function (json) {
+                if (json.code === 200) {
+                  $("#tipMsg").text("保存成功");
+                  $("#tipModal").modal('show');
+                  TableHelper.doRefresh("#table");
+                  $("#userModal").modal('hide');
+                } else {
+                  $("#tipMsg").text("保存失败." + json.message);
+                  $("#tipModal").modal('show');
+                }
+              }
+            });
+          }
+        });
+        $("#table").on("click", '.opt-edit', function () {
+          const id = $(this).attr("data-id");
+          if (!id) {
+            $("#tipMsg").text("id参数有误");
+            $("#tipModal").modal('show');
+            return;
+          }
+          const row = $('#table').bootstrapTable('getRowByUniqueId', id);
+          openUserModal(row);
+        });
+        $("#table").on("click", '.opt-vaild', function () {
+          const id = $(this).attr("data-id");
+          if (!id) {
+            $("#tipMsg").text("id参数有误");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (confirm("确认该用户生效吗? ")) {
+            $.ajax({
+              type: 'post',
+              url: "/admin/gamePartner/user/changeStatus",
+              data: { uidStr: id, status: 1 },
+              success: function (json) {
+                if (json.code === 200) {
+                  $("#tipMsg").text("操作成功");
+                  $("#tipModal").modal('show');
+                } else {
+                  $("#tipMsg").text("操作失败." + json.message);
+                  $("#tipModal").modal('show');
+                }
+                TableHelper.doRefresh("#table");
+                $("#userModal").modal('hide');
+              }
+            });
+          }
+        });
+        $("#table").on("click", '.opt-invaild', function () {
+          const id = $(this).attr("data-id");
+          if (!id) {
+            $("#tipMsg").text("id参数有误");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (confirm("确认该用户失效吗? ")) {
+            $.ajax({
+              type: 'post',
+              url: "/admin/gamePartner/user/changeStatus",
+              data: { uidStr: id, status: 0 },
+              success: function (json) {
+                if (json.code === 200) {
+                  $("#tipMsg").text("操作成功");
+                  $("#tipModal").modal('show');
+                } else {
+                  $("#tipMsg").text("操作失败." + json.message);
+                  $("#tipModal").modal('show');
+                }
+                TableHelper.doRefresh("#table");
+                $("#userModal").modal('hide');
+              }
+            });
+          }
+        });
+      });
+
+      function openUserModal (data) {
+        clearUserModal();
+        if (data) {
+          setUserModal(data);
+        }
+        $("#userModal").modal('show');
+      }
+      function clearUserModal () {
+        modalData = {};
+        $("#modalErbanNo").val("");
+        $("#modalGames").empty();
+      }
+      function setUserModal (data) {
+        modalData = {
+          uid: data.uid, erbanNo: data.erbanNo,
+          games: Object.assign([], data.games ? data.games.map(game => { return { gameId: game.gameId, price: game.price, proficiency: game.proficiency, tags: Object.assign([], game.tags) } }) : [])
+        };
+        freshUserModal();
+      }
+
+
+
+
+      function cacheGameInfo () {
+        $.ajax({
+          type: 'get',
+          url: '/admin/gamePartner/info/listAll',
+          dataType: 'json',
+          success: function (res) {
+            if (res.code === 200) {
+              const data = res.data;
+              gameInfoList = data
+              gameInfoList.forEach(gameInfo => gameInfoMap[gameInfo.gameId] = gameInfo);
+              makeOption(data);
+            }
+          }
+        })
+      }
+      function makeOption (data) {
+        var str = '<option value=""></option>';
+        for (var i = 0; i < data.length; i++) {
+          str += '<option value="' + data[i].gameId + '">' + data[i].gameName + '</option>';
+        }
+        $('#gameId').html(str);
+      }
+      function gameFormatter (val) {
+        var str = ''
+        if (!val || val.size < 1) {
+          return str;
+        }
+        str += '<table>'
+        val.forEach((game, gameIndex) => {
+          if (gameIndex % 2 === 0) {
+            str += '<tr>'
+          }
+          str += '<td width="50%"><table style="border-collapse:separate; border-spacing:5px 5px;">'
+          str += ('<tr><td width="24%"><b>' + game.gameName + '</b></td><td width="24%">价格: ' + game.price + '</td><td width="24%">熟练度: ' + game.proficiency + '</td><td width="24%">接单次数: ' + game.finishNum + '</td></tr>');
+          game.tags.forEach((tag, index) => {
+            if (index / 3 === 0) {
+              str += '<tr>'
+            }
+            str += ('<td width="33%" style="word-break: break-all;word-wrap: break-word;">' + tag.tagName + ': ' + tag.tagVal + '</td>');
+            if ((index / 3 > 0 && index % 2 === 0) || index === (game.tags.size - 1)) {
+              str += '</tr>'
+            }
+          })
+          str += '</table></td>'
+          if ((gameIndex / 2 > 0 && (gameIndex + 1) % 2 === 0) || gameIndex === (val.size - 1)) {
+            str += '</tr>'
+          }
+        })
+        str += '</table>'
+        return str;
+      }
+    }
+  }
+};
+
+function freshUserModal () {
+  $("#modalUid").val(modalData.uid ?? "");
+  $("#modalErbanNo").val(modalData.erbanNo ?? "");
+  const hasAddGameId = modalData.games ? modalData.games.map(game => game.gameId) : [];
+  const canAdd = gameInfoList.filter(gameInfo => !hasAddGameId.includes(gameInfo.gameId)).length !== 0;
+  if (canAdd) {
+    $("#modalAddBtn").show();
+  } else {
+    $("#modalAddBtn").hide();
+  }
+  const gameStr = !modalData.games ? '' : modalData.games.map((game, index) =>
+    '<div class="form-group">' +
+    '<label for="modalGameId" class="col-sm-3 control-label">游戏:</label>' +
+    '<div class="col-sm-9">' +
+    '<select name="type" name="modalGameId" class="form-control validate[required]" onchange="selectGameId(this,' + index + ')">' +
+    gameInfoList.map(gameInfo =>
+      '<option value="' + gameInfo.gameId + '" ' + (game.gameId === gameInfo.gameId ? 'selected' : '') + '>' + gameInfo.gameName + '</option>')
+      .join("") +
+    '</select>' +
+    '</div>' +
+    '</div>' +
+    '<div class="form-group">' +
+    '<label for="modalPrice" class="col-sm-3 control-label">单价:</label>' +
+    '<div class="col-sm-9">' +
+    '<input type="number" class="form-control validate[required]" name="modalPrice" onchange="inputPrice(this, ' + index + ')" value="' + (game.price ?? 0) + '">' +
+    '</div>' +
+    '</div>' +
+    '<div class="form-group">' +
+    '<label for="modalProficiency" class="col-sm-3 control-label">熟练度:</label>' +
+    '<div class="col-sm-9">' +
+    '<input type="text" class="form-control validate[required]" name="modalProficiency" onchange="inputProficiency(this, ' + index + ')" value="' + (game.proficiency ?? '') + '">' +
+    '</div>' +
+    '</div>' +
+    game.tags.map((tag, tagIndex) =>
+      '<div class="form-group">' +
+      '<label for="modalTag" class="col-sm-3 control-label">' + tag.tagName + ':</label>' +
+      '<div class="col-sm-9">' +
+      '<input type="text" class="form-control validate[required]" name="modalTag" onchange="inputTag(this, ' + index + ',' + tagIndex + ')" value="' + (tag.tagVal ?? '') + '">' +
+      '</div>' +
+      '</div>'
+    ).join("")
+  ).join("<hr>");
+  $("#modalGames").html(gameStr);
+}
+</script>
+

src/views/invitationFission/invitationRanking.vue

@@ -1,174 +1,183 @@
 <template>
   <div class="outer">
     <!-- 查询条件 -->
-    <div class="inquire" style="display: inline-block; margin-right: 20px">
+    <div class="inquire"
+         style="display: inline-block; margin-right: 20px">
       <div class="block">
         <span class="demonstration">日期</span>
-        <el-date-picker
+        <el-date-picker v-model="inquire.time"
-          v-model="inquire.time"
+                        type="daterange"
-          type="daterange"
+                        range-separator="至"
-          range-separator="至"
+                        start-placeholder="开始日期"
-          start-placeholder="开始日期"
+                        end-placeholder="结束日期">
-          end-placeholder="结束日期"
-        >
         </el-date-picker>
       </div>
     </div>
-    <div class="inquire" style="display: inline-block; margin-right: 20px">
+    <div class="inquire"
+         style="display: inline-block; margin-right: 20px">
       <span class="demonstration">排序方式</span>
-      <el-select v-model="inquire.value" placeholder="请选择">
+      <el-select v-model="inquire.value"
-        <el-option
+                 placeholder="请选择">
-          v-for="item in inquire.options"
+        <el-option v-for="item in inquire.options"
-          :key="item.value"
+                   :key="item.value"
-          :label="item.label"
+                   :label="item.label"
-          :value="item.value"
+                   :value="item.value">
-        >
         </el-option>
       </el-select>
     </div>
-    <div class="inquire" style="margin-right: 20px">
+    <div class="inquire"
-      <span class="demonstration" style="margin-top: 5px">用户ID </span>
+         style="margin-right: 20px">
-      <el-input v-model="inquire.userId" placeholder="" class="input"></el-input>
+      <span class="demonstration"
+            style="margin-top: 5px">用户ID </span>
+      <el-input v-model="inquire.userId"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <!-- 查询按钮 -->
-    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button style=""
+               type="primary"
+               @click="getData()">查询</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
+              :data="tableData"
-      :data="tableData"
+              border
-      border
+              style="width: 100%; margin-top: 25px">
-      style="width: 100%; margin-top: 25px"
+      <el-table-column prop="erBanNo"
-    >
+                       align="center"
-      <el-table-column prop="erBanNo" align="center" label="用户id" />
+                       label="用户id" />
-      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="nick"
-      <el-table-column prop="inviteCode" align="center" label="邀请码" />
+                       align="center"
-      <el-table-column prop="directNum" align="center" label="直接邀请人数" />
+                       label="用户昵称" />
-      <el-table-column prop="indirectNum" align="center" label="间接邀请人数" />
+      <el-table-column prop="inviteCode"
-      <el-table-column
+                       align="center"
-        prop="directChargeAmount"
+                       label="邀请码" />
-        align="center"
+      <el-table-column prop="directNum"
-        label="直接邀请人总充值"
+                       align="center"
-      />
+                       label="直接邀请人数" />
-      <el-table-column
+      <el-table-column prop="indirectNum"
-        prop="indirectChargeAmount"
+                       align="center"
-        align="center"
+                       label="间接邀请人数" />
-        label="间接邀请人总充值"
+      <el-table-column prop="directChargeAmount"
-      />
+                       align="center"
-      <el-table-column
+                       label="直接邀请人总充值" />
-        prop="activityRegisterProfit"
+      <el-table-column prop="indirectChargeAmount"
-        align="center"
+                       align="center"
-        label="活动内注册收益"
+                       label="间接邀请人总充值" />
-      />
+      <el-table-column prop="activityRegisterProfit"
-      <el-table-column
+                       align="center"
-        prop="activityReturnProfit"
+                       label="活动内注册收益" />
-        align="center"
+      <el-table-column prop="activityReturnProfit"
-        label="活动内返点收益"
+                       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
+          <el-button @click="details(scope.row)"
-            @click="details(scope.row)"
+                     class="primary"
-            class="primary"
+                     type="primary"
-            type="primary"
+                     size="default">查看详情</el-button>
-            size="default"
+          <el-button @click="set(scope.row)"
-            >查看详情</el-button
+                     :class="scope.row.isBlack == 0 ? 'primary' : 'info'"
-          >
+                     :type="scope.row.isBlack == 0 ? 'primary' : 'info'"
-          <el-button
+                     size="default">{{ scope.row.isBlack == 0 ? "设为活动黑名单" : "取消活动黑名单" }}</el-button>
-            @click="set(scope.row)"
-            :class="scope.row.isBlack == 0 ? 'primary' : 'info'"
-            :type="scope.row.isBlack == 0 ? 'primary' : 'info'"
-            size="default"
-            >{{ scope.row.isBlack == 0 ? "设为活动黑名单" : "取消活动黑名单" }}</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
+                   class="paginationClass"
-      class="paginationClass"
+                   v-model:current-page="currentPage"
-      v-model:current-page="currentPage"
+                   v-model:page-size="pageSize"
-      v-model:page-size="pageSize"
+                   :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+                   layout="sizes, prev, pager, next"
-      layout="sizes, prev, pager, next"
+                   :total="total"
-      :total="total"
+                   @size-change="handleSizeChange"
-      @size-change="handleSizeChange"
+                   @current-change="handleCurrentChange" />
-      @current-change="handleCurrentChange"
-    />
 
     <!-- 详情 -->
-    <el-dialog v-model="detailsDialog" :title="detailsTitle" width="65%" center>
+    <el-dialog v-model="detailsDialog"
+               :title="detailsTitle"
+               width="65%"
+               center>
       <!-- 条件 -->
       <span>用户ID </span>
-      <el-input
+      <el-input style="display: inline-block; width: 200px"
-        style="display: inline-block; width: 200px"
+                v-model="detailsUserId"
-        v-model="detailsUserId"
+                placeholder=""
-        placeholder=""
+                class="input"></el-input>
-        class="input"
-      ></el-input>
       <!-- 查询按钮 -->
-      <el-button style="" type="primary" @click="getDataDetailsDialog()">查询</el-button>
+      <el-button style=""
+                 type="primary"
+                 @click="getDataDetailsDialog()">查询</el-button>
       <!-- 内表格 -->
-      <el-table
+      <el-table v-loading="loading"
-        v-loading="loading"
+                :data="tableDataIn"
-        :data="tableDataIn"
+                border
-        border
+                style="width: 100%; margin-top: 25px">
-        style="width: 100%; margin-top: 25px"
+        <el-table-column prop="createTime"
-      >
+                         align="center"
-        <el-table-column prop="createTime" align="center" label="新增时间" />
+                         label="新增时间" />
-        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="nick"
-        <el-table-column prop="erbanNo" align="center" label="用户ID" />
+                         align="center"
-        <el-table-column prop="inviteCode" align="center" label="填写邀请码" />
+                         label="用户昵称" />
-        <el-table-column align="center" label="是否补填">
+        <el-table-column prop="erbanNo"
+                         align="center"
+                         label="用户ID" />
+        <el-table-column prop="inviteCode"
+                         align="center"
+                         label="填写邀请码" />
+        <el-table-column align="center"
+                         label="是否补填">
           <template v-slot="scope">
             {{ scope.row.isRepair == 1 ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="邀请者">
+        <el-table-column align="center"
+                         label="邀请者">
           <template v-slot="scope">
             昵称：{{ scope.row.inviteNick }} ID：{{ scope.row.inviteErBanNo }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="邀请者的邀请者">
+        <el-table-column align="center"
+                         label="邀请者的邀请者">
           <template v-slot="scope">
             昵称：{{ scope.row.grandInviteNick }} ID：{{ scope.row.grandInviteErBanNo }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="是否充值">
+        <el-table-column align="center"
+                         label="是否充值">
           <template v-slot="scope">
             {{ scope.row.isCharge == 1 ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="inviteCharge30Amount"
-          prop="inviteCharge30Amount"
+                         align="center"
-          align="center"
+                         label="邀请30天内充值" />
-          label="邀请30天内充值"
+        <el-table-column prop="inviteChargeAmount"
-        />
+                         align="center"
-        <el-table-column prop="inviteChargeAmount" align="center" label="累计充值" />
+                         label="累计充值" />
-        <el-table-column
+        <el-table-column prop="inviteGiveAmount"
-          prop="inviteGiveAmount"
+                         align="center"
-          align="center"
+                         label="累计接收代充转增" />
-          label="累计接收代充转增"
-        />
       </el-table>
       <!-- 分页 -->
-      <el-pagination
+      <el-pagination style="margin-top: 10px"
-        style="margin-top: 10px"
+                     class="paginationClass"
-        class="paginationClass"
+                     v-model:current-page="currentPage2"
-        v-model:current-page="currentPage2"
+                     v-model:page-size="pageSize2"
-        v-model:page-size="pageSize2"
+                     :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-        :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+                     layout="sizes, prev, pager, next"
-        layout="sizes, prev, pager, next"
+                     :total="total"
-        :total="total"
+                     @size-change="handleSizeChange2"
-        @size-change="handleSizeChange2"
+                     @current-change="handleCurrentChange2" />
-        @current-change="handleCurrentChange2"
-      />
       <!-- 操作 -->
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="exportDate()"> 导出 </el-button>
+          <el-button type="primary"
+                     @click="exportDate()"> 导出 </el-button>
           <el-button @click="detailsDialog = false">关闭</el-button>
         </span>
       </template>
@@ -186,12 +195,12 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "invitationRanking",
-  data() {
+  data () {
     return {
       inquire: {
         time: "",
         userId: "",
-        value: "",
+        value: "0",
         options: [
           {
             value: "0",
@@ -225,24 +234,24 @@ export default {
       tableDataIn: [],
     };
   },
-  created() {
+  created () {
     this.getData();
   },
   methods: {
     // 查询
-    getData() {
+    getData () {
       this.loading = true;
-      let startTime = "";
+      let startDate = "";
-      let endTime = "";
+      let endDate = "";
       if (this.inquire.time && this.inquire.time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+        endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
       }
       userInviteFissionRecordGetInviteRank({
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        startTime: startTime,
+        startDate: startDate,
-        endTime: endTime,
+        endDate: endDate,
         erBanNo: this.inquire.userId,
         rankType: this.inquire.value,
       }).then((res) => {
@@ -252,7 +261,7 @@ export default {
       });
     },
     // 查看详情
-    details(val) {
+    details (val) {
       this.detailsTitle = `用户ID:${val.erBanNo}的数据`;
       this.getDataDetailsDialogVal = val;
       this.detailsDialog = true;
@@ -269,7 +278,7 @@ export default {
       });
     },
     // 设置黑名单
-    set(val) {
+    set (val) {
       userInviteFissionRecordSetBlack({
         status: val.isBlack == 0 ? 1 : 0,
         uid: val.uid,
@@ -278,7 +287,7 @@ export default {
       });
     },
     // 详情查询
-    getDataDetailsDialog() {
+    getDataDetailsDialog () {
       this.loading = true;
       userInviteFissionRecordGetDailyDetailList({
         // date: this.getDataDetailsDialogVal.date,
@@ -294,24 +303,24 @@ export default {
       });
     },
     // 导出
-    exportDate() {
+    exportDate () {
       userInviteFissionRecordExport({
         invitedErBanNo: this.detailsUserId,
         inviteErBanNo: this.getDataDetailsDialogVal.erBanNo,
-      }).then((res) => {});
+      }).then((res) => { });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
     // 分页导航
-    handleSizeChange2() {
+    handleSizeChange2 () {
       this.getDataDetailsDialog();
     },
-    handleCurrentChange2() {
+    handleCurrentChange2 () {
       this.getDataDetailsDialog();
     },
   },

src/views/login/index.vue

@@ -1,44 +1,67 @@
 <template>
-    <div class="page-container">
+  <div class="page-container">
-        <div class="main_box" :style="[smsSwitch ? 'height: 350px' : '']">
+    <div class="main_box"
-            <div class="login_box">
+         :style="[smsSwitch ? 'height: 350px' : '']">
-                <div class="login_logo">
+      <div class="login_box">
-                    <span
+        <div class="login_logo">
-                        style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;MOLISTAR&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
+          <span style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;MOLISTAR&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
-                </div>
-                <div class="login_form">
-                    <form id="loginForm" method="post">
-                        <input type="hidden" id="smsSwitch" :value="smsSwitch" />
-                        <div class="form-group">
-                            <label for="account" class="t">账&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
-                            <input id="account" name="account" type="text" class="form-control x319 in" autocomplete="off">
-                        </div>
-                        <div class="form-group">
-                            <label for="password" class="t">密&nbsp;&nbsp;&nbsp;&nbsp;码：</label>
-                            <input id="password" name="password" type="password" class="password form-control x319 in">
-                        </div>
-                        <div v-if="smsSwitch">
-                            <div class="form-group">
-                                <label for="validateCode" class="t">验证码：</label>
-                                <input id="validateCode" name="authCode" type="text" class="form-control x319 in"
-                                    style="width: 210px;">
-                                <button type="button" id="validateSend" class="btn btn-primary btn-lg">发送验证码</button>
-                            </div>
-                        </div>
-                        <div class="form-group" style="margin-bottom: 0px;">
-                            <label class="t"></label>
-                            <span class="loginTips"></span>
-                        </div>
-                        <div class="form-group space">
-                            <button type="button" id="loginBtn" class="btn btn-primary btn-lg">登&nbsp;&nbsp;录</button>
-                            &nbsp;&nbsp;&nbsp;&nbsp;
-                            <input type="reset" value="重&nbsp;&nbsp;置" class="btn btn-default btn-lg">
-                        </div>
-                    </form>
-                </div>
-            </div>
         </div>
+        <div class="login_form">
+          <form id="loginForm"
+                method="post">
+            <input type="hidden"
+                   id="smsSwitch"
+                   :value="smsSwitch" />
+            <div class="form-group">
+              <label for="account"
+                     class="t">账&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              <input id="account"
+                     name="account"
+                     type="text"
+                     class="form-control x319 in"
+                     autocomplete="off">
+            </div>
+            <div class="form-group">
+              <label for="password"
+                     class="t">密&nbsp;&nbsp;&nbsp;&nbsp;码：</label>
+              <input id="password"
+                     name="password"
+                     type="password"
+                     class="password form-control x319 in">
+            </div>
+            <div v-if="smsSwitch">
+              <div class="form-group">
+                <label for="validateCode"
+                       class="t">验证码：</label>
+                <input id="validateCode"
+                       name="authCode"
+                       type="text"
+                       class="form-control x319 in"
+                       style="width: 210px;">
+                <button type="button"
+                        id="validateSend"
+                        class="btn btn-primary btn-lg">发送验证码</button>
+              </div>
+            </div>
+            <div class="form-group"
+                 style="margin-bottom: 0px;">
+              <label class="t"></label>
+              <span class="loginTips"></span>
+            </div>
+            <div class="form-group space">
+              <button type="button"
+                      id="loginBtn"
+                      class="btn btn-primary btn-lg">登&nbsp;&nbsp;录</button>
+              &nbsp;&nbsp;&nbsp;&nbsp;
+              <input type="reset"
+                     value="重&nbsp;&nbsp;置"
+                     class="btn btn-default btn-lg">
+            </div>
+          </form>
+        </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -46,187 +69,188 @@ import store from '@/store';
 
 var sendFlag = true;
 export default {
-    name: "LoginView",
+  name: "LoginView",
-    data() {
+  data () {
-        return {
+    return {
-            smsSwitch: true,
+      smsSwitch: true,
-        };
+    };
-    },
+  },
-    setup() {
+  setup () {
-        return {
+    return {
 
-        };
+    };
-    },
+  },
-    created() {
+  created () {
-        this.smsSwitch = true;
+    this.smsSwitch = true;
-        this.$nextTick(function () {
+    this.$nextTick(function () {
-            this.initData();
+      this.initData();
-        });
+    });
-    },
+  },
-    methods: {
+  methods: {
-        initData() {
+    initData () {
-            $(function () {
+      $(function () {
-                var $ul = $('<ul id="bubble-wrapper"/>');
+        var $ul = $('<ul id="bubble-wrapper"/>');
-                for (var i = 0; i < 10; i++) {
+        for (var i = 0; i < 10; i++) {
-                    $ul.append($('<li/>'));
+          $ul.append($('<li/>'));
-                }
-                $("body").append($ul);
-
-                var rememberMe = getCookie("wolfbe.remember");
-                if (rememberMe == 1) {
-                    var account = getCookie("wolfbe.account");
-                    if (account) $("#account").val(account);
-                }
-
-                $("#loginBtn").click(function () {
-                    var account = $("#account").val();
-                    var password = $("#password").val();
-                    if (account.trim() == '') {
-                        $(".loginTips").html("账号不能为空！");
-                        return;
-                    } else if (password.trim() == '') {
-                        $(".loginTips").html("密码不能为空！");
-                        return;
-                    }
-                    password = $.md5(password);
-                    var param = { 'account': account, 'password': password };
-                    var smsSwitch = $('#smsSwitch').val();
-                    console.info('smsSwitch:' + smsSwitch);
-                    if (smsSwitch && smsSwitch == 'true') {
-                        var authCode = $("#validateCode").val();
-                        if (authCode.trim() == '') {
-                            $(".loginTips").html("验证码不能为空！");
-                            return;
-                        }
-                        authCode = $.md5(authCode);
-                        param = { 'account': account, 'password': password, 'authCode': authCode };
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/login/login",
-                        data: param,
-                        dataType: "json",
-                        success: function (data) {
-                            console.log("data is: " + data.success);
-                            //刷新验证码
-                            $("#validateImg").click();
-                            if (data.success == 'true') {
-                                console.log('login success!');
-                                var array = new String(data.msg).split('@');
-                                store.dispatch('getUser', array[0]).then(res => {
-                                    store.commit('updateUser', {
-                                        adminId: array[0],
-                                        username: res.username
-                                    });
-                                    window.location.href = '#/blank';
-                                });
-                            } else {
-                                if (data.msg == "4003" || data.msg == "404") {
-                                    if (data.data == "0") {
-                                        data.msg = "输入超过次数限制，请联系管理员";
-                                    } else {
-                                        data.msg = "密码或验证码错误！你今天还有" + data.data + "次重试机会";
-                                    }
-                                }
-                                $(".loginTips").html(data.msg).css("padding", "3px 5px");
-                                return false;
-                            }
-                        }
-                    });
-                });
-                $("#loginForm :input").not("#rememberAccount").focus(function () {
-                    $(".loginTips").html("").css("padding", "0");
-                }).keyup(function (e) {
-                    var keyCode = e.which || e.keyCode;
-                    if (keyCode == 13) {
-                        $("#loginBtn").click();
-                    }
-                });
-
-                $("#validateImg").click(function () {
-                    $(this).attr("src", "/admin/kaptcha?t=" + new Date().getTime());
-                });
-
-                $("#validateSend").click(function () {
-                    var account = $("#account").val();
-                    if (account.trim() == '') {
-                        $(".loginTips").html("账号不能为空！");
-                        return;
-                    }
-                    if (sendFlag) {
-                        $.ajax({
-                            type: "post",
-                            url: "/login/sendSmsCode",
-                            data: { 'account': account },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.code == 200) {
-                                    sendSmsSuccess();
-                                } else {
-                                    $(".loginTips").html(data.message);
-                                }
-                            }
-                        });
-                    }
-                });
-            });
         }
-    },
+        $("body").append($ul);
+
+        var rememberMe = getCookie("wolfbe.remember");
+        if (rememberMe == 1) {
+          var account = getCookie("wolfbe.account");
+          if (account) $("#account").val(account);
+        }
+
+        $("#loginBtn").click(function () {
+          var account = $("#account").val();
+          var password = $("#password").val();
+          if (account.trim() == '') {
+            $(".loginTips").html("账号不能为空！");
+            return;
+          } else if (password.trim() == '') {
+            $(".loginTips").html("密码不能为空！");
+            return;
+          }
+          password = $.md5(password);
+          var param = { 'account': account, 'password': password };
+          var smsSwitch = $('#smsSwitch').val();
+          console.info('smsSwitch:' + smsSwitch);
+          if (smsSwitch && smsSwitch == 'true') {
+            var authCode = $("#validateCode").val();
+            if (authCode.trim() == '') {
+              $(".loginTips").html("验证码不能为空！");
+              return;
+            }
+            authCode = $.md5(authCode);
+            param = { 'account': account, 'password': password, 'authCode': authCode };
+          }
+          $.ajax({
+            type: "post",
+            url: "/login/login",
+            data: param,
+            dataType: "json",
+            success: function (data) {
+              console.log("data is: " + data.success);
+              //刷新验证码
+              $("#validateImg").click();
+              if (data.success == 'true') {
+                console.log('login success!');
+                var array = new String(data.msg).split('@');
+                store.dispatch('getUser', array[0]).then(res => {
+                  store.commit('updateUser', {
+                    adminId: array[0],
+                    username: res.username
+                  });
+                  window.location.href = '#/blank';
+                });
+              } else {
+                if (data.msg == "4003" || data.msg == "404") {
+                  if (data.data == "0") {
+                    data.msg = "输入超过次数限制，请联系管理员";
+                  } else {
+                    data.msg = "密码或验证码错误！你今天还有" + data.data + "次重试机会";
+                  }
+                }
+                $(".loginTips").html(data.msg).css("padding", "3px 5px");
+                return false;
+              }
+            }
+          });
+        });
+        $("#loginForm :input").not("#rememberAccount").focus(function () {
+          $(".loginTips").html("").css("padding", "0");
+        }).keyup(function (e) {
+          var keyCode = e.which || e.keyCode;
+          if (keyCode == 13) {
+            $("#loginBtn").click();
+          }
+        });
+
+        $("#validateImg").click(function () {
+          $(this).attr("src", "/admin/kaptcha?t=" + new Date().getTime());
+        });
+
+        $("#validateSend").click(function () {
+          var account = $("#account").val();
+          if (account.trim() == '') {
+            $(".loginTips").html("账号不能为空！");
+            return;
+          }
+          if (sendFlag) {
+            $.ajax({
+              type: "post",
+              url: "/login/sendSmsCode",
+              data: { 'account': account },
+              dataType: "json",
+              success: function (data) {
+                if (data.code == 200) {
+                  sendSmsSuccess();
+                } else {
+                  $(".loginTips").html(data.message);
+                }
+              }
+            });
+          }
+        });
+      });
+    }
+  },
 };
 
-function sendSmsSuccess() {
+function sendSmsSuccess () {
-    if (sendFlag) {
+  if (sendFlag) {
-        sendFlag = false;
+    sendFlag = false;
-        var time = 181;
+    var time = 181;
-        var timer = setInterval(() => {
+    var timer = setInterval(() => {
-            time--;
+      time--;
-            $("#validateSend").html(time + ' 秒');
+      $("#validateSend").html(time + ' 秒');
-            if (time === 0) {
+      if (time === 0) {
-                clearInterval(timer);
+        clearInterval(timer);
-                $("#validateSend").html('重新获取');
+        $("#validateSend").html('重新获取');
-                sendFlag = true;
+        sendFlag = true;
-            }
+      }
-        }, 1000);
+    }, 1000);
-    }
+  }
 }
 
 //获取cookie的信息
-function getCookie(name) {
+function getCookie (name) {
-    var reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+  var reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
-    var arr = document.cookie.match(reg);
+  var arr = document.cookie.match(reg);
-    if (arr) {
+  if (arr) {
-        return (arr[2]);
+    return (arr[2]);
-    } else {
+  } else {
-        return null;
+    return null;
-    }
+  }
 }
 </script>
 
 <style scoped>
-@import '../../css/supersized.css';
+@import "../../css/supersized.css";
-@import '../../css/login.css';
+@import "../../css/login.css";
 
 * {
-    font-family: "Helvetica Neue", Helvetica, STheiti, 微软雅黑, 宋体, Arial, Tahoma, sans-serif, serif;
+  font-family: "Helvetica Neue", Helvetica, STheiti, 微软雅黑, 宋体, Arial,
+    Tahoma, sans-serif, serif;
 }
 
 .btn-lg {
-    padding: 8px 25px;
+  padding: 8px 25px;
 }
 
 #captcha_img {
-    margin-left: 5px;
+  margin-left: 5px;
 }
 
 .loginTips {
-    color: red;
+  color: red;
-    font-size: 14px;
+  font-size: 14px;
-    margin-left: 10px;
+  margin-left: 10px;
 }
 
 #validateSend {
-    width: 106px;
+  width: 106px;
-    padding: 6px 17px;
+  padding: 6px 17px;
-    font-size: 14px;
+  font-size: 14px;
 }
 </style>

src/views/medal/MedalInfo.vue

@@ -0,0 +1,624 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>勋章ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <div class="inquire">
+      <span>勋章昵称</span>
+      <el-input v-model="inquire.nick" placeholder="" class="input"></el-input>
+    </div>
+    <div class="inquire">
+      <span class="demonstration">地区</span>
+      <el-select filterable v-model="inquire.partitionId" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.options"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()">
+      查询
+    </el-button>
+    <el-button class="primary" type="primary" @click="add()"> 新增 </el-button>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="勋章ID" />
+      <el-table-column prop="partitionFlag" align="center" label="地区">
+        <template v-slot="scope">{{
+          partitionFlagFun(scope.row.partitionFlag, 1)
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="name" align="center" label="勋章名称-华语区">
+        <template v-slot="scope">{{ JSON.parse(scope.row.name).zh }}</template>
+      </el-table-column>
+      <el-table-column prop="name" align="center" label="勋章名称-英语区">
+        <template v-slot="scope">{{ JSON.parse(scope.row.name).en }}</template>
+      </el-table-column>
+      <el-table-column prop="name" align="center" label="勋章名称-阿语区">
+        <template v-slot="scope">{{ JSON.parse(scope.row.name).ar }}</template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="picUrl"
+        label="勋章图片"
+        width="120"
+      >
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.picUrl"
+            :zoom-rate="1.1"
+            :preview-src-list="scope.row.picUrl"
+            fit="cover"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="enable" align="center" label="状态">
+        <template v-slot="scope">{{
+          scope.row.enable ? "生效" : "不生效"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="createTime" align="center" label="添加时间" />
+      <el-table-column align="center" label="操作" width="220">
+        <template v-slot="scope">
+          <el-button
+            @click="eidFun(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+          >
+            编辑
+          </el-button>
+          <el-button
+            @click="grantFun(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            :disabled="!scope.row.enable"
+          >
+            发放
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+
+    <!-- 新增&编辑弹窗 -->
+    <el-dialog
+      destroy-on-close
+      class="pub"
+      v-model="controlsDialog"
+      :title="controlsTitle"
+      width="32%"
+      center
+    >
+      <!-- 地区 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >地区</span
+        >
+        <el-select
+          multiple
+          filterable
+          v-model="controlsObj.value"
+          placeholder="请选择"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in controlsObj.options"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <!-- 勋章名称-华语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章名称-华语</span
+        >
+        <el-input
+          v-model="controlsObj.nickZh"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 勋章名称-英语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章名称-英语</span
+        >
+        <el-input
+          v-model="controlsObj.nickEn"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 勋章名称-阿语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章名称-阿语</span
+        >
+        <el-input
+          v-model="controlsObj.nickAr"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 勋章图片 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章图片</span
+        >
+        <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
+            :src="controlsObj.imageUrl1"
+            class="avatar"
+          />
+        </el-upload>
+      </div>
+
+      <!-- 状态 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >状态</span
+        >
+        <el-select filterable v-model="controlsObj.value2" placeholder="请选择">
+          <el-option
+            v-for="item in controlsObj.options2"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+
+      <!-- 弹窗按钮 -->
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="controlsDialog = false">取消</el-button>
+          <el-button type="primary" @click="controlsDialogOut()">
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 发放勋章弹窗 -->
+    <el-dialog
+      destroy-on-close
+      class="pub"
+      v-model="grantDialog"
+      title="发放勋章"
+      width="32%"
+      center
+    >
+      <!-- 勋章名称 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章名称</span
+        >
+        <el-input
+          v-model="grantObj.nick"
+          placeholder="默认展示的是中文勋章名称"
+          class="input"
+          disabled
+        ></el-input>
+      </div>
+
+      <!-- 发放对象平台号 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >发放对象平台号</span
+        >
+        <el-input
+          type="textarea"
+          :rows="2"
+          v-model="grantObj.userId"
+          placeholder="多个平台号用英文“,”号分开分隔"
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 发放天数 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >发放天数</span
+        >
+        <el-input
+          v-model="grantObj.days"
+          placeholder="输入天数，不输入则视为无限制"
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 备注 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >备注</span
+        >
+        <el-input
+          v-model="grantObj.desc"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 弹窗按钮 -->
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="grantDialog = false">取消</el-button>
+          <el-button type="primary" @click="grantOut()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  medalPage,
+  medalSave,
+  medalSend,
+} from "@/api/medal/medal";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "MedalInfo",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+        nick: "",
+        partitionId: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10,
+      currentPage: 1,
+      pageSize: 10,
+      // 操作弹窗
+      controlsDialog: false,
+      controlsTitle: "新增&编辑",
+      controlsType: 1,
+      controlsObj: {
+        value: [],
+        options: [],
+        nickZh: "",
+        nickEn: "",
+        nickAr: "",
+        imageUrl1: "",
+        value2: "",
+        options2: [
+          {
+            desc: "生效",
+            id: true,
+          },
+          {
+            desc: "不生效",
+            id: false,
+          },
+        ],
+        id: "",
+      },
+      // 发放弹窗
+      grantDialog: false,
+      grantObj: {
+        nick: "",
+        userId: "",
+        days: "",
+        desc: "",
+      },
+      grantObjNew: {},
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.options.push({
+        desc: "全部",
+        id: "",
+      });
+      listPartitionInfo().then((res) => {
+        this.controlsObj.options = res.data;
+        this.getData();
+      });
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      medalPage({
+        id: this.inquire.id,
+        name: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 添加
+    add() {
+      this.controlsTitle = "新增";
+      this.controlsType = 1;
+      this.controlsObj.value = [];
+      this.controlsObj.nickZh = "";
+      this.controlsObj.nickEn = "";
+      this.controlsObj.nickAr = "";
+      this.controlsObj.imageUrl1 = "";
+      this.controlsObj.value2 = "";
+      this.controlsDialog = true;
+    },
+    // 编辑
+    eidFun(val) {
+      this.controlsTitle = "编辑";
+      this.controlsType = 2;
+      this.controlsObj.value = this.partitionFlagFun(val.partitionFlag, 2);
+      this.controlsObj.nickZh = JSON.parse(val.name).zh;
+      this.controlsObj.nickEn = JSON.parse(val.name).en;
+      this.controlsObj.nickAr = JSON.parse(val.name).ar;
+      this.controlsObj.imageUrl1 = val.picUrl;
+      this.controlsObj.value2 = val.enable;
+      this.controlsObj.id = val.id;
+      this.controlsDialog = true;
+    },
+    // 确认保存按钮
+    controlsDialogOut() {
+      if (this.controlsType == 1) {
+        // 新增
+        var obj = {};
+        var partitionFlagVal = 0;
+        console.log(this.controlsObj.value);
+        console.log(this.controlsObj.options);
+        this.controlsObj.value.forEach((res, i) => {
+          partitionFlagVal |= this.controlsObj.options[i].id;
+        });
+        obj.partitionFlag = partitionFlagVal;
+        obj.name = JSON.stringify({
+          zh: this.controlsObj.nickZh,
+          en: this.controlsObj.nickEn,
+          ar: this.controlsObj.nickAr,
+        });
+        obj.picUrl = this.controlsObj.imageUrl1;
+        obj.enable = this.controlsObj.value2;
+        console.log(obj);
+        medalSave(obj).then((res) => {
+          if (res.code == 200) {
+            this.getData();
+            this.controlsDialog = false;
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else {
+        // 编辑
+        var obj1 = {};
+        var partitionFlagVal1 = 0;
+        this.controlsObj.value.forEach((res, i) => {
+          partitionFlagVal1 += res;
+        });
+        obj1.partitionFlag = partitionFlagVal1;
+        obj1.name = JSON.stringify({
+          zh: this.controlsObj.nickZh,
+          en: this.controlsObj.nickEn,
+          ar: this.controlsObj.nickAr,
+        });
+        obj1.picUrl = this.controlsObj.imageUrl1;
+        obj1.enable = this.controlsObj.value2;
+        obj1.id = this.controlsObj.id;
+        console.log(1111111111, this.controlsObj.value);
+        console.log(this.controlsObj.options);
+        console.log(obj1);
+        medalSave(obj1).then((res) => {
+          if (res.code == 200) {
+            this.getData();
+            this.controlsDialog = false;
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+    },
+    //发放按钮
+    grantFun(val) {
+      this.grantObjNew = val;
+      this.grantObj.nick = JSON.parse(val.name).zh;
+      this.grantDialog = true;
+    },
+    // 确认发放
+    grantOut() {
+      medalSend({
+        days: this.grantObj.days,
+        erbanNoStr: this.grantObj.userId,
+        medalId: this.grantObjNew.id,
+        remark: this.grantObj.desc,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message || "发放成功",
+            type: "success",
+          });
+          this.grantDialog = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    partitionFlagFun(num, type) {
+      //1 2 4
+      var val = 0;
+      if (type == 2) {
+        if (num == 0 || num == 7) {
+          val = [4, 1, 2];
+        } else if (num == 1) {
+          val = [1];
+        } else if (num == 3) {
+          val = [1, 2];
+        } else if (num == 2) {
+          val = [2];
+        } else if (num == 6) {
+          val = [2, 4];
+        } else if (num == 4) {
+          val = [4];
+        }
+      } else {
+        if (num == 0 || num == 7) {
+          val = "华语区、英语区、阿语区";
+        } else if (num == 1) {
+          val = "英语区";
+        } else if (num == 3) {
+          val = "英语区、阿语区";
+        } else if (num == 2) {
+          val = "阿语区";
+        } else if (num == 6) {
+          val = "阿语区、华语区";
+        } else if (num == 4) {
+          val = "华语区";
+        }
+      }
+      return val;
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(file);
+      this.controlsObj.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/medal/MedalRecord.vue

@@ -0,0 +1,363 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>勋章ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <div class="inquire">
+      <span>用户平台ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()">
+      查询
+    </el-button>
+    <el-button class="primary" type="primary" @click="grantDialog = true">
+      发放勋章
+    </el-button>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="createTime" align="center" label="发放时间" />
+      <el-table-column prop="source" align="center" label="发放渠道">
+        <template v-slot="scope">{{
+          scope.row.source == 1 ? "管理后台" : scope.row.source
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="id" align="center" label="发放勋章ID" />
+      <el-table-column prop="medalName" align="center" label="勋章名称" />
+      <el-table-column align="center" prop="x" label="勋章图片" width="120">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.picUrl"
+            :zoom-rate="1.1"
+            :preview-src-list="scope.row.picUrl"
+            fit="cover"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="x" align="center" label="生效天数">
+        <template v-slot="scope">{{ scope.row.days }}</template>
+      </el-table-column>
+      <el-table-column prop="x" align="center" label="备注">
+        <template v-slot="scope">{{
+          scope.row.remark == "" ? "-" : scope.row.remark
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="x" align="center" label="状态">
+        <template v-slot="scope">{{
+          scope.row.status == 1
+            ? "生效中"
+            : scope.row.status == 0
+            ? "已失效"
+            : "撤销"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="erbanNo" align="center" label="发放对象平台号" />
+      <el-table-column prop="nick" align="center" label="发放对象昵称" />
+      <el-table-column
+        prop="partitionName"
+        align="center"
+        label="发放对象分区"
+      />
+      <el-table-column align="center" label="操作" width="220">
+        <template v-slot="scope">
+          <el-button
+            @click="eidFun(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            :disabled="scope.row.status <= 0 ? true : false"
+          >
+            撤销
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+
+    <!-- 发放勋章弹窗 -->
+    <el-dialog
+      destroy-on-close
+      class="pub"
+      v-model="grantDialog"
+      title="发放勋章"
+      width="32%"
+      center
+    >
+      <!-- 勋章昵称 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >勋章昵称</span
+        >
+        <el-select filterable v-model="grantObj.value" placeholder="请选择">
+          <el-option
+            v-for="item in grantObj.options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+
+      <!-- 发放对象平台号 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >发放对象平台号</span
+        >
+        <el-input
+          type="textarea"
+          :rows="2"
+          v-model="grantObj.userId"
+          placeholder="多个平台号用英文“,”号分开分隔"
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 发放天数 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >发放天数</span
+        >
+        <el-input
+          v-model="grantObj.days"
+          placeholder="输入天数，不输入则视为无限制"
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 备注 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >备注</span
+        >
+        <el-input
+          v-model="grantObj.desc"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+
+      <!-- 弹窗按钮 -->
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="grantDialog = false">取消</el-button>
+          <el-button type="primary" @click="grantOut()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+    <!-- 二次确认弹窗 -->
+    <el-dialog
+      destroy-on-close
+      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>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  medalRecordPage,
+  listAll,
+  medalSend,
+  rollback,
+} from "@/api/medal/medal";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "MedalRecord",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+        userId: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10,
+      currentPage: 1,
+      pageSize: 10,
+      // 发放弹窗
+      grantDialog: false,
+      grantObj: {
+        value: "",
+        options: [],
+        userId: "",
+        days: "",
+        desc: "",
+      },
+      // 撤销
+      delDialog: false,
+      delObj: {},
+    };
+  },
+  created() {
+    listAll().then((res) => {
+      if (res.code == 200) {
+        this.grantObj.options = res.data;
+        this.getData();
+      } else {
+        ElMessage({
+          showClose: true,
+          message: res.message,
+          type: "error",
+        });
+      }
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      medalRecordPage({
+        medalId: this.inquire.id,
+        erbanNo: this.inquire.userId,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 确认发放
+    grantOut() {
+      medalSend({
+        days: this.grantObj.days,
+        erbanNoStr: this.grantObj.userId,
+        medalId: this.grantObj.value,
+        remark: this.grantObj.desc,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message || "发放成功",
+            type: "success",
+          });
+          this.grantDialog = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 撤销按钮
+    eidFun(val) {
+      this.delObj = val;
+      this.delDialog = true;
+    },
+    // 确认撤销按钮
+    delClick() {
+      console.log(this.delObj);
+      rollback({ recordId: this.delObj.id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message || "撤销成功",
+            type: "success",
+          });
+          this.getData();
+          this.delDialog = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/nobleman/GoldWater.vue

@@ -0,0 +1,325 @@
+<template>
+  <div class="box">
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">会长分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.inquireonInfos"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 公会ID -->
+    <div class="inquire">
+      <span>会长ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 公会 -->
+    <div class="inquire">
+      <span>公会名称</span>
+      <el-input
+        v-model="inquire.nick"
+        placeholder="支持模糊查询"
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="deriveFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
+      <el-table-column prop="name" align="center" label="公会名称" />
+      <el-table-column
+        prop="ownerPartitionName"
+        align="center"
+        label="会长分区"
+      />
+      <el-table-column prop="memberNum" align="center" label="成员数" />
+      <el-table-column
+        prop="goldIncome"
+        align="center"
+        label="月金币收入(流水)"
+      />
+      <el-table-column
+        prop="hasGoldIncomeMemberNum"
+        align="center"
+        label="有流水成员数"
+      />
+      <el-table-column prop="sendGiftUserNum" align="center" label="送礼人数" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button @click="ediClick(scope.row)" type="text" size="default"
+            >查看详情</el-button
+          >
+          <el-button @click="deriveFun2(scope.row)" type="text" size="default"
+            >导出</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 内嵌单个工会详情 -->
+    <el-dialog :title="detailsTitle" v-model="detailsDialog">
+      <el-table
+        v-loading="loading"
+        :data="tableDataDetails"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="erbanNo" align="center" label="用户平台ID"
+          ><template v-slot="scope">
+            {{
+              scope.row.enable ? scope.row.erbanNo : scope.row.erbanNo + "离开"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="micRemainTime" align="center" label="直播时长" />
+        <el-table-column
+          prop="goldIncome"
+          align="center"
+          label="金币收入（流水）"
+        />
+        <el-table-column
+          prop="sendGiftUserNum"
+          align="center"
+          label="送礼人数"
+        />
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailsDialog = false">关闭</el-button>
+          <el-button type="primary" @click="incomeExportFamilyFun()"
+            >导出</el-button
+          >
+        </div></template
+      >
+    </el-dialog>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  incomePageFamily,
+  incomeListFamilyMember,
+  incomeExportFamily,
+  incomeExportFamilys,
+} from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "GoldWater",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        time: this.calculateLastSevenDays(),
+        id: "",
+        nick: "",
+        partitionId: 2,
+        inquireonInfos: [
+          { desc: "英语区", id: 1 },
+          { desc: "阿拉伯区", id: 2 },
+          { desc: "华语区", id: 4 },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 内嵌单个公会详情
+      detailsDialog: false,
+      detailsTitle: "",
+      tableDataDetails: [],
+      familyIdEx: "",
+    };
+  },
+  created() {
+    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");
+      }
+      incomePageFamily({
+        erbanNo: this.inquire.id,
+        familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+        startDate: startTime,
+        endDate: endTime,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        this.loading = false;
+      });
+    },
+    // 导出总外列表
+    deriveFun(val) {
+      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");
+      }
+      incomeExportFamilys({
+        startDate: startTime,
+        endDate: endTime,
+        erbanNo: this.inquire.id,
+        familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {});
+    },
+    // 导出列表最外层
+    deriveFun2(val) {
+      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");
+      }
+      incomeExportFamily({
+        familyId: val.id,
+        startDate: startTime,
+        endDate: endTime,
+      }).then((res) => {});
+      this.detailsDialog = false;
+    },
+    // 默认七天
+    calculateLastSevenDays() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
+      return [start, end];
+    },
+    // 查看详情按钮
+    ediClick(val) {
+      this.detailsTitle = `公会昵称：【${val.name}】 时间：【${val.createTime}】—金币收入明细`;
+      let time = this.inquire.time;
+      let startDate = "";
+      let endDate = "";
+      if (time && time.length > 0) {
+        startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      this.familyIdEx = val.id;
+      incomeListFamilyMember({
+        endDate,
+        startDate,
+        familyId: val.id,
+      }).then((res) => {
+        this.tableDataDetails = res.data;
+        this.detailsDialog = true;
+      });
+    },
+    // 导出按钮
+    incomeExportFamilyFun() {
+      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");
+      }
+      incomeExportFamily({
+        familyId: this.familyIdEx,
+        startDate: startTime,
+        endDate: endTime,
+      }).then((res) => {});
+      this.detailsDialog = false;
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/nobleman/GuildInfo.vue

@@ -18,7 +18,7 @@
       ></el-input>
     </div>
     <!-- 时间选择器 -->
-    <div class="inquire">
+    <!-- <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
         <el-date-picker
@@ -30,7 +30,7 @@
         >
         </el-date-picker>
       </div>
-    </div>
+    </div> -->
     <!-- 查询按钮 -->
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
@@ -38,6 +38,9 @@
     <el-button class="primary" type="primary" @click="addDialog = true"
       >添加</el-button
     >
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
+      >导出</el-button
+    >
 
     <!-- 表格 -->
     <el-table
@@ -49,6 +52,11 @@
       <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">
@@ -65,14 +73,53 @@
       </el-table-column>
       <el-table-column prop="createTime" align="center" label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column
+      <el-table-column align="center" label="成员数量/上限">
-        align="center"
+        <template v-slot="scope">
-        label="成员数量/上限"
+          <el-button
-        ><template v-slot="scope"
+            @click="memberDialogFun(scope.row)"
-          >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</template
+            type="text"
-        ></el-table-column>
+            size="default"
-      <el-table-column prop="goldIncome" align="center" label="金币总收入" />
+            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
+          >
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="收款账户" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="payAccountDialogFun(scope.row)"
+            type="text"
+            size="medium "
+          >
+            payoneer:{{
+              scope.row.payAccount.payoneer
+                ? scope.row.payAccount.payoneer
+                : "未添加"
+            }} </el-button
+          ><br />
+          <el-button
+            @click="payAccountDialogFun(scope.row)"
+            type="text"
+            size="medium "
+          >
+            USDT-ERC20:{{
+              scope.row.payAccount.usdt ? scope.row.payAccount.usdt : "未添加"
+            }} </el-button
+          ><br />
+          <el-button
+            @click="payAccountDialogFun(scope.row)"
+            type="text"
+            size="medium "
+          >
+            PayPal:{{
+              scope.row.payAccount.payPal
+                ? scope.row.payAccount.payPal
+                : "未添加"
+            }} </el-button
+          ><br />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
+      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
       <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
@@ -196,9 +243,24 @@
           v-model="ediObj.guildNick"
           style="width: 75%"
           class="input"
-          disabled
         ></el-input>
       </div>
+      <!-- 公会背景图 -->
+      <div class="selectBox selectBoxImg">
+        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <!-- action="/admin/tencent/cos/upload/file" -->
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
         <span
@@ -231,10 +293,160 @@
         </span>
       </template>
     </el-dialog>
+    <!-- 编辑收款账户弹窗 -->
+    <el-dialog
+      v-model="payAccountDialog"
+      :title="payAccountTitle"
+      width="28%"
+      center
+    >
+      <!-- Payoneer -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >Payoneer</span
+        >
+        <el-input
+          v-model="payAccount.payoneer"
+          style="width: 75%"
+          class="input"
+        ></el-input>
+      </div>
+      <!-- USDT-ERC20 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >USDT-ERC20</span
+        >
+        <el-input
+          v-model="payAccount.usdt"
+          style="width: 75%"
+          class="input"
+        ></el-input>
+      </div>
+      <!-- PayPal -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >PayPal</span
+        >
+        <el-input
+          v-model="payAccount.payPal"
+          style="width: 75%"
+          class="input"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="payAccountDialog = false">取消</el-button>
+          <el-button type="primary" @click="payAccountClick()">
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 编辑成员弹窗 -->
+    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+      <!-- 新增用户 -->
+      <div class="inquire">
+        <span>平台ID</span>
+        <el-input
+          v-model="member.userID"
+          placeholder="请输入新增平台id"
+          class="input"
+        ></el-input>
+        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+      </div>
+      <!-- 内嵌表格 -->
+      <el-table
+        v-loading="loading"
+        :data="member.tableData"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column align="center" label="用户平台ID">
+          <template v-slot="scope">
+            {{ scope.row.erbanNo
+            }}{{
+              scope.row.roleType == 1
+                ? "(会长)"
+                : scope.row.roleType == 2
+                ? "(管理员)"
+                : ""
+            }}
+            {{ 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">
+          <template v-slot="scope">
+            <el-button
+              @click="setMemberFun(scope.row)"
+              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              size="default"
+              :disabled="scope.row.roleType == 1 ? true : false"
+              >{{
+                scope.row.roleType == 1
+                  ? "会长"
+                  : scope.row.roleType == 2
+                  ? "取消管理员"
+                  : "设为管理员"
+              }}</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
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="memberDialog = false">
+            关闭
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 二次确认删除弹窗 -->
+    <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>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { pageFamily, create, update, dismiss } from "@/api/nobleman/nobleman";
+import {
+  pageFamily,
+  exportInfo,
+  create,
+  update,
+  dismiss,
+  savePayAccount,
+  manageListFamilyMember,
+  addMember,
+  setManager,
+  removeMember,
+} from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -274,7 +486,28 @@ export default {
         guildNick: "",
         guildNumber: "",
         id: "",
+        imageUrl1: "",
       },
+      // 收款账户弹窗
+      payAccountDialog: false,
+      payAccountTitle: "(会长昵称【ID:0】)的收款账户",
+      payAccountNew: {},
+      payAccount: {
+        payoneer: "",
+        usdt: "",
+        payPal: "",
+      },
+      // 新增成员弹窗
+      memberDialog: false,
+      memberTitle: "【公会名称】成员信息",
+      memberNew: {},
+      member: {
+        userID: "",
+        tableData: [],
+      },
+      // 删除成员弹窗
+      memberRemoveDialog: false,
+      memberRemoveObj: {},
     };
   },
   created() {
@@ -295,8 +528,8 @@ export default {
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
-        startDate: startTime,
+        // startDate: startTime,
-        endDate: endTime,
+        // endDate: endTime,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
       }).then((res) => {
@@ -305,6 +538,149 @@ export default {
         this.loading = false;
       });
     },
+    // 打开成员信息弹窗
+    memberDialogFun(val) {
+      var than = this;
+      than.memberTitle = `【${val.name}】成员信息`;
+      than.memberNew = val;
+      manageListFamilyMember({
+        familyId: val.id,
+      }).then((res) => {
+        this.member.tableData = res.data;
+        than.memberDialog = true;
+      });
+    },
+    // 二次确认删除成员
+    delmemberRemoveClick() {
+      removeMember({
+        familyMemberId: this.memberRemoveObj.familyMemberId,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "删除成功",
+            type: "success",
+          });
+          manageListFamilyMember({
+            familyId: this.memberNew.id,
+          }).then((res) => {
+            this.member.tableData = res.data;
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.memberRemoveDialog = false;
+      });
+    },
+    // 设置管理员
+    setMemberFun(val) {
+      setManager({
+        familyMemberId: val.familyMemberId,
+        status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "设置成功！",
+            type: "success",
+          });
+          this.member.userID = "";
+          manageListFamilyMember({
+            familyId: this.memberNew.id,
+          }).then((res) => {
+            this.member.tableData = res.data;
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 新增成员
+    addMemberFun() {
+      addMember({
+        erbanNo: this.member.userID,
+        familyId: this.memberNew.id,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+          this.member.userID = "";
+          manageListFamilyMember({
+            familyId: this.memberNew.id,
+          }).then((res) => {
+            this.member.tableData = res.data;
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: "保存失败！",
+            type: "error",
+          });
+        }
+      });
+    },
+    // 打开收款账户弹窗
+    payAccountDialogFun(val) {
+      this.payAccountTitle = `(${val.ownerNick}【ID:${val.ownerErbanNo}】)的收款账户`;
+      this.payAccount.payoneer = val.payAccount.payoneer;
+      this.payAccount.usdt = val.payAccount.usdt;
+      this.payAccount.payPal = val.payAccount.payPal;
+      this.payAccountDialog = true;
+      this.payAccountNew = val;
+    },
+    // 保存收款账户
+    payAccountClick() {
+      savePayAccount({
+        id: this.payAccountNew.payAccount.familyId,
+        payPal: this.payAccount.payPal,
+        payoneer: this.payAccount.payoneer,
+        usdt: this.payAccount.usdt,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "保存成功！",
+            type: "success",
+          });
+          this.payAccountDialog = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: "保存失败！",
+            type: "error",
+          });
+        }
+      });
+    },
+    // 导出
+    exportInfoFun() {
+      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");
+      }
+      exportInfo({
+        erbanNo: this.inquire.userId,
+        referrer: this.inquire.referrer,
+        familyName: this.inquire.nick,
+        // startDate: startTime,
+        // endDate: endTime,
+      }).then((res) => {});
+    },
     // 添加
     add() {
       this.addDialog = false;
@@ -323,6 +699,7 @@ export default {
       this.ediObj.guildNick = obj.name;
       this.ediObj.guildNumber = obj.memberNumLimit;
       this.ediObj.id = obj.id;
+      this.ediObj.imageUrl1 = obj.backgroundUrl;
       this.editDialog = true;
     },
     // 二次确认弹窗
@@ -331,6 +708,8 @@ export default {
       update({
         id: this.ediObj.id,
         memberNumLimit: this.ediObj.guildNumber,
+        backgroundUrl: this.ediObj.imageUrl1,
+        name: this.ediObj.guildNick,
       }).then((res) => {
         if (res.code == 200) {
           ElMessage({
@@ -373,6 +752,30 @@ export default {
         this.delDialog = false;
       });
     },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl1 = URL.createObjectURL();
+      this.ediObj.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
     // 分页导航
     handleSizeChange() {
       this.getData();
@@ -406,4 +809,13 @@ export default {
     margin: 15px 0 5px 0px;
   }
 }
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
 </style>

src/views/nobleman/GuildMemberInfo.vue

@@ -3,172 +3,163 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
+      <el-input v-model="inquire.userId"
-        v-model="inquire.userId"
+                placeholder=""
-        placeholder=""
+                class="input"></el-input>
-        class="input"
-      ></el-input>
     </div>
     <!-- 工会昵称 -->
     <div class="inquire">
       <span>工会名称</span>
-      <el-input v-model="inquire.nick" placeholder="" class="input"></el-input>
+      <el-input v-model="inquire.nick"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <!-- 时间选择器 -->
     <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
-        <el-date-picker
+        <el-date-picker v-model="inquire.time"
-          v-model="inquire.time"
+                        type="datetimerange"
-          type="datetimerange"
+                        range-separator="至"
-          range-separator="至"
+                        start-placeholder="开始日期"
-          start-placeholder="开始日期"
+                        end-placeholder="结束日期">
-          end-placeholder="结束日期"
-        >
         </el-date-picker>
       </div>
     </div>
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary"
-      >查询</el-button
+               type="primary"
-    >
+               @click="getData()">查询</el-button>
     <!-- 导出按钮 -->
-    <el-button class="primary" type="primary" @click="exportFamilyMemberFun()"
+    <el-button class="primary"
-      >导出</el-button
+               type="primary"
-    >
+               @click="exportFamilyMemberFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
+              :data="tableData"
-      :data="tableData"
+              border
-      border
+              style="width: 100%; margin-top: 25px">
-      style="width: 100%; margin-top: 25px"
+      <el-table-column prop="familyName"
-    >
+                       align="center"
-      <el-table-column
+                       label="公会昵称" />
-        prop="familyOwnerErbanNo"
+      <el-table-column prop="erbanNo"
-        align="center"
+                       align="center"
-        label="公会长ID"
+                       label="成员ID" />
-      />
+      <el-table-column prop="nick"
-      <el-table-column
+                       align="center"
-        prop="familyOwnerNick"
+                       label="成员昵称" />
-        align="center"
+      <el-table-column prop="partitionName"
-        label="公会长昵称"
+                       align="center"
-      />
+                       label="成员分区" />
-      <el-table-column prop="familyName" align="center" label="公会昵称" />
+      <el-table-column prop="goldIncome"
-      <el-table-column prop="erbanNo" align="center" label="成员ID" />
+                       align="center"
-      <el-table-column prop="nick" align="center" label="成员昵称" />
+                       label="金币总收入" />
-      <el-table-column prop="goldIncome" align="center" label="金币总收入" />
+      <el-table-column prop="diamondRemain"
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
+                       align="center"
-      <el-table-column prop="micRemainTime" align="center" label="开播时长" />
+                       label="钻石总收入" />
-      <el-table-column
+      <el-table-column prop="micRemainTime"
-        prop="sendGiftUserNum"
+                       align="center"
-        align="center"
+                       label="开播时长" />
-        label="送礼用户数"
+      <el-table-column prop="sendGiftUserNum"
-      />
+                       align="center"
-      <el-table-column align="center" label="成员状态">
+                       label="送礼用户数" />
+      <el-table-column align="center"
+                       label="成员状态">
         <template v-slot="scope">{{
           scope.row.enable ? "有效" : "无效"
         }}</template>
       </el-table-column>
-      <el-table-column align="center" label="是否违规">
+      <el-table-column align="center"
+                       label="是否违规">
         <template v-slot="scope">{{ scope.row.violationNum }}</template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
+          <el-button @click="warnClick(scope)"
-            @click="warnClick(scope)"
+                     class="primary"
-            class="primary"
+                     type="primary"
-            type="primary"
+                     size="default">违规警告</el-button>
-            size="default"
+          <el-button @click="listRecordFun(scope.row)"
-            >违规警告</el-button
+                     class="primary"
-          >
+                     type="primary"
-          <el-button
+                     size="default"
-            @click="listRecordFun(scope.row)"
+                     :disabled="scope.row.violationNum == 0 ? 'disabled' : ''">警告详情</el-button>
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="scope.row.violationNum == 0 ? 'disabled' : ''"
-            >警告详情</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 详情设备信息弹窗 -->
-    <el-dialog v-model="dialogTableVisible" title="警告详情">
+    <el-dialog v-model="dialogTableVisible"
-      <el-table style="width: 100%" :data="tableData2">
+               title="警告详情">
-        <el-table-column property="x" label="成员ID" min-width="100px" />
+      <el-table style="width: 100%"
-        <el-table-column property="x" label="成员昵称" min-width="100px" />
+                :data="tableData2">
-        <el-table-column property="x" label="违规日期" min-width="100px" />
+        <el-table-column property="x"
-        <el-table-column property="x" label="被警告日期" min-width="100px" />
+                         label="成员ID"
-        <el-table-column property="x" label="违规类型" min-width="100px" />
+                         min-width="100px" />
+        <el-table-column property="x"
+                         label="成员昵称"
+                         min-width="100px" />
+        <el-table-column property="x"
+                         label="违规日期"
+                         min-width="100px" />
+        <el-table-column property="x"
+                         label="被警告日期"
+                         min-width="100px" />
+        <el-table-column property="x"
+                         label="违规类型"
+                         min-width="100px" />
       </el-table>
-      <el-button
+      <el-button class="dialogTableVisibleBut"
-        class="dialogTableVisibleBut"
+                 type="primary"
-        type="primary"
+                 @click="dialogTableVisible = false">
-        @click="dialogTableVisible = false"
-      >
         关闭
       </el-button>
     </el-dialog>
 
     <!-- 违规弹窗 -->
-    <el-dialog v-model="violationDialog" title="新增" width="28%" center>
+    <el-dialog v-model="violationDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">成员ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="violationObj.id"
-          >成员ID</span
+                  style="width: 75%"
-        >
+                  class="input"
-        <el-input
+                  disabled></el-input>
-          v-model="violationObj.id"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">成员昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="violationObj.nick"
-          >成员昵称</span
+                  style="width: 75%"
-        >
+                  class="input"
-        <el-input
+                  disabled></el-input>
-          v-model="violationObj.nick"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">违规日期</span>
-          class="col-sm-2 control-label"
+        <el-date-picker v-model="violationObj.time"
-          >违规日期</span
+                        type="datetime"
-        >
+                        placeholder="选择日期时间">
-        <el-date-picker
-          v-model="violationObj.time"
-          type="datetime"
-          placeholder="选择日期时间"
-        >
         </el-date-picker>
       </div>
 
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">违规类型</span>
-          class="col-sm-2 control-label"
+        <el-select v-model="violationObj.nowValue"
-          >违规类型</span
+                   placeholder="请选择">
-        >
+          <el-option v-for="item in violationObj.options"
-        <el-select v-model="violationObj.nowValue" placeholder="请选择">
+                     :key="item.id"
-          <el-option
+                     :label="item.type"
-            v-for="item in violationObj.options"
+                     :value="item.id">
-            :key="item.id"
-            :label="item.type"
-            :value="item.id"
-          >
           </el-option>
         </el-select>
       </div>
@@ -176,7 +167,8 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="violationDialog = false">取消</el-button>
-          <el-button type="primary" @click="add(violationObj)">
+          <el-button type="primary"
+                     @click="add(violationObj)">
             确认
           </el-button>
         </span>
@@ -184,17 +176,15 @@
     </el-dialog>
 
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
+                   class="paginationClass"
-      class="paginationClass"
+                   v-model:current-page="currentPage"
-      v-model:current-page="currentPage"
+                   v-model:page-size="pageSize"
-      v-model:page-size="pageSize"
+                   :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+                   layout="sizes, prev, pager, next"
-      layout="sizes, prev, pager, next"
+                   :total="total"
-      :total="total"
+                   @size-change="handleSizeChange"
-      @size-change="handleSizeChange"
+                   @current-change="handleCurrentChange" />
-      @current-change="handleCurrentChange"
-    />
   </div>
 </template>
 <script>
@@ -211,7 +201,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildMemberInfo",
-  data() {
+  data () {
     return {
       loading: false,
       //查询所需条件对象
@@ -220,15 +210,8 @@ export default {
         nick: "",
         time: "",
       },
-      // 表格
+      //新增所需对象
-      tableData: [],
+      resource: {
-      // 内嵌表格
-      dialogTableVisible: false,
-      tableData2: [],
-      //   新增弹窗
-      violationDialog: false,
-      // 违规对象
-      violationObj: {
         id: "",
         nick: "",
         time: "",
@@ -236,13 +219,17 @@ export default {
         options: [],
         familyMemberId: null,
       },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
       // 分页
       total: 10, //总页数
       currentPage: 1, //页码
       pageSize: 10, //条数
     };
   },
-  created() {
+  created () {
     this.getData();
     listFun().then((res) => {
       this.violationObj.options = res.data;
@@ -250,7 +237,7 @@ export default {
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -275,7 +262,7 @@ export default {
       });
     },
     // 导出
-    exportFamilyMemberFun() {
+    exportFamilyMemberFun () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -295,7 +282,7 @@ export default {
       });
     },
     // 违规警告
-    warnClick(val) {
+    warnClick (val) {
       console.log(val.row);
       var obj = val.row;
       this.violationObj.id = val.row.erbanNo;
@@ -303,7 +290,7 @@ export default {
       this.violationObj.familyMemberId = val.row.familyMemberId;
       this.violationDialog = true;
     },
-    add(val) {
+    add (val) {
       var num = this.violationObj.options.map((item, i) => {
         return this.violationObj.nowValue == item.id ? i : null;
       });
@@ -331,7 +318,7 @@ export default {
         }
       });
     },
-    listRecordFun(val) {
+    listRecordFun (val) {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -361,10 +348,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },

src/views/nobleman/WagesCount.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="box">
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-config-provider :locale="zhCn">
+          <el-date-picker
+            v-model="inquire.time"
+            type="month"
+            placeholder="选择月"
+          >
+          </el-date-picker
+        ></el-config-provider>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">会长分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.inquireonInfos"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+
+    <!-- 公会 -->
+    <div class="inquire">
+      <span>会长ID</span>
+      <el-input v-model="inquire.nick" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 导出 -->
+    <el-button class="primary" type="primary" @click="deriveFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
+      <el-table-column prop="name" align="center" label="公会名称" />
+      <el-table-column
+        prop="ownerPartitionName"
+        align="center"
+        label="会长分区"
+      />
+      <el-table-column prop="memberNum" align="center" label="成员数" />
+      <el-table-column
+        prop="goldIncome"
+        align="center"
+        label="月金币收入(流水)"
+      />
+      <el-table-column prop="goldWage" align="center" label="金币工资" />
+      <el-table-column prop="agentWage" align="center" label="代理工资" />
+      <el-table-column prop="diamondRemain" align="center" label="当前钻石余额">
+        <template v-slot="scope">{{ scope.row.diamondRemain }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="260">
+        <template v-slot="scope">
+          <el-button
+            @click="ediClick(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >查看详情</el-button
+          >
+          <el-button
+            @click="deriveFun2(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >导出</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 内嵌单个工会详情 -->
+    <el-dialog :title="detailsTitle" v-model="detailsDialog">
+      <el-table
+        v-loading="loading"
+        :data="tableDataDetails"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="erbanNo" align="center" label="用户平台ID">
+          <template v-slot="scope">
+            {{
+              scope.row.erbanNo == scope.row.familyOwnerErbanNo
+                ? scope.row.erbanNo + "(会长)"
+                : scope.row.enable
+                ? scope.row.erbanNo
+                : scope.row.erbanNo + "离开"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column
+          prop="micRemainTime"
+          align="center"
+          label="本月直播时长"
+        />
+        <el-table-column
+          prop="micVaildDays"
+          align="center"
+          label="本月有效天数"
+        />
+        <el-table-column
+          prop="goldIncome"
+          align="center"
+          label="月金币收入（流水）"
+        />
+        <el-table-column prop="goldWage" align="center" label="金币工资" />
+        <el-table-column prop="agentWage" align="center" label="代理工资" />
+        <el-table-column
+          prop="diamondRemain"
+          align="center"
+          label="当前钻石余额"
+        />
+        <el-table-column align="center" label="操作">
+          <template v-slot="scope">
+            <el-button
+              @click="detailsClick(scope.row)"
+              class="primary"
+              type="primary"
+              size="default"
+              >查看详情</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailsDialog = false">关闭</el-button>
+          <el-button type="primary" @click="detailsClickOut()">导出</el-button>
+        </div></template
+      >
+    </el-dialog>
+
+    <!-- 内嵌单个成员明细 -->
+    <el-dialog :title="detailsTitle2" v-model="detailsDialog2">
+      <el-table
+        v-loading="loading"
+        :data="tableDataDetails2"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="date" align="center" label="日期" />
+        <el-table-column prop="micRemainTime" align="center" label="直播时长" />
+        <el-table-column prop="micVaild" align="center" label="是否有效天">
+          <template v-slot="scope">
+            {{ scope.row.micVaild ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="goldIncome"
+          align="center"
+          label="当日金币收入"
+        />
+        <el-table-column
+          prop="savedGoldIncome"
+          align="center"
+          label="月累计金币收入"
+        />
+        <el-table-column
+          prop="saveedGoldWage"
+          align="center"
+          label="月金币工资"
+        />
+        <el-table-column
+          prop="diamondRemain"
+          align="center"
+          label="当日钻石余额"
+        />
+        <!-- <el-table-column align="center" label="操作">
+          <template v-slot="scope">
+            <el-button
+              @click="detailsClick2(scope)"
+              class="primary"
+              type="text"
+              size="default"
+              :disabled="!scope.row.enable"
+              >查看详情</el-button
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailsDialog2 = false">关闭</el-button>
+          <el-button type="primary" @click="detailsClickOut2()">导出</el-button>
+        </div></template
+      >
+    </el-dialog>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import zhCn from "element-plus/dist/locale/zh-cn.mjs";
+import {
+  statPageFamily,
+  listFamilyMember,
+  statExportFamilyMember,
+  listFamilyMemberDaily,
+  exportFamilyMemberDaily,
+  statExportFamily,
+} from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "WagesCount",
+  data() {
+    return {
+      zhCn,
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        time: "",
+        nick: "",
+        partitionId: 2,
+        inquireonInfos: [
+          { desc: "英语区", id: 1 },
+          { desc: "阿拉伯区", id: 2 },
+          { desc: "华语区", id: 4 },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 内嵌单个公会详情
+      detailsDialog: false,
+      detailsTitle: "工会昵称 时间段 结算明细",
+      tableDataDetails: [],
+      detailsClickOutObj: {},
+      // 内嵌单个公会详情2
+      detailsDialog2: false,
+      detailsTitle2: "工会昵称 用户昵称（ID：0） 时间段 结算明细",
+      tableDataDetails2: [],
+      detailsClickOutObj2: {},
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      // this.loading = true;
+      let time = this.inquire.time;
+      if (time) {
+        time = dateFormat(this.inquire.time, "yyyy-MM");
+      }
+      statPageFamily({
+        erbanNo: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+        month: time,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        this.loading = false;
+      });
+    },
+    // 导出总外列表
+    deriveFun(val) {
+      let time = this.inquire.time;
+      if (time) {
+        time = dateFormat(this.inquire.time, "yyyy-MM");
+      }
+      statExportFamily({
+        erbanNo: this.inquire.nick,
+        month: time,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {});
+    },
+    // 导出列表最外层
+    deriveFun2(val) {
+      statExportFamilyMember({
+        familyId: val.id,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
+      });
+      this.detailsDialog = false;
+    },
+    // 1层查看详情按钮
+    ediClick(val) {
+      console.log(val);
+      var than = this;
+      this.detailsClickOutObj = val;
+      than.detailsTitle = `[${val.name}] [${dateFormat(
+        than.inquire.time,
+        "yyyy-MM"
+      )}]结算明细`;
+      listFamilyMember({
+        familyId: val.id,
+        month: dateFormat(than.inquire.time, "yyyy-MM"),
+      }).then((res) => {
+        this.tableDataDetails = res.data;
+        this.detailsDialog = true;
+      });
+    },
+    // 导出最外层数据按钮
+    detailsClickOut() {
+      statExportFamilyMember({
+        familyId: this.detailsClickOutObj.id,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
+      });
+      this.detailsDialog = false;
+    },
+    // 嵌套详情按钮
+    detailsClick(val) {
+      var than = this;
+      this.detailsClickOutObj2 = val;
+      than.detailsTitle2 = `公会名称：${val.familyName} 成员名称：${
+        val.nick
+      }（ID：${val.erbanNo}） ${dateFormat(
+        than.inquire.time,
+        "yyyy-MM"
+      )} 结算明细`;
+      listFamilyMemberDaily({
+        familyId: val.familyId,
+        month: dateFormat(than.inquire.time, "yyyy-MM"),
+        uid: val.uid,
+      }).then((res) => {
+        than.tableDataDetails2 = res.data;
+        than.detailsDialog2 = true;
+      });
+    },
+    // 导出每日成员数据
+    detailsClickOut2() {
+      exportFamilyMemberDaily({
+        familyId: this.detailsClickOutObj2.id,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
+        uid: this.detailsClickOutObj2.uid,
+      });
+      this.detailsDialog2 = false;
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/nobleman/WaterSettlement.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="box">
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="addDialog = true"
+      >新增</el-button
+    >
+    <el-tabs v-model="roleType" @click="handleClick" style="margin-top: 20px">
+      <el-tab-pane label="金币工资" name="3"></el-tab-pane>
+      <el-tab-pane label="代理工资" name="1"></el-tab-pane>
+    </el-tabs>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column
+        prop="level"
+        align="center"
+        label="金币目标（金币流水）"
+      />
+      <el-table-column prop="wage" align="center" label="金币工资（USD）" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button
+            @click="delClick(scope.row)"
+            class="danger"
+            type="danger"
+            size="default"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 新增弹窗 -->
+    <el-dialog title="新增档位" v-model="addDialog" width="35%">
+      <div class="inquire">
+        <span>金币目标（金币流水）</span>
+        <el-input v-model="add.gold" placeholder="" class="input"></el-input>
+      </div>
+      <div class="inquire">
+        <span>金币工资（USD）</span>
+        <el-input v-model="add.usdt" placeholder="" class="input"></el-input>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="addDialog = false">取消</el-button>
+          <el-button type="primary" @click="addShour()">保存</el-button>
+        </div></template
+      >
+    </el-dialog>
+
+    <!-- 二次确认删除弹窗 -->
+    <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="dle()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { manageList, manageAdd, manageDelete } from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "WaterSettlement",
+  data() {
+    return {
+      loading: false,
+      // 切换
+      roleType: "3",
+      // 表格
+      tableData: [],
+      arr1: [],
+      arr2: [],
+      // 新增弹窗
+      addDialog: false,
+      add: {
+        gold: "",
+        usdt: "",
+      },
+      delDialog: false,
+      delObj: {},
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      manageList({
+        roleType: this.roleType,
+      }).then((res) => {
+        this.tableData = res.data;
+        this.loading = false;
+      });
+    },
+    handleClick(tab, event) {
+      this.getData();
+    },
+    // 确认新增按钮
+    addShour() {
+      manageAdd({
+        roleType: this.roleType,
+        level: this.add.gold,
+        wage: this.add.usdt,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "新增成功",
+            type: "success",
+          });
+          this.getData();
+          this.addDialog = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 删除
+    delClick(val) {
+      this.delObj = val;
+      this.delDialog = true;
+    },
+    // 确认删除
+    dle() {
+      manageDelete({ id: this.delObj.id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "删除成功",
+            type: "success",
+          });
+          this.getData();
+          this.delDialog = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    width: 60%;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/users/FeedBack.vue

@@ -31,8 +31,6 @@
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
     >
-    <!-- 导出按钮 -->
-    <el-button class="primary" type="primary" @click="derive()">导出</el-button>
   </div>
 
   <!-- 表格 -->

src/views/vip/VipGive.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询
+    </el-button>
+    <el-button class="primary" type="primary" @click="editDialog = true"
+      >赠送VIP
+    </el-button>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="平台号" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column
+        prop="registerTime"
+        align="center"
+        label="用户注册时间"
+      />
+      <el-table-column prop="createTime" align="center" label="赠送贵族时间" />
+      <el-table-column prop="vipLevel" align="center" label="赠送贵族等级">
+        <template v-slot="scope">VIP{{ scope.row.vipLevel }}</template>
+      </el-table-column>
+      <el-table-column prop="adminName" 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"
+    />
+
+    <!-- 赠送VIP弹窗 -->
+    <el-dialog
+      v-model="editDialog"
+      title="赠送VIP(点击确认直接赠送，请认真核对谨慎操作！！)"
+      width="36%"
+      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="editObj.userId"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入赠送用户平台ID"
+          @input="inputFun()"
+        ></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"
+          >赠送VIP等级</span
+        >
+        <el-select v-model="editObj.value" placeholder="请选择">
+          <el-option
+            v-for="item in editObj.options"
+            :key="item.vipLevel"
+            :label="item.vipName"
+            :value="item.vipLevel"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <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="editObj.nick"
+            style="width: 75%"
+            class="input"
+            placeholder="请先输入用户平台id"
+            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="editObj.region"
+            style="width: 75%"
+            class="input"
+            placeholder="请先输入用户平台id"
+            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="editObj.time"
+            style="width: 75%"
+            class="input"
+            placeholder="请先输入用户平台id"
+            disabled
+          ></el-input>
+        </div>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="editDialog = false">取消</el-button>
+          <el-button type="primary" @click="editDialogClick()">
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getByErbanNo,
+  listAll,
+  pageRecord,
+  vipSendSend,
+} from "@/api/VipGive/VipGive";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "VipGive",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   赠送VIP
+      editDialog: false,
+      timeout: "",
+      editObj: {
+        userId: "",
+        value: "",
+        options: [],
+        nick: "",
+        time: "",
+        region: "",
+        uid: "",
+      },
+    };
+  },
+  created() {
+    this.getData();
+    listAll().then((res) => {
+      this.editObj.options = res.data;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      pageRecord({
+        erbanNo: this.inquire.userId,
+        current: this.currentPage,
+        size: this.pageSize,
+      }).then((res) => {
+        this.total = res.data.total;
+        this.tableData = res.data.rows;
+        this.loading = false;
+      });
+    },
+    // 监听弹窗用户id输入
+    inputFun() {
+      var than = this;
+      clearTimeout(than.timeout);
+      than.timeout = setTimeout(function () {
+        ElMessage({
+          showClose: true,
+          message: "查询中~",
+          type: "warning",
+        });
+        getByErbanNo({
+          erbanNo: than.editObj.userId,
+        }).then((res) => {
+          if (res.code == 200) {
+            than.editObj.nick = res.data.nick;
+            than.editObj.region = res.data.partitionName;
+            than.editObj.time = res.data.createTime;
+            than.editObj.uid = res.data.uid;
+            ElMessage({
+              showClose: true,
+              message: "查询成功",
+              type: "success",
+            });
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }, 1000);
+    },
+    // 赠送按钮
+    editDialogClick() {
+      vipSendSend({
+        uid: this.editObj.uid,
+        vipLevel: this.editObj.value,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+          this.editDialog = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>