新增信誉值

src/api/boom/boom.js

@@ -0,0 +1,166 @@
+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 pageOperateRecord = query => {
+    return request({
+        url: '/admin/guild/manage/pageOperateRecord',
+        method: 'get',
+        params: query
+    });
+};
+// 查询公会信息
+export const pageFamily = query => {
+    return request({
+        url: '/admin/guild/manage/pageGuild',
+        method: 'get',
+        params: query
+    });
+};
+// 公会成员信息
+export const pageFamilyMember = query => {
+    return request({
+        url: '/admin/family/manage/pageFamilyMember',
+        method: 'get',
+        params: query
+    });
+};
+// 创建公会信息
+export const create = query => {
+    return request({
+        url: '/admin/guild/manage/create',
+        method: 'post',
+        params: query
+    });
+};
+// 删除公会信息
+export const dismiss = query => {
+    return request({
+        url: '/admin/guild/manage/dismiss',
+        method: 'post',
+        params: query
+    });
+};
+// 幸运礼物详情导出 
+export const luckyGiftRewardRecordExport = query => {
+    window.location.href = `/admin/luckyGiftRewardRecord/export?${genQueryParam(query)}`;
+    return;
+};
+// 公会信息编辑接口
+export const update = query => {
+    return request({
+        url: '/admin/guild/manage/update',
+        method: 'post',
+        params: query
+    });
+};
+// 导出-公会信息
+export const exportInfo = query => {
+    window.location.href = `/admin/guild/manage/exportGuild?${genQueryParam(query)}`;
+    return;
+};
+// 成员信息-弹窗详情
+export const manageListFamilyMember = query => {
+    return request({
+        url: '/admin/guild/manage/listGuildMember',
+        method: 'get',
+        params: query
+    });
+};
+
+// 成员信息-新增成员
+export const addMember = query => {
+    return request({
+        url: '/admin/guild/manage/addMember',
+        method: 'post',
+        params: query
+    });
+};
+// 成员信息-设置管理员
+export const setManager = query => {
+    return request({
+        url: '/admin/guild/manage/setManager',
+        method: 'post',
+        params: query
+    });
+};
+// 成员信息-删除管理员
+export const removeMember = query => {
+    return request({
+        url: '/admin/guild/manage/removeMember',
+        method: 'post',
+        params: query
+    });
+};
+// ========================================================Boom活动等级配置================================================
+// Boom活动等级配置-列表
+export const levelList = query => {
+    return request({
+        url: '/room/boom/level/list',
+        method: 'get',
+        params: query
+    });
+};
+// Boom活动等级配置-弹窗列表详情
+export const awardList = query => {
+    return request({
+        url: '/room/boom/level/award/list',
+        method: 'get',
+        params: query
+    });
+};
+// Boom活动等级配置-弹窗列表删除详情
+export const awardDel = query => {
+    return request({
+        url: '/room/boom/level/award/del',
+        method: 'get',
+        params: query
+    });
+};
+// Boom活动等级配置-编辑
+export const levelUpdate = query => {
+    return request({
+        url: '/room/boom/level/update',
+        method: 'put',
+        data: query
+    });
+};
+// Boom活动等级配置-弹窗编辑
+export const awardUpdate = query => {
+    return request({
+        url: '/room/boom/level/award/update',
+        method: 'put',
+        data: query
+    });
+};
+// ========================================================Boom数据后台================================================
+// Boom活动等级配置-数据后台列表
+export const recordList = query => {
+    return request({
+        url: '/room/boom/award/record/list',
+        method: 'get',
+        params: query
+    });
+};
+// Boom活动等级配置-数据后台明细列表
+export const detailList = query => {
+    return request({
+        url: '/room/boom/award/record/detail/list',
+        method: 'get',
+        params: query
+    });
+};
+// 导出-Boom活动等级配置
+export const recordExport = query => {
+    window.location.href = `/room/boom/award/record/export?${genQueryParam(query)}`;
+    return;
+};

src/api/luckGift/luckGift.js

@@ -2,6 +2,15 @@ import request from '@/utils/request';
 import { genQueryParam } from '@/utils/maintainer';
 import qs from 'qs';
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 奖池拉框
 export const listType = query => {
     return request({

src/api/nobleman/nobleman.js

@@ -260,4 +260,22 @@ export const removeMember = query => {
         method: 'post',
         params: query
     });
+};
+
+// -审核列表
+export const guildApplyList = query => {
+    return request({
+        url: '/admin/guildApply/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// -审核操作
+export const guildApplyAudit = query => {
+    return request({
+        url: '/admin/guildApply/audit',
+        method: 'post',
+        params: query
+    });
 };

src/api/refund/refund.js

@@ -31,4 +31,18 @@ export const refundList = query => {
 export const refundExport = query => {
     window.location.href = `/admin/chargeRecord/refundExport?${genQueryParam(query)}`;
     return;
+};
+// ======================================金币钻石操作记录==================================
+// 列表
+export const goldcoinRecordAll = query => {
+    return request({
+        url: '/admin/goldcoin/recordAll',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const recordAllExport = query => {
+    window.location.href = `/admin/goldcoin/recordAllExport?${genQueryParam(query)}`;
+    return;
 };

src/api/relAgency/relAgency.js

@@ -13,6 +13,12 @@ export const listPartitionInfo = query => {
     });
 };
 
+//  充值代理列表导出
+export const chargeAgentExport = query => {
+    window.location.href = `/anchorSalaryBill/chargeAgent/export?${genQueryParam(query)}`;
+    return;
+};
+
 // 获取 周期列表
 export const getDateCycleList = query => { 
     return request({

src/views/boom/levelSet.vue

@@ -0,0 +1,982 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>分区</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 but" type="primary" @click="getData()"
+      >查询</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="levelName" align="center" label="Boom等级" />
+      <el-table-column prop="goldNum" align="center" label="金币任务数" />
+      <el-table-column prop="countDownVapUrl" align="center" label="Boom等级图">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.pic"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.pic]"
+            fit="contain"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="x" align="center" label="Boom倒计时">
+        <template v-slot="scope">
+          <video
+            :key="scope.row.countDownVapUrl"
+            width="320"
+            height="240"
+            controls="controls"
+          >
+            <source :src="scope.row.countDownVapUrl" type="video/mp4" /></video
+        ></template>
+      </el-table-column>
+      <el-table-column prop="x" align="center" label="Boon"
+        ><template v-slot="scope">
+          <video
+            :key="scope.row.endVapUrl"
+            width="320"
+            height="240"
+            controls="controls"
+          >
+            <source :src="scope.row.endVapUrl" type="video/mp4" /></video
+        ></template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="
+              eidObj.level = scope.row.level;
+              eidObj.goldNum = scope.row.goldNum;
+              eidObj.imageUrl1 = scope.row.pic;
+              eidObj.imageUrl2 = scope.row.countDownVapUrl;
+              eidObj.imageUrl3 = scope.row.endVapUrl;
+              id = scope.row.id;
+              eidDialogBox = true;
+            "
+            type="text"
+            size="default"
+            >编辑</el-button
+          >
+          <el-button
+            @click="
+              member.level = scope.row.level;
+              member.goldNum = scope.row.goldNum;
+              seeList(scope.row);
+            "
+            type="text"
+            size="default"
+            >查看明细</el-button
+          >
+          <el-button
+            @click="
+              member.level = scope.row.level;
+              member.goldNum = scope.row.goldNum;
+              id = scope.row.level;
+              eidList(scope.row);
+            "
+            type="text"
+            size="default"
+            >编辑明细</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 等级奖励配置（查看） -->
+    <el-dialog v-model="memberDialog" title="等级奖励配置（查看）" center>
+      <div class="inquire">
+        <span>Boom等级：{{ member.level }}</span>
+      </div>
+      <div class="inquire">
+        <span>金币任务数量：{{ member.goldNum }}</span>
+      </div>
+      <!-- 内嵌表格 -->
+      <el-table
+        :data="member.tableData"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="seq" align="center" label="排序" />
+        <el-table-column prop="x" align="center" label="奖品类型">
+          <template v-slot="scope">
+            {{
+              scope.row.awardType == 8
+                ? "金币"
+                : scope.row.awardType == 6
+                ? "礼物"
+                : scope.row.awardType == 5
+                ? "座驾"
+                : scope.row.awardType == 1
+                ? "头饰"
+                : scope.row.awardType == 3
+                ? "气泡"
+                : scope.row.awardType == 10
+                ? "VIP"
+                : scope.row.awardType == 11
+                ? "勋章"
+                : "铭牌"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardNum" align="center" label="奖品天数" />
+        <el-table-column prop="type" align="center" label="用户身份">
+          <template v-slot="scope">
+            {{ scope.row.type == 1 ? "固定身份" : "随机身份" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="awardId"
+          align="center"
+          label="奖品ID/VIP等级1"
+        />
+        <el-table-column prop="isShow" align="center" label="是否展示">
+          <template v-slot="scope">
+            {{ scope.row.isShow == 1 ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardStock" align="center" label="奖品库存" />
+        <el-table-column prop="awardPic" align="center" label="奖励图片">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.awardPic"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.awardPic]"
+            fit="contain"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </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="eidDialog" title="等级奖励配置（编辑）" center>
+      <div class="inquire">
+        <span>Boom等级：{{ member.level }}</span>
+      </div>
+      <div class="inquire">
+        <span>金币任务数量：{{ member.goldNum }}</span>
+      </div>
+      <!-- 内嵌表格 -->
+      <el-table
+        :data="eid.tableData"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="seq" align="center" label="排序" />
+        <el-table-column prop="x" align="center" label="奖品类型">
+          <template v-slot="scope">
+            {{
+              scope.row.awardType == 8
+                ? "金币"
+                : scope.row.awardType == 6
+                ? "礼物"
+                : scope.row.awardType == 5
+                ? "座驾"
+                : scope.row.awardType == 1
+                ? "头饰"
+                : scope.row.awardType == 3
+                ? "气泡"
+                : scope.row.awardType == 10
+                ? "VIP"
+                : scope.row.awardType == 11
+                ? "勋章"
+                : "铭牌"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardNum" align="center" label="奖品天数" />
+        <el-table-column prop="type" align="center" label="用户身份">
+          <template v-slot="scope">
+            {{ scope.row.type == 1 ? "固定身份" : "随机身份" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardId" align="center" label="奖品ID/VIP等级" />
+        <el-table-column prop="awardPic" align="center" label="奖励图片">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.awardPic"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.awardPic]"
+            fit="contain"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+        <el-table-column prop="isShow" align="center" label="是否展示">
+          <template v-slot="scope">
+            {{ scope.row.isShow == 1 ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardStock" align="center" label="奖品库存" />
+        <el-table-column prop="x" align="center" label="操作">
+          <template v-slot="scope">
+            <el-button @click="editFun(scope.row)" type="text" size="default"
+              >编辑</el-button
+            >
+            <el-button @click="delFun(scope.row)" type="text" size="default"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="addDialog = true">
+            增加一条
+          </el-button>
+          <el-button type="primary" @click="eidDialog = false">
+            关闭
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 增加一条弹窗 -->
+    <el-dialog
+      v-model="addDialog"
+      title="等级奖励配置（新增）"
+      class="addBox"
+      center
+      width="26%"
+    >
+      <div class="inquire">
+        <span>奖品类型：</span>
+        <el-select filterable v-model="addObj.giftVal" placeholder="请选择">
+          <el-option
+            v-for="item in addObj.giftType"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>用户身份：</span>
+        <el-select filterable v-model="addObj.type" placeholder="请选择">
+          <el-option
+            v-for="item in addObj.typeArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>奖品ID/VIP等级:</span>
+        <el-input
+          v-model="addObj.giftId"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>奖励数量/天数：</span>
+        <el-input
+          v-model="addObj.giftNum"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>库存：</span>
+        <el-input
+          v-model="addObj.awardStock"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>顺序:</span>
+        <el-input v-model="addObj.sNo" placeholder="" class="input"></el-input>
+      </div>
+      <div class="inquire">
+        <span>是否展示：</span>
+        <el-select filterable v-model="addObj.showVal" placeholder="请选择">
+          <el-option
+            v-for="item in addObj.show"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>奖励图片：</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess4"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="addObj.imageUrl" :src="addObj.imageUrl" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="addFun()"> 保存 </el-button>
+          <el-button type="primary" @click="addDialog = false">
+            取消
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 编辑弹窗 -->
+    <el-dialog
+      v-model="editDialog"
+      title="等级奖励配置（编辑）"
+      class="addBox"
+      center
+      width="26%"
+    >
+      <div class="inquire">
+        <span>奖品类型：</span>
+        <el-select filterable v-model="editObj.giftVal" placeholder="请选择">
+          <el-option
+            v-for="item in editObj.giftType"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>用户身份：</span>
+        <el-select filterable v-model="editObj.type" placeholder="请选择">
+          <el-option
+            v-for="item in editObj.typeArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>奖品ID/VIP等级:</span>
+        <el-input
+          v-model="editObj.giftId"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>奖励数量/天数：</span>
+        <el-input
+          v-model="editObj.giftNum"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>库存：</span>
+        <el-input
+          v-model="editObj.awardStock"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>顺序:</span>
+        <el-input v-model="editObj.sNo" placeholder="" class="input"></el-input>
+      </div>
+      <div class="inquire">
+        <span>是否展示：</span>
+        <el-select filterable v-model="editObj.showVal" placeholder="请选择">
+          <el-option
+            v-for="item in editObj.show"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>奖励图片：</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess5"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="editObj.imageUrl" :src="editObj.imageUrl" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="editSaveFun()"> 保存 </el-button>
+          <el-button type="primary" @click="editDialog = false">
+            取消
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 编辑弹窗 -->
+    <el-dialog
+      v-model="eidDialogBox"
+      title="编辑"
+      class="addBox"
+      center
+      width="26%"
+    >
+      <div class="inquire">
+        <span>BOOM等级：</span>
+        <el-input
+          v-model="eidObj.level"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span>金币任务数：</span>
+        <el-input
+          v-model="eidObj.goldNum"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="inquire">
+        <span style="float: left">等级图：</span>
+        <el-upload
+          style="float: left"
+          class="avatar-uploader input"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess1"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="eidObj.imageUrl1" :src="eidObj.imageUrl1" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
+        </el-upload>
+      </div>
+      <div class="inquire">
+        <span style="float: left">倒计时：</span>
+        <el-upload
+          style="float: left; width: 200px; height: 150px"
+          class="avatar-uploader input"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess2"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <video
+            v-if="eidObj.imageUrl2"
+            :key="eidObj.imageUrl2"
+            autoplay
+            width="320"
+            height="240"
+            controls="controls"
+          >
+            <source :src="eidObj.imageUrl2" type="video/mp4" />
+          </video>
+        </el-upload>
+      </div>
+      <div class="inquire">
+        <span style="float: left">Boom：</span>
+        <el-upload
+          style="float: left; width: 200px; height: 150px"
+          class="avatar-uploader input"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess3"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <video
+            v-if="eidObj.imageUrl3"
+            :key="eidObj.imageUrl3"
+            autoplay
+            width="320"
+            height="240"
+            controls="controls"
+          >
+            <source :src="eidObj.imageUrl3" type="video/mp4" />
+          </video>
+        </el-upload>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="levelUpdateFun()"> 保存 </el-button>
+          <el-button type="primary" @click="eidDialogBox = false">
+            取消
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  levelList,
+  levelUpdate,
+  awardList,
+  awardUpdate,
+  awardDel,
+} from "@/api/boom/boom";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "levelSet",
+  data() {
+    return {
+      id: "",
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: 2,
+        options: [],
+      },
+      // 表格
+      tableData: [],
+      // 内嵌表格查看
+      memberDialog: false,
+      member: {
+        level: "",
+        goldNum: "",
+        tableData: [],
+      },
+      // 内嵌表格编辑
+      eidDialog: false,
+      eid: {
+        tableData: [],
+      },
+      //   编辑弹窗
+      editDialog: false,
+      editObj: {
+        imageUrl: "",
+        giftVal: 8,
+        giftType: [
+          { desc: "金币", value: 8 },
+          { desc: "礼物", value: 6 },
+          { desc: "座驾", value: 5 },
+          { desc: "头饰", value: 1 },
+          { desc: "气泡", value: 3 },
+          { desc: "VIP", value: 10 },
+          { desc: "勋章", value: 11 },
+          { desc: "铭牌", value: 2 },
+        ],
+        type: "",
+        typeArr: [
+          { desc: "固定身份", value: 1 },
+          { desc: "随机身份", value: 2 },
+        ],
+        giftId: "",
+        giftNum: "",
+        awardStock: "",
+        sNo: "",
+        showVal: "",
+        id: "",
+        show: [
+          { desc: "是", value: 1 },
+          { desc: "否", value: 0 },
+        ],
+      },
+      //   新增弹窗
+      addDialog: false,
+      addObj: {
+        imageUrl: "",
+        giftVal: 8,
+        giftType: [
+          { desc: "金币", value: 8 },
+          { desc: "礼物", value: 6 },
+          { desc: "座驾", value: 5 },
+          { desc: "头饰", value: 1 },
+          { desc: "气泡", value: 3 },
+          { desc: "VIP", value: 10 },
+          { desc: "勋章", value: 11 },
+          { desc: "铭牌", value: 2 },
+        ],
+        type: "",
+        typeArr: [
+          { desc: "固定身份", value: 1 },
+          { desc: "随机身份", value: 2 },
+        ],
+        giftId: "",
+        giftNum: "",
+        awardStock: "",
+        sNo: "",
+        showVal: "",
+        show: [
+          { desc: "是", value: 1 },
+          { desc: "否", value: 0 },
+        ],
+      },
+      //编辑
+      eidDialogBox: false,
+      eidObj: {
+        level: "",
+        goldNum: "",
+        imageUrl1: "",
+        imageUrl2: "",
+        imageUrl3: "",
+      },
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 5, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.partitionId = res.data[0].id;
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      levelList({
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {
+        if (res.code == 200) {
+          // this.total = res.data.total;
+          // this.tableData = res.data.records;
+          this.tableData = res.data;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 编辑弹窗
+    editFun(val) {
+      this.editObj.giftVal = val.awardType;
+      this.editObj.giftNum = val.awardNum;
+      this.editObj.giftId = val.awardId;
+      this.editObj.awardStock = val.awardStock;
+      this.editObj.sNo = val.seq;
+      this.editObj.showVal = val.isShow;
+      this.editObj.type = val.type;
+      this.editObj.imageUrl = val.awardPic;
+      this.editObj.id = val.id;
+      this.editDialog = true;
+    },
+    // 确认编辑弹窗
+    editSaveFun() {
+      var level = this.id;
+      var obj = {
+        awardType: this.editObj.giftVal,
+        awardNum: this.editObj.giftNum,
+        awardId: this.editObj.giftId,
+        awardStock: this.editObj.awardStock,
+        seq: this.editObj.sNo,
+        isShow: this.editObj.showVal,
+        type: this.editObj.type,
+        awardPic: this.editObj.imageUrl,
+        id: this.editObj.id,
+        partitionId: this.inquire.partitionId,
+        level,
+      };
+      awardUpdate(obj).then((res) => {
+        if (res.code == 200) {
+          this.editDialog = false;
+          awardList({
+            level,
+            partitionId: this.inquire.partitionId,
+          }).then((res) => {
+            this.eid.tableData = res.data;
+            ElMessage({
+              showClose: true,
+              message: "成功",
+              type: "success",
+            });
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 新增
+    addFun() {
+      var level = this.id;
+      var obj = {
+        awardType: this.addObj.giftVal,
+        awardNum: this.addObj.giftNum,
+        awardId: this.addObj.giftId,
+        awardStock: this.addObj.awardStock,
+        seq: this.addObj.sNo,
+        isShow: this.addObj.showVal,
+        type: this.addObj.type,
+        awardPic: this.addObj.imageUrl,
+        partitionId: this.inquire.partitionId,
+        level,
+      };
+      awardUpdate(obj).then((res) => {
+        if (res.code == 200) {
+          this.addDialog = false;
+          awardList({
+            level,
+            partitionId: this.inquire.partitionId,
+          }).then((res) => {
+            this.eid.tableData = res.data;
+            ElMessage({
+              showClose: true,
+              message: "成功",
+              type: "success",
+            });
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 删除
+    delFun(val) {
+      var level = this.id;
+      awardDel({
+        id: val.id,
+      }).then((res) => {
+        if (res.code == 200) {
+          awardList({
+            level,
+            partitionId: this.inquire.partitionId,
+          }).then((res) => {
+            this.eid.tableData = res.data;
+            ElMessage({
+              showClose: true,
+              message: "成功",
+              type: "success",
+            });
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 查看明细
+    seeList(val) {
+      awardList({
+        level: val.level,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {
+        this.memberDialog = true;
+        this.member.tableData = res.data;
+      });
+    },
+    eidList(val) {
+      awardList({
+        level: val.level,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {
+        this.eidDialog = true;
+        this.eid.tableData = res.data;
+      });
+    },
+    // 编辑列表
+    levelUpdateFun() {
+      var obj = {
+        id: this.id,
+        level: this.eidObj.level,
+        goldNum: this.eidObj.goldNum,
+        pic: this.eidObj.imageUrl1,
+        countDownVapUrl: this.eidObj.imageUrl2,
+        endVapUrl: this.eidObj.imageUrl3,
+        partition: this.inquire.partitionId,
+      };
+      levelUpdate(obj).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "编辑成功！",
+            type: "success",
+          });
+          this.eidDialogBox = false;
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.success,
+            type: "error",
+          });
+        }
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中,可能较慢，请等待上穿成功的提示在操作下一步~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess1(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl = URL.createObjectURL();
+      this.eidObj.imageUrl1 = res.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl = URL.createObjectURL();
+      this.eidObj.imageUrl2 = res.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess3(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl = URL.createObjectURL();
+      this.eidObj.imageUrl3 = res.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess4(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl = URL.createObjectURL();
+      this.addObj.imageUrl = res.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess5(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl = URL.createObjectURL();
+      this.editObj.imageUrl = res.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;
+    margin-bottom: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.addBox {
+  .el-dialog__body {
+    .inquire {
+      span {
+        margin-right: 10px;
+        width: 113px;
+        display: inline-block;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+}
+</style>

src/views/boom/recordData.vue

@@ -0,0 +1,414 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>分区</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>
+    <div class="inquire">
+      <span>房间ID:</span>
+      <el-input
+        v-model="inquire.roomId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>BOOM等级:</span>
+      <el-input
+        v-model="inquire.boomLevel"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>触发者ID：</span>
+      <el-input
+        v-model="inquire.triggererId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">开始时间</span>
+        <el-date-picker
+          v-model="inquire.time[0]"
+          type="datetime"
+          placeholder="开始时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">结束时间</span>
+        <el-date-picker
+          v-model="inquire.time[1]"
+          type="datetime"
+          placeholder="结束时间"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+
+    <!-- 查询按钮 -->
+    <el-button class="primary but" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = inquire.options[0].id;
+        inquire.roomId = '';
+        inquire.boomLevel = '';
+        inquire.triggererId = '';
+        inquire.time = [];
+        getData();
+      "
+      >重置查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="diamondStatisticsExportFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="cycleDate" align="center" label="日期" />
+      <el-table-column prop="roomErbanNo" align="center" label="房间ID" />
+      <el-table-column prop="level" align="center" label="Boom等级" />
+      <el-table-column prop="erbanNo" align="center" label="触发者ID" />
+      <el-table-column prop="drawTime" align="center" label="触发时间" />
+      <el-table-column prop="num" align="center" label="参与用户数" />
+      <el-table-column prop="awardNum" align="center" label="发放奖励数" />
+      <el-table-column prop="ownerGold" align="center" label="获得金币数" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="
+              memberVal = scope.row;
+              detailListFun();
+            "
+            type="text"
+            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-loading="loading2"
+      v-model="memberDialog"
+      title="贡献或获奖明细"
+      center
+    >
+      <!-- 内嵌表格 -->
+      <el-table
+        :data="member.tableData"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column prop="roleType" align="center" label="角色">
+          <template v-slot="scope">
+            {{
+              scope.row.roleType == 1
+                ? "房主"
+                : scope.row.roleType == 2
+                ? "贡献榜1"
+                : scope.row.roleType == 3
+                ? "贡献榜2"
+                : scope.row.roleType == 4
+                ? "贡献榜3"
+                : scope.row.roleType == 5
+                ? "boom触发者"
+                : scope.row.roleType == 6
+                ? "房内普通用户"
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="erbanNo" align="center" label="用户ID" />
+        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="exper" align="center" label="贡献值" />
+        <el-table-column prop="level" align="center" label="Boom等级" />
+        <el-table-column prop="awardType" align="center" label="奖品类型">
+          <template v-slot="scope">
+            {{
+              scope.row.awardType == 8
+                ? "金币"
+                : scope.row.awardType == 6
+                ? "礼物"
+                : scope.row.awardType == 5
+                ? "座驾"
+                : scope.row.awardType == 1
+                ? "头饰"
+                : scope.row.awardType == 3
+                ? "气泡"
+                : scope.row.awardType == 10
+                ? "VIP"
+                : scope.row.awardType == 11
+                ? "勋章"
+                : "铭牌"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="awardName" align="center" label="获得奖励" />
+        <el-table-column prop="awardNum" align="center" label="获得奖励数" />
+        <el-table-column
+          prop="createTime"
+          align="center"
+          label="奖励发放时间"
+        />
+      </el-table>
+      <!-- 分页 -->
+      <el-pagination
+        style="margin-top: 10px"
+        class="paginationClass"
+        v-model:current-page="currentPage2"
+        v-model:page-size="pageSize2"
+        :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+        layout="sizes, prev, pager, next"
+        :total="total2"
+        @size-change="handleSizeChange2"
+        @current-change="handleCurrentChange2"
+      />
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="memberDialog = false">
+            关闭
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  recordList,
+  detailList,
+  recordExport,
+} from "@/api/boom/boom";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "recordData",
+  data() {
+    return {
+      loading: false,
+      loading2: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: 2,
+        options: [],
+        roomId: "",
+        boomLevel: "",
+        triggererId: "",
+        time: [],
+      },
+      // 表格
+      tableData: [],
+      // 内嵌表格
+      memberDialog: false,
+      memberVal: null,
+      member: {
+        tableData: [],
+      },
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      // 分页
+      total2: 0, //总页数
+      currentPage2: 1, //页码
+      pageSize2: 10, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.partitionId = res.data[0].id;
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+      recordList({
+        partitionId: this.inquire.partitionId,
+        erbanNo: this.inquire.triggererId,
+        level: this.inquire.boomLevel,
+        roomErbanNo: this.inquire.roomId,
+        startTime: startTime,
+        endTime: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 详细弹窗
+    detailListFun() {
+      this.loading2 = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+      detailList({
+        partitionId: this.inquire.partitionId,
+        signId: this.memberVal.signId,
+        level: this.memberVal.level,
+        startTime: startTime,
+        endTime: endTime,
+        pageNo: this.currentPage2,
+        pageSize: this.pageSize2,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total2 = res.data.total;
+          this.member.tableData = res.data.records;
+          this.memberDialog = true;
+          this.loading2 = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    diamondStatisticsExportFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss")
+          : "";
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss")
+          : "";
+      }
+      recordExport({
+        partitionId: this.inquire.partitionId,
+        erbanNo: this.inquire.triggererId,
+        level: this.inquire.boomLevel,
+        roomErbanNo: this.inquire.roomId,
+        startTime: startTime,
+        endTime: endTime,
+      }).then();
+    },
+    // 分页详情导航
+    handleSizeChange2() {
+      this.detailListFun();
+    },
+    handleCurrentChange2() {
+      this.detailListFun();
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/charge/ChargeRegionView.vue

@@ -11,19 +11,21 @@
         <div id="toolbar">
           <div class="col-sm-12">
             <label for="searchType"
-                   class="col-sm-4 control-label">地区:</label>
+                   class="col-sm-2 control-label">地区:</label>
-            <div class="col-sm-6">
+            <div class="col-sm-8">
               <select name="searchType"
                       id="searchType"
                       data-btn-class="btn-warning"
                       class="form-control">
               </select>
             </div>
+            <div class="col-sm-2">
+              <button id="btnSearch" class="btn btn-default">
+                <i class="glyphicon glyphicon-search"></i>查询
+              </button>
+            </div>
           </div>
-          <button id="btnSearch"
+
-                  class="btn btn-default">
-            <i class="glyphicon glyphicon-search"></i>查询
-          </button>
         </div>
       </div>
       <div class="box-body"
@@ -60,9 +62,6 @@
             <input type="hidden"
                    name="code"
                    id="code" />
-            <input type="hidden"
-                   name="currency"
-                   id="currency" />
             <input type="hidden"
                    name="type"
                    id="type" />
@@ -76,9 +75,19 @@
                        id="name">
               </div>
             </div>
+            <div class="form-group">
+              <label for="currency"
+                     class="col-sm-3 control-label">货币：</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       readonly
+                       class="form-control"
+                       id="currency">
+              </div>
+            </div>
             <div class="form-group">
               <label for="rate"
-                     class="col-sm-3 control-label">USD汇率：</label>
+                     class="col-sm-3 control-label">兑USD汇率：</label>
               <div class="col-sm-9">
                 <input type="text"
                        class="form-control"
@@ -324,9 +333,10 @@ export default {
         $('#regionTable').bootstrapTable({
           columns: [
             { field: 'name', title: '地区', align: 'center', width: '5%' },
+            { field: 'currency', title: '货币', align: 'center', width: '5%'},
             {
               field: 'rate',
-              title: 'USD汇率',
+              title: '兑USD汇率',
               align: 'center',
               width: '5%',
               formatter: function (val, row, index) {
@@ -430,7 +440,7 @@ export default {
                 return '<img src="' + val + '" style="width:90px;height:90px;" alt="">'
               }
             },
-            { field: 'regionName', title: '地区', align: 'center', width: '5%' },
+            { field: 'currency', title: '货币', align: 'center', width: '5%' },
             {
               field: 'isEnabled',
               title: '是否展示在充值H5',
@@ -823,7 +833,7 @@ export default {
           var $select = $('#searchType');
           for (let i = 0; i < array.length; i++) {
             var $option = $('<option value="' + array[i].type + '" />');
-            $option.html(array[i].name);
+            $option.html(array[i].desc + '(' + array[i].name + ')');
             if (i == 0) {
               $option.attr('selected', true);
             }

src/views/dressShop/DressShopAdminView.vue

@@ -171,7 +171,7 @@
               >
               <div class="col-sm-9">
                 <select name="dressType" id="vipLimit">
-                  <option value="">无限制</option>
+                  <option value="0">无限制</option>
                   <option value="1">VIP1</option>
                   <option value="2">VIP2</option>
                   <option value="3">VIP3</option>

src/views/firstpage/FirstPageActivityBannerView.vue

@@ -108,7 +108,7 @@
                             </select>
                             <div class="col-sm-6">
                                 <input type="text" class="form-control validate[required]" name="skipUri"
-                                    id="skipUrlContent">
+                                    id="skipUrlContent" oninput="this.value = this.value.replace(/[\u4e00-\u9fa5]/g, '')">
                             </div>
                         </div>
                         <div class="form-group">
@@ -269,7 +269,7 @@
                             </select>
                             <div class="col-sm-6">
                                 <input type="text" class="form-control validate[required]" name="skipUri"
-                                    id="addSkipUrlContent">
+                                    id="addSkipUrlContent" oninput="this.value = this.value.replace(/[\u4e00-\u9fa5]/g, '')">
                             </div>
                         </div>
                         <div class="form-group">

src/views/gamemanage/GameManageBannerView.vue

@@ -83,7 +83,7 @@
                             </select>
                             <div class="col-sm-6">
                                 <input type="text" class="form-control validate[required]" name="skipUri"
-                                    id="skipUrlContent">
+                                    id="skipUrlContent" oninput="this.value = this.value.replace(/[\u4e00-\u9fa5]/g, '')">
                             </div>
                         </div>
                         <div class="form-group">
@@ -238,7 +238,7 @@
                             </select>
                             <div class="col-sm-6">
                                 <input type="text" class="form-control validate[required]" name="skipUri"
-                                    id="addSkipUrlContent">
+                                    id="addSkipUrlContent" oninput="this.value = this.value.replace(/[\u4e00-\u9fa5]/g, '')">
                             </div>
                         </div>
                         <div class="form-group">

src/views/guildOperationManagement/agentSendSalary.vue

@@ -54,6 +54,9 @@
             <el-form-item label-width="40px">
               <el-button type="primary" @click="handSearch">搜索</el-button>
               <el-button plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button type="primary" @click="chargeAgentExportFun"
+                >导出</el-button
+              >
             </el-form-item>
           </div>
         </el-form>
@@ -127,6 +130,7 @@ import {
   chargeAgentList,
   chargeAgentSum,
   listPartitionInfo,
+  chargeAgentExport,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -192,7 +196,7 @@ export default {
     // this.getData();
     listPartitionInfo().then((res) => {
       this.partitionArr = res.data;
-      this.searchForm.partitionId=this.partitionArr[0].id;
+      this.searchForm.partitionId = this.partitionArr[0].id;
     });
   },
   methods: {
@@ -246,6 +250,32 @@ export default {
         }
       });
     },
+    // 导出
+    chargeAgentExportFun() {
+
+      let { pageParams, searchForm } = this;
+      console.log(searchForm);
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          !searchForm[item] ||
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+      console.log(pageParams);
+
+      chargeAgentExport(pageParams).then((res) => {});
+    },
     // 点击搜索
     handSearch() {
       this.$refs["searchForm"].validate((valid) => {
@@ -270,7 +300,7 @@ export default {
     },
     handlePageChange(val) {
       // this.$set(this.pageParams, 'pageNo', val);
-      this.pageParams.pageSize = val;
+      this.pageParams.pageNo = val;
       this.getData();
     },
     headerCopy(column, e) {

src/views/guildOperationManagement/guildInfo.vue

@@ -115,6 +115,38 @@
         </template>
       </el-table-column>
       <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
         <template v-slot="scope">
           <el-button

src/views/infocard/InfocardManageView.vue

@@ -503,7 +503,7 @@ export default {
                 if (val === 0) {
                   return "图片";
                 } else if (val === 1) {
-                  return "无效MP4";
+                  return "MP4";
                 } else {
                   return "-";
                 }

src/views/luckGift/luckGiftData.vue

@@ -12,9 +12,9 @@
         >
           <el-option
             v-for="item in inquire.options"
-            :key="item.type"
+            :key="item.id"
-            :label="item.name"
+            :label="item.desc"
-            :value="item.type"
+            :value="item.id"
           >
           </el-option>
         </el-select>
@@ -139,7 +139,7 @@
   </div>
 </template>
 <script>
-import { personal, updateUserMulti } from "@/api/luckGift/luckGift";
+import { personal, updateUserMulti,listPartitionInfo } from "@/api/luckGift/luckGift";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -157,25 +157,8 @@ export default {
       inquire: {
         userId: "",
         time: "",
-        value: 2,
+        value: "",
-        options: [
+        options: [],
-          {
-            name: "阿拉伯区",
-            type: 2,
-          },
-          {
-            name: "英语区",
-            type: 1,
-          },
-          {
-            name: "华语区",
-            type: 4,
-          },
-          {
-            type: 8,
-            name: "土耳其区",
-          },
-        ],
       },
       // 表格
       tableData: [],
@@ -189,6 +172,10 @@ export default {
     };
   },
   created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.value = this.inquire.options[0].id;
+    });
     // this.getData();
   },
   methods: {

src/views/luckGift/luckGiftDataAll.vue

@@ -7,9 +7,9 @@
         <el-select v-model="inquire.value" placeholder="请选择">
           <el-option
             v-for="item in inquire.options"
-            :key="item.value"
+            :key="item.id"
-            :label="item.label"
+            :label="item.desc"
-            :value="item.value"
+            :value="item.id"
           >
           </el-option>
         </el-select>
@@ -54,7 +54,7 @@
   </div>
 </template>
 <script>
-import { platform } from "@/api/luckGift/luckGift";
+import { platform,listPartitionInfo } from "@/api/luckGift/luckGift";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -70,25 +70,8 @@ export default {
       totalProductionRatio: "0",
       //查询所需条件对象
       inquire: {
-        value: 2,
+        value: "",
-        options: [
+        options: [],
-          {
-            value: 2,
-            label: "阿拉伯区",
-          },
-          {
-            value: 1,
-            label: "英语区",
-          },
-          {
-            value: 4,
-            label: "华语区",
-          },
-          {
-            value: 8,
-            label: "土耳其区",
-          },
-        ],
         time: "",
       },
       // 表格
@@ -100,6 +83,10 @@ export default {
     };
   },
   created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.value = this.inquire.options[0].id;
+    });
     // this.getData();
   },
   methods: {

src/views/nobleman/GuildInfo.vue

@@ -133,6 +133,38 @@
       </el-table-column>
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
+       <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
 
       <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">

src/views/nobleman/newGuildApplication.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>分区</span>
+      <el-select v-model="inquire.partitionId" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.partitionArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.statusArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="addDialog = true"
+      >重置搜索</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="序号" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="erbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="nick" align="center" label="公会长昵称" />
+      <el-table-column align="center" prop="giftInfo" label="公会长头像">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.avatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.avatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column align="center" prop="giftInfo" label="公会头像">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.guildAvatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.guildAvatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="applyTime" align="center" label="申请时间" />
+      <el-table-column prop="auditStatus" align="center" label="状态">
+        <template v-slot="scope">
+          {{
+            scope.row.auditStatus == 0
+              ? "未审核"
+              : scope.row.auditStatus == 1
+              ? "已通过"
+              : "拒绝"
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button
+            v-show="scope.row.auditStatus == 0"
+            @click="agree(scope.row.id)"
+            type="text"
+            size="default"
+            >同意</el-button
+          >
+          <el-button
+            v-show="scope.row.auditStatus == 0"
+            @click="refuse(scope.row.id)"
+            type="text"
+            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="delClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  guildApplyList,
+  guildApplyAudit,
+} from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "newGuildApplication",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: "",
+        partitionArr: [],
+        userId: "",
+        status: -1,
+        statusArr: [
+          { desc: "未审核", id: 0 },
+          { desc: "全部", id: -1 },
+          { desc: "通过", id: 1 },
+          { desc: "已拒绝", id: 2 },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      console.log(res.data);
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+  },
+  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");
+      }
+      guildApplyList({
+        partitionId: this.inquire.partitionId,
+        erbanNo: this.inquire.userId,
+        auditStatus: this.inquire.status,
+        startDate: startTime,
+        endDate: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    agree(id) {
+      guildApplyAudit({
+        auditStatus: 1,
+        id,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    refuse(id) {
+      guildApplyAudit({
+        auditStatus: 2,
+        id,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      this.ediObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      this.ediObj.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;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/privilege/personalHomepageResourceManagement.vue

@@ -64,6 +64,7 @@
       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">
           {{ partitionDesc(scope.row.partitionFlag) }}

src/views/recharge/RechargeUserView.vue

@@ -1,412 +1,517 @@
 <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>
-                <!-- .content -->
+        <!-- .content -->
-                <div id="table"></div>
+        <div id="table"></div>
-                <div id="toolbar">
+        <div id="toolbar">
-                    <div class="col-sm-12">
+          <div class="col-sm-12">
-                        <label for="searchValue" class="col-sm-3 control-label">Peko ID:</label>
+            <label for="searchValue" class="col-sm-3 control-label"
-                        <div class="col-sm-3"><input type="text" class="form-control" name="searchValue" id="searchValue">
+              >Peko ID:</label
-                        </div>
+            >
-                        <label for="searchType" class="col-sm-3 control-label">地区:</label>
+            <div class="col-sm-3">
-                        <div class="col-sm-3">
+              <input
-                            <select name="searchType" id="searchType" data-btn-class="btn-warning" class="form-control">
+                type="text"
-                                <option value="0" selected="selected">全部</option>
+                class="form-control"
-                            </select>
+                name="searchValue"
-                        </div>
+                id="searchValue"
-                    </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-sign"></i>新增
-                        </button>
-                    </div>
-                </div>
             </div>
-        </div>
+            <label for="searchType" class="col-sm-3 control-label">地区:</label>
-    </section>
+            <div class="col-sm-3">
-
+              <select
-    <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+                name="searchType"
-        <div class="modal-dialog" role="document">
+                id="searchType"
-            <div class="modal-content">
+                data-btn-class="btn-warning"
-                <div class="modal-header">
+                class="form-control"
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+              >
-                            aria-hidden="true">&times;</span>
+                <option value="0" selected="selected">全部</option>
-                    </button>
+              </select>
-                    <h4 class="modal-title" id="modalLabel">代充信息</h4>
-                </div>
-                <div class="modal-body">
-                    <form class="form-horizontal">
-                        <input type="hidden" name="id" id="id" />
-                        <div class="form-group">
-                            <label for="erbanNo" class="col-sm-3 control-label">Peko ID：</label>
-                            <div class="col-sm-9">
-                                <input type="text" class="form-control" id="erbanNo">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">代充地区</label>
-                        </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="save">确认</button>
-                </div>
             </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-sign"></i>新增
+            </button>
+          </div>
         </div>
+      </div>
     </div>
+  </section>
 
-    <div class="modal fade" id="tipModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+  <div
-        <div class="modal-dialog" role="document">
+    class="modal fade"
-            <div class="modal-content">
+    id="editModal"
-                <div class="modal-header">
+    tabindex="-1"
-                    <h4 class="modal-title">提示信息</h4>
+    role="dialog"
-                </div>
+    aria-labelledby="modalLabel"
-                <div class="modal-body" id="tipMsg"></div>
+  >
-            </div>
+    <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">
+            <input type="hidden" name="id" id="id" />
+            <div class="form-group">
+              <label for="erbanNo" class="col-sm-3 control-label"
+                >Peko ID：</label
+              >
+              <div class="col-sm-9">
+                <input type="text" class="form-control" id="erbanNo" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="starLevel" class="col-sm-3 control-label"
+                >幸运值:</label
+              >
+              <div class="col-sm-9">
+                <select name="starLevel" id="starLevel">
+                  <option value="">-- 请选择 --</option>
+                  <option value="1">1</option>
+                  <option value="2">2</option>
+                  <option value="3">3</option>
+                  <option value="4">4</option>
+                  <option value="5">5</option>
+                </select>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-3 control-label">代充地区</label>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">
+            取消
+          </button>
+          <button type="button" class="btn btn-primary" id="save">确认</button>
+        </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';
+import TableHelper from "@/utils/bootstrap-table-helper";
 
 var regionArray;
 export default {
-    name: "RechargeUserView",
+  name: "RechargeUserView",
-    setup() {
+  setup() {
-        //切换只读
+    //切换只读
-        function editSeqText(obj) {
+    function editSeqText(obj) {
-            if (!regionArray) {
+      if (!regionArray) {
-                return;
+        return;
-            }
+      }
-            var $input = $(obj);
+      var $input = $(obj);
-            const typeArray = $("input:checkbox[name='type']:checked").serializeArray();
+      const typeArray = $(
-            if (!typeArray) {
+        "input:checkbox[name='type']:checked"
-                return;
+      ).serializeArray();
-            }
+      if (!typeArray) {
-            for (let i = 0; i < regionArray.length; i++) {
+        return;
-                var region = regionArray[i];
+      }
-                var type = region.type;
+      for (let i = 0; i < regionArray.length; i++) {
-                var isCheck = false;
+        var region = regionArray[i];
-                for (let j = 0; j < typeArray.length; j++) {
+        var type = region.type;
-                    var value = typeArray[j].value;
+        var isCheck = false;
-                    if (type == value) {
+        for (let j = 0; j < typeArray.length; j++) {
-                        isCheck = true;
+          var value = typeArray[j].value;
-                        break;
+          if (type == value) {
-                    }
+            isCheck = true;
-                }
+            break;
-                var $seq = $('#seq' + type);
+          }
-                if (isCheck) {
-                    $seq.removeAttr('readonly');
-                } else {
-                    $seq.attr('readonly', 'true');
-                }
-            }
         }
-        window.editSeqText = editSeqText;
+        var $seq = $("#seq" + type);
-        return {
+        if (isCheck) {
-            editSeqText
+          $seq.removeAttr("readonly");
-        };
+        } else {
-    },
+          $seq.attr("readonly", "true");
-    created() {
+        }
-        this.$nextTick(function () {
+      }
-            this.initData();
+    }
+    window.editSeqText = editSeqText;
+    return {
+      editSeqText,
+    };
+  },
+  created() {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData() {
+      $(function () {
+        //地区
+        regionArray = chargeRegion();
+        $("#table").bootstrapTable("destroy");
+        $("#table").bootstrapTable({
+          columns: [
+            {
+              field: "erbanNo",
+              title: "Peko ID",
+              align: "center",
+              width: "5%",
+            },
+            { field: "nick", title: "昵称", align: "center", width: "5%" },
+            {
+              field: "starLevel",
+              title: "信誉值",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "createTime",
+              title: "首次加入代充时间",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "type",
+              title: "地区",
+              align: "center",
+              width: "5%",
+              formatter: function (val, row, index) {
+                var value = "";
+                if (regionArray) {
+                  for (var i = 0, len = regionArray.length; i < len; i++) {
+                    var region = regionArray[i];
+                    var name = region.name;
+                    var type = region.type;
+                    if ((val & type) != 0) {
+                      value += name;
+                      if (i != len - 1) {
+                        value += "<br>";
+                      }
+                    }
+                  }
+                }
+                return value;
+              },
+            },
+            {
+              field: "userRegions",
+              title: "排序",
+              align: "center",
+              width: "5%",
+              formatter: function (val, row, index) {
+                var value = "";
+                if (row.userRegions) {
+                  for (var i = 0, len = row.userRegions.length; i < len; i++) {
+                    var userRegion = row.userRegions[i];
+                    var name = userRegion.name;
+                    var seq = userRegion.seq;
+                    value += name + "：" + seq;
+                    if (i != len - 1) {
+                      value += "<br>";
+                    }
+                  }
+                }
+                return value;
+              },
+            },
+            {
+              field: "outDiamondNum",
+              title: "最近30天转出金币",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "id",
+              title: "操作",
+              align: "center",
+              width: "5%",
+              valign: "middle",
+              formatter: function (val, row, index) {
+                return (
+                  '<button class="btn btn-sm btn-default opt-edit" data-index="' +
+                  index +
+                  '">编辑</button>' +
+                  '<button class="btn btn-sm btn-default opt-del" 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,
+              erbanNo: $("#searchValue").val(),
+              regionType: $("#searchType").val(),
+              starLevel: $("#starLevel").val(),
+            };
+            return param;
+          },
+          toolbar: "#toolbar",
+          url: "/admin/recharge/user/page",
+          onLoadSuccess: function () {
+            //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {
+            //加载失败时执行
+            console.log("load fail");
+          },
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                //地区
-                regionArray = chargeRegion();
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'erbanNo', title: 'Peko ID', align: 'center', width: '5%' },
-                        { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                        { field: 'createTime', title: '首次加入代充时间', align: 'center', width: '5%' },
-                        {
-                            field: 'type',
-                            title: '地区',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                var value = '';
-                                if (regionArray) {
-                                    for (var i = 0, len = regionArray.length; i < len; i++) {
-                                        var region = regionArray[i];
-                                        var name = region.name;
-                                        var type = region.type;
-                                        if ((val & type) != 0) {
-                                            value += name;
-                                            if (i != len - 1) {
-                                                value += '<br>';
-                                            }
-                                        }
-                                    }
-                                }
-                                return value;
-                            }
-                        },
-                        {
-                            field: 'userRegions',
-                            title: '排序',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                var value = '';
-                                if (row.userRegions) {
-                                    for (var i = 0, len = row.userRegions.length; i < len; i++) {
-                                        var userRegion = row.userRegions[i];
-                                        var name = userRegion.name;
-                                        var seq = userRegion.seq;
-                                        value += name + '：' + seq;
-                                        if (i != len - 1) {
-                                            value += '<br>';
-                                        }
-                                    }
-                                }
-                                return value;
-                            }
-                        },
-                        { field: 'outDiamondNum', title: '最近30天转出金币', align: 'center', width: '5%' },
-                        {
-                            field: 'id',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                return '<button class="btn btn-sm btn-default opt-edit" data-index="' + index + '">编辑</button>' + '<button class="btn btn-sm btn-default opt-del" 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,
-                            erbanNo: $('#searchValue').val(),
-                            regionType: $('#searchType').val()
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/recharge/user/page',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
-                //地区
+        //地区
-                function chargeRegion() {
+        function chargeRegion() {
-                    var array;
+          var array;
-                    $.ajax({
+          $.ajax({
-                        type: "get",
+            type: "get",
-                        url: "/admin/charge/region/list",
+            url: "/admin/charge/region/list",
-                        dataType: "json",
+            dataType: "json",
-                        async: false,
+            async: false,
-                        success: function (json) {
+            success: function (json) {
-                            if (json.success == 'true' || json.code == 200) {
+              if (json.success == "true" || json.code == 200) {
-                                array = json.data;
+                array = json.data;
-                            }
+              }
-                        }
+            },
-                    });
+          });
-                    var $select = $('#searchType');
+          var $select = $("#searchType");
-                    for (let i = 0; i < array.length; i++) {
+          for (let i = 0; i < array.length; i++) {
-                        var $option = $('<option value="' + array[i].type + '" />');
+            var $option = $('<option value="' + array[i].type + '" />');
-                        $option.html(array[i].name);
+            $option.html(array[i].name);
-                        $select.append($option);
+            $select.append($option);
-                    }
+          }
-                    return array;
+          return array;
-                }
-
-                //新增
-                $('#btnAdd').on('click', function () {
-                    $("#id").val('');
-                    $("#erbanNo").val('');
-                    showRegion();
-                    $("#editModal").modal('show');
-                });
-
-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
-
-                //展示地区
-                function showRegion() {
-                    if (!regionArray) {
-                        return;
-                    }
-                    var $form = $('#editModal .modal-body .form-horizontal');
-                    for (let i = 0, len = regionArray.length; i < len; i++) {
-                        $('#region' + i).remove();
-                        var region = regionArray[i];
-                        var name = region.name;
-                        var type = region.type;
-                        var $formGroup = $('<div/>');
-                        $formGroup.attr('id', 'region' + i);
-                        $formGroup.attr('class', 'form-group');
-                        var $label = $('<label/>');
-                        $label.attr('class', 'col-sm-3 control-label');
-                        $label.html('<input type="checkbox" name="type" value="' + type + '" onclick=\"editSeqText(this);\"/>&nbsp;' + name);
-                        $formGroup.append($label);
-                        var $div = $('<div/>');
-                        $div.attr('class', 'col-sm-9');
-                        $div.html('<input type="text" readonly class="form-control" id="seq' + type + '" value="0"/>');
-                        $formGroup.append($div);
-                        $form.append($formGroup);
-                    }
-                }
-
-                //保存
-                $("#save").click(function () {
-                    const msg = '确定要保存吗？';
-                    if (confirm(msg)) {
-                        var id = $('#id').val();
-                        const typeArray = $("input:checkbox[name='type']:checked").serializeArray();
-                        if (!typeArray) {
-                            $("#tipMsg").text("代充地区不能为空");
-                            $("#tipModal").modal('show');
-                            return;
-                        }
-                        var userRegionArray = [];
-                        for (let i = 0; i < regionArray.length; i++) {
-                            var region = regionArray[i];
-                            var name = region.name;
-                            var seq = 0;
-                            var isCheck = false;
-                            for (let j = 0; j < typeArray.length; j++) {
-                                console.log(typeArray[j]);
-                                if (typeArray[j] && region.type == typeArray[j].value) {
-                                    seq = $('#seq' + region.type).val();
-                                    isCheck = true;
-                                    break;
-                                }
-                            }
-                            var userRegion = {
-                                type: region.type,
-                                name: region.name,
-                                isCheck: isCheck,
-                                seq: seq
-                            };
-                            userRegionArray.push(userRegion);
-                        }
-                        var data = {
-                            erbanNo: $('#erbanNo').val(),
-                            userRegions: JSON.stringify(userRegionArray)
-                        };
-                        if (id) {
-                            data.id = id;
-                        }
-                        $.ajax({
-                            type: "post",
-                            url: "/admin/recharge/user/save",
-                            data: data,
-                            dataType: "json",
-                            success: function (json) {
-                                if (json.success == 'true' || json.code == 200) {
-                                    $("#tipMsg").text("保存成功");
-                                    $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#editModal").modal('hide');
-                                } else {
-                                    $("#tipMsg").text("保存失败." + json.message);
-                                    $("#tipModal").modal('show');
-                                    $("#editModal").modal('hide');
-                                }
-                            }
-                        });
-                    }
-                });
-
-                //编辑
-                $('#table').on('click', '.opt-edit', function () {
-                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
-                    showRegion();
-                    var id = currentData.id;
-                    var erbanNo = currentData.erbanNo;
-                    var userRegions = currentData.userRegions;
-                    $("#erbanNo").val(erbanNo);
-                    $("#id").val(id);
-                    if (regionArray) {
-                        for (let i = 0; i < regionArray.length; i++) {
-                            var region = regionArray[i];
-                            var seq = 0;
-                            var isCheck = false;
-                            for (let j = 0; j < userRegions.length; j++) {
-                                var userRegion = userRegions[j];
-                                if (region.type == userRegion.type) {
-                                    seq = userRegion.seq;
-                                    isCheck = true;
-                                    break;
-                                }
-                            }
-                            if (isCheck) {
-                                $('input:checkbox[value="' + region.type + '"]').prop('checked', true);
-                                $('#seq' + region.type).removeAttr('readonly');
-                                $('#seq' + region.type).val(seq);
-                            } else {
-                                $("input:checkbox[value='" + region.type + "']").prop('checked', false);
-                                $('#seq' + region.type).attr('readonly', 'true');
-                                $('#seq' + region.type).val(0);
-                            }
-                        }
-                    }
-                    $("#editModal").modal('show');
-                });
-
-                //删除
-                $('#table').on('click', '.opt-del', function () {
-                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
-                    var id = currentData.id;
-                    const msg = '确定要删除吗？';
-                    if (confirm(msg)) {
-                        $.ajax({
-                            type: "get",
-                            url: "/admin/recharge/user/del?id=" + id,
-                            dataType: "json",
-                            success: function (json) {
-                                if (json.success == 'true' || json.code == 200) {
-                                    $("#tipMsg").text("删除成功");
-                                    $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#editModal").modal('hide');
-                                } else {
-                                    $("#tipMsg").text("删除失败." + json.message);
-                                    $("#tipModal").modal('show');
-                                    $("#editModal").modal('hide');
-                                }
-                            }
-                        });
-                    }
-                });
-            });
         }
-    },
 
+        //新增
+        $("#btnAdd").on("click", function () {
+          $("#id").val("");
+          $("#erbanNo").val("");
+          $("#starLevel").val("");
+          showRegion();
+          $("#editModal").modal("show");
+        });
+
+        // 查询刷新
+        $("#btnSearch").on("click", function () {
+          TableHelper.doRefresh("#table");
+        });
+
+        //展示地区
+        function showRegion() {
+          if (!regionArray) {
+            return;
+          }
+          var $form = $("#editModal .modal-body .form-horizontal");
+          for (let i = 0, len = regionArray.length; i < len; i++) {
+            $("#region" + i).remove();
+            var region = regionArray[i];
+            var name = region.name;
+            var type = region.type;
+            var $formGroup = $("<div/>");
+            $formGroup.attr("id", "region" + i);
+            $formGroup.attr("class", "form-group");
+            var $label = $("<label/>");
+            $label.attr("class", "col-sm-3 control-label");
+            $label.html(
+              '<input type="checkbox" name="type" value="' +
+                type +
+                '" onclick="editSeqText(this);"/>&nbsp;' +
+                name
+            );
+            $formGroup.append($label);
+            var $div = $("<div/>");
+            $div.attr("class", "col-sm-9");
+            $div.html(
+              '<input type="text" readonly class="form-control" id="seq' +
+                type +
+                '" value="0"/>'
+            );
+            $formGroup.append($div);
+            $form.append($formGroup);
+          }
+        }
+
+        //保存
+        $("#save").click(function () {
+          const msg = "确定要保存吗？";
+          if (confirm(msg)) {
+            var id = $("#id").val();
+            const typeArray = $(
+              "input:checkbox[name='type']:checked"
+            ).serializeArray();
+            if (!typeArray) {
+              $("#tipMsg").text("代充地区不能为空");
+              $("#tipModal").modal("show");
+              return;
+            }
+            var userRegionArray = [];
+            for (let i = 0; i < regionArray.length; i++) {
+              var region = regionArray[i];
+              var name = region.name;
+              var seq = 0;
+              var isCheck = false;
+              for (let j = 0; j < typeArray.length; j++) {
+                console.log(typeArray[j]);
+                if (typeArray[j] && region.type == typeArray[j].value) {
+                  seq = $("#seq" + region.type).val();
+                  isCheck = true;
+                  break;
+                }
+              }
+              var userRegion = {
+                type: region.type,
+                name: region.name,
+                isCheck: isCheck,
+                seq: seq,
+              };
+              userRegionArray.push(userRegion);
+            }
+            var data = {
+              erbanNo: $("#erbanNo").val(),
+              starLevel: $("#starLevel").val(),
+              userRegions: JSON.stringify(userRegionArray),
+            };
+            if (id) {
+              data.id = id;
+            }
+            $.ajax({
+              type: "post",
+              url: "/admin/recharge/user/save",
+              data: data,
+              dataType: "json",
+              success: function (json) {
+                if (json.success == "true" || json.code == 200) {
+                  $("#tipMsg").text("保存成功");
+                  $("#tipModal").modal("show");
+                  TableHelper.doRefresh("#table");
+                  $("#editModal").modal("hide");
+                } else {
+                  $("#tipMsg").text("保存失败." + json.message);
+                  $("#tipModal").modal("show");
+                  $("#editModal").modal("hide");
+                }
+              },
+            });
+          }
+        });
+
+        //编辑
+        $("#table").on("click", ".opt-edit", function () {
+          const currentData =
+            $("#table").bootstrapTable("getData")[$(this).data("index")];
+          showRegion();
+          var id = currentData.id;
+          var erbanNo = currentData.erbanNo;
+          var starLevel = currentData.starLevel;
+          var userRegions = currentData.userRegions;
+          $("#erbanNo").val(erbanNo);
+          $("#starLevel").val(starLevel);
+          $("#id").val(id);
+          if (regionArray) {
+            for (let i = 0; i < regionArray.length; i++) {
+              var region = regionArray[i];
+              var seq = 0;
+              var isCheck = false;
+              for (let j = 0; j < userRegions.length; j++) {
+                var userRegion = userRegions[j];
+                if (region.type == userRegion.type) {
+                  seq = userRegion.seq;
+                  isCheck = true;
+                  break;
+                }
+              }
+              if (isCheck) {
+                $('input:checkbox[value="' + region.type + '"]').prop(
+                  "checked",
+                  true
+                );
+                $("#seq" + region.type).removeAttr("readonly");
+                $("#seq" + region.type).val(seq);
+              } else {
+                $("input:checkbox[value='" + region.type + "']").prop(
+                  "checked",
+                  false
+                );
+                $("#seq" + region.type).attr("readonly", "true");
+                $("#seq" + region.type).val(0);
+              }
+            }
+          }
+          $("#editModal").modal("show");
+        });
+
+        //删除
+        $("#table").on("click", ".opt-del", function () {
+          const currentData =
+            $("#table").bootstrapTable("getData")[$(this).data("index")];
+          var id = currentData.id;
+          const msg = "确定要删除吗？";
+          if (confirm(msg)) {
+            $.ajax({
+              type: "get",
+              url: "/admin/recharge/user/del?id=" + id,
+              dataType: "json",
+              success: function (json) {
+                if (json.success == "true" || json.code == 200) {
+                  $("#tipMsg").text("删除成功");
+                  $("#tipModal").modal("show");
+                  TableHelper.doRefresh("#table");
+                  $("#editModal").modal("hide");
+                } else {
+                  $("#tipMsg").text("删除失败." + json.message);
+                  $("#tipModal").modal("show");
+                  $("#editModal").modal("hide");
+                }
+              },
+            });
+          }
+        });
+      });
+    },
+  },
 };
 </script>
 

src/views/refund/goldDiamondOperationRecord.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="box">
+    <!-- 分区 -->
+    <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.partitionArr"
+            :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.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 赠送类型 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">赠送类型</span>
+        <el-select
+          v-model="inquire.platform"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.platformArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">时间</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >搜索</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = inquire.partitionArr[0].id;
+        inquire.userId = '';
+        inquire.platform = '';
+        inquire.time = '';
+        getData();
+      "
+      >重置搜索</el-button
+    >
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
+      >导出</el-button
+    >
+    <div>
+      <el-button v-for="(value, key) in sortedMapObj" :key="key" type="text"
+        >{{ key }}: {{ value }},
+      </el-button>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="createTime" align="center" label="操作时间">
+        <template v-slot="scope">
+          {{
+            dateFormat(
+              new Date(scope.row.createTime).getTime(),
+              "yyyy-MM-dd hh:mm:ss"
+            )
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="partitionDesc" align="center" label="区域" />
+      <el-table-column prop="money" align="center" label="实时金币余额" />
+      <el-table-column prop="goldNum" align="center" label="赠送金币数量" />
+      <el-table-column prop="diamondNum" align="center" label="赠送钻石数量" />
+      <el-table-column prop="typeDesc" align="center" label="赠送类型" />
+      <el-table-column
+        prop="currencyTypeDesc"
+        align="center"
+        label="赠送分类"
+      />
+      <el-table-column prop="actualAmount" align="center" label="打款金额" />
+      <el-table-column prop="remark" align="center" label="备注" />
+      <el-table-column prop="operatorName" align="center" label="操作人" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  goldcoinRecordAll,
+  recordAllExport,
+} from "@/api/refund/refund";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "goldDiamondOperationRecord",
+  data() {
+    return {
+      loading: false,
+      delDialog: false,
+      delDialogData: null,
+      mapObj: {},
+      //查询所需条件对象
+      inquire: {
+        partitionId: 0,
+        partitionArr: [],
+        userId: "",
+        platform: "",
+        platformArr: [
+          { desc: "全部", id: "" },
+          { desc: "官方赠送金币", id: "OFFICAL_DIAMOND" },
+          { desc: "官方赠送水晶", id: "OFFICAL_RADISH" },
+          { desc: "活动奖励钻石", id: "ACTIVITY_GOLD" },
+          { desc: "公款充值金币", id: "COMPANY_ACCOUNT_DIAMOND" },
+          { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" },
+          { desc: "官方赠送钻石", id: "OFFICAL_GOLD" },
+          { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  computed: {
+    sortedMapObj() {
+      const entries = Object.entries(this.mapObj);
+      // 将 "总充值{USD}" 的键排到第一位
+      entries.sort(([keyA], [keyB]) =>
+        keyA === "总充值{USD}" ? -1 : keyB === "总充值{USD}" ? 1 : 0
+      );
+      return Object.fromEntries(entries);
+    },
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+  },
+  methods: {
+    dateFormat,
+    // 查询接口
+    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");
+      }
+      goldcoinRecordAll({
+        partitionId: this.inquire.partitionId,
+        type: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.mapObj = res.data.totalMap;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    jsonFun(val) {
+      return JSON.parse(val);
+    },
+    exportInfoFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59");
+      }
+      recordAllExport({
+        partitionId: this.inquire.partitionId,
+        type: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then();
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 10px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/ssGuild/SsGuild.vue

@@ -178,6 +178,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       list({
+        partitionId: 2,
         erbanNo: this.inquire.anchorId,
         guildId: this.inquire.guildId,
         ownerErbanNo: this.inquire.guildUserId,

src/views/users/GiftSendRecordView.vue

@@ -48,28 +48,16 @@ export default {
             $('#table').bootstrapTable({
                 columns: [
                     { field: 'senderErbanNo', title: '送礼用户id', align: 'center', width: '8%' },
-                    { field: 'senderNick', title: '送礼用户昵称', align: 'center', width: '16%' },
+                    { field: 'senderNick', title: '送礼用户昵称', align: 'center', width: '12%' },
                     { field: 'receiverErbanNo', title: '收礼用户id', align: 'center', width: '8%' },
-                    { field: 'receiverNick', title: '收礼用户昵称', align: 'center', width: '16%' },
+                    { field: 'receiverNick', title: '收礼用户昵称', align: 'center', width: '12%' },
-                    { field: 'giftType', title: '礼物类型', align: 'center', width: '16%' },
+                    { field: 'roomErbanNo', title: "房间id", align: 'center', width: '8%' },
-                    { field: 'giftName', title: '礼物名称', align: 'center', width: '10%' },
+                    { field: 'roomTitle', title: "房间", align: 'center', width: '12%' },
-                    { field: 'giftNum', title: '礼物数量', align: 'center', width: '6%' },
+                    { field: 'giftType', title: '礼物类型', align: 'center', width: '8%' },
+                    { field: 'giftName', title: '礼物名称', align: 'center', width: '8%' },
+                    { field: 'giftNum', title: '礼物数量', align: 'center', width: '4%' },
                     { field: 'totalGoldNum', title: '礼物总价值(钻)', align: 'center', width: '10%' },
-                    {
+                    { field: 'createTime', title: '送礼时间', align: 'center', valign: 'middle', width: '16%'},
-                        field: 'createTime',
-                        title: '送礼时间',
-                        align: 'center',
-                        valign: 'middle',
-                        width: '10%',
-                        formatter: function (val, row, index) {
-                            if (val) {
-                                var date = new Date(val);
-                                return date.format("yyyy-MM-dd hh:mm:ss");
-                            } else {
-                                return '-';
-                            }
-                        }
-                    }
                 ],
                 cache: false,
                 striped: true,

src/views/users/UserCheckAdminBaseView.vue

@@ -436,7 +436,7 @@ export default {
                                     $("#tipMsg").text("保存失败，错误码：" + res.code + "，该手机号已被占用");
                                     $("#tipModal").modal('show');
                                 } else {
-                                    $("#tipMsg").text("保存失败，错误码：" + res.code);
+                                    $("#tipMsg").text("保存失败，" + res.message);
                                     $("#tipModal").modal('show');
                                 }
                             }

src/views/users/UserCheckAdminView.vue

@@ -819,7 +819,7 @@ export default {
                                     $("#tipMsg").text("保存失败，错误码：" + res.code + "，该手机号已被占用");
                                     $("#tipModal").modal('show');
                                 } else {
-                                    $("#tipMsg").text("保存失败，错误码：" + res.code);
+                                    $("#tipMsg").text("保存失败，" + res.message);
                                     $("#tipModal").modal('show');
                                 }
                             }