赠送钻石水晶 - 修复点击确认后再点击取消后点击确认赠送没反应bug

src/api/luckGift/luckGift.js

@@ -43,6 +43,11 @@ export const personal = query => {
         params: query
     });
 };
+// 个人数据
+export const exportPersonal = query => {
+    window.location.href = `/admin/lucky24/record/personal/export?${genQueryParam(query)}`;
+    return;
+};
 // 汇总
 export const platform = query => {
     return request({
@@ -81,4 +86,18 @@ export const pageRecord = query => {
 export const exportRecord = query => {
     window.location.href = `/admin/lucky24/record/export?${genQueryParam(query)}`;
     return;
+};
+
+// 个人数据
+export const followUserPersonal = query => {
+    return request({
+        url: '/admin/lucky24/followUserRecord/personal',
+        method: 'get',
+        params: query
+    });
+};
+// 个人数据
+export const exportFollowUserPersonal = query => {
+    window.location.href = `/admin/lucky24/followUserRecord/personal/export?${genQueryParam(query)}`;
+    return;
 };

src/api/statisticsIeisureGameDuration/statisticsIeisureGameDuration.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request';
+
+// 获取游戏列表
+export const mgList = query => {
+    return request({
+        url: '/admin/miniGame/statis/mgList',
+        method: 'get',
+        params: query
+    });
+};
+// 获取休闲游戏时长统计列表
+export const getMinigameListStat = query => {
+    return request({
+        url: '/admin/minigame/sud/stat/listStat',
+        method: 'get',
+        params: query
+    });
+};
+// 获取休闲游戏时长明细列表
+export const getMinigamePageDetail = query => {
+    return request({
+        url: '/admin/minigame/sud/stat/pageDetail',
+        method: 'get',
+        params: query
+    });
+};
+// 导出休闲游戏时长统计
+export const exportMiniGameStat = query => {
+    return request({
+        url: `/admin/minigame/sud/stat/exportStat`,
+        method: 'get',
+        params: query,
+        responseType: 'blob'
+    });
+}
+// 导出休闲游戏时长明细
+export const exportMiniGameDetail = query => {
+    return request({
+        url: `/admin/minigame/sud/stat/exportDetail`,
+        method: 'get',
+        params: query,
+        responseType: 'blob'
+    });
+}

src/api/users/SuspectedUserX.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request';
+
+// X嫌疑人 - 列表
+export const getChargeUserXDetailPage = query => {
+    return request({
+        url: '/chargeUserXDetail/list',
+        method: 'get',
+        params: query
+    });
+};
+// X嫌疑人 导出
+export const exportChargeUserXDetail = query => {
+    return request({
+        url: `/chargeUserXDetail/export`,
+        method: 'post',
+        params: query,
+        responseType: 'blob'
+    });
+}
+// X嫌疑人 - 增加
+export const saveChargeUserXDetailPage = query => {
+    return request({
+        url: '/chargeUserXDetail/save',
+        method: 'post',
+        params: query
+    });
+};
+// X嫌疑人 - 删除
+export const deleteChargeUserXDetailPage = query => {
+    return request({
+        url: '/chargeUserXDetail/delete',
+        method: 'post',
+        params: query
+    });
+};

src/views/data/statisticsIeisureGameDuration.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>游戏名称</span>
+      <el-select v-model="formData.gameId" placeholder="请选择">
+        <el-option
+          v-for="item in gameList"
+          :key="item.mgId"
+          :label="JSON.parse(item.name).zh"
+          :value="item.mgId"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span class="demonstration">月份</span>
+      <el-config-provider :locale="zhCn">
+        <el-date-picker
+          v-model="formData.month"
+          type="month"
+          placeholder="选择月"
+          value-format="YYYY-MM"
+          :clearable="false"
+        >
+        </el-date-picker
+      ></el-config-provider>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button class="primary" type="primary" @click="resetFormData()"
+      >重置</el-button
+    >
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
+      >导出</el-button
+    >
+
+    <!-- 表格数据 -->
+    <el-table
+      v-loading="tableData.loading"
+      :data="tableData.data"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="statMonth" align="center" label="月份" />
+      <el-table-column prop="gameName" align="center" label="游戏名称" />
+      <el-table-column prop="totalDuration" align="center" label="总时长(秒)">
+        <template v-slot="scope">
+           <el-button @click="detailFun(scope.row)" type="text" size="small">
+          {{ scope.row.totalDuration }}
+        </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="arDuration" align="center" label="阿拉伯时长(秒)" />
+      <el-table-column prop="enDuration" align="center" label="英语区时长(秒)" />
+      <el-table-column prop="en2Duration" align="center" label="英语2区时长(秒)" />
+      <el-table-column prop="trDuration" align="center" label="土耳其区时长(秒)" />
+      <el-table-column prop="zhDuration" align="center" label="华语区时长(秒)" />
+    </el-table>
+    <!-- 明细弹窗 -->
+    <el-dialog
+      v-model="dailydetailDialog"
+      title="休闲游戏时长明细"
+      width="30%"
+      center
+    >
+    <el-button style="" type="primary" @click="confirmExport2ExcelDetail()"
+          >导出</el-button
+        >
+      <el-table
+        :data="detailtableData.data"
+        style="width: 100%;margin-top: 20px;"
+        ref="multipleTable"
+        border
+      >
+        <el-table-column prop="date" align="center" label="日期" />
+        <el-table-column prop="gameName" align="center" label="游戏名称" />
+        <el-table-column prop="erbanNo" align="center" label="房间号" />
+        <el-table-column prop="partitionDesc" align="center" label="分区" />
+        <el-table-column prop="duration" align="center" label="游戏时长(秒)" />
+      </el-table>
+      <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      :current-page="detailData.page"
+      :page-size="detailData.size"
+      :page-sizes="[10, 20, 50, 100, 200]"
+      layout="sizes, prev, pager, next"
+      :total="detailtableData.total"
+      @size-change="handleSizeChangeDetail"
+      @current-change="handleCurrentChangeDetail"
+    />
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="dailydetailDialog = false">
+            关闭
+          </el-button>
+        </span>
+      </template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "statisticsIeisureGameDuration",
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { formatDate } from "@/utils/relDate";
+import { dateFormat } from "@/utils/system-helper";
+import {
+  mgList,
+  getMinigameListStat,
+  getMinigamePageDetail,
+  exportMiniGameStat,
+  exportMiniGameDetail,
+} from "@/api/statisticsIeisureGameDuration/statisticsIeisureGameDuration";
+import zhCn from "element-plus/dist/locale/zh-cn.mjs";
+const formData = reactive({
+  month: "",
+  gameId: "",
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const detailData = reactive({
+  month: "",
+  gameId: "",
+  page: 1,
+  size: 10,
+});
+const detailtableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const gameList = ref([]);
+const dailydetailDialog = ref(false);
+// 查询
+const getData = () => {
+  if (formData.month == "" && !formData.month) {
+    ElMessage.warning("请选择月份");
+    return;
+  }
+  tableData.loading = true;
+  getMinigameListStat(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data;
+      tableData.loading = false;
+      tableData.total = res.total;
+    } else {
+      tableData.loading = false;
+
+      ElMessage.error(res.message);
+    }
+  });
+};
+// 明细
+const detailFun = (row) => {
+  if(row){
+      detailData.gameId = row.gameId;
+  detailData.month = row.statMonth;
+  }
+  getMinigamePageDetail(detailData).then((res) => {
+    if (res.code == 200) {
+      detailtableData.data = res.data.records;
+      detailtableData.loading = false;
+      detailtableData.total = res.data.total;
+       dailydetailDialog.value = true;
+    } else {
+      ElMessage.error(res.message);
+    }
+  });
+};
+//重置
+const resetFormData = () => {
+  Object.assign(formData.value, {
+    gameId: "",
+  });
+};
+// 导出
+const confirmExport2Excel = async () => {
+  try {
+        const res = await exportMiniGameStat(formData)
+        if (res) {
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+          let time = formatDate(new Date());
+          let alink = document.createElement("a");
+          alink.download = `休闲游戏时长统计${time}.xls`;
+          alink.style.display = "none";
+          const blob = new Blob([res]);
+          alink.href = URL.createObjectURL(blob);
+          document.body.appendChild(alink);
+          alink.click();
+          URL.revokeObjectURL(alink.href);
+        }
+
+      } catch (error) {
+        ElMessage({
+          message: error.message,
+          type: 'error',
+        });
+      }
+};
+// 导出
+const confirmExport2ExcelDetail = async () => {
+  try {
+        const res = await exportMiniGameDetail(detailData)
+        if (res) {
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+          let time = formatDate(new Date());
+          let alink = document.createElement("a");
+          alink.download = `休闲游戏时长明细统计${time}.xls`;
+          alink.style.display = "none";
+          const blob = new Blob([res]);
+          alink.href = URL.createObjectURL(blob);
+          document.body.appendChild(alink);
+          alink.click();
+          URL.revokeObjectURL(alink.href);
+        }
+
+      } catch (error) {
+        ElMessage({
+          message: error.message,
+          type: 'error',
+        });
+      }
+};
+const handleSizeChangeDetail = (val) => {
+  detailData.size = val;
+  detailFun();
+};
+const handleCurrentChangeDetail = (val) => {
+  detailData.page = val;
+  detailFun();
+};
+onMounted(() => {
+  mgList().then((res) => {
+    if (res.code == 200) {
+      gameList.value = res.data;
+    } else {
+      ElMessage.error(res.message);
+    }
+  });
+});
+</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;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/guildOperationManagement/guildAnchorManagement.vue

@@ -59,6 +59,11 @@
                 </template>
             </el-table-column>
             <el-table-column prop="adminName" align="center" label="操作人" />
+            <el-table-column prop="enable" align="center" label="操作时间" >
+                <template v-slot="scope">
+                    {{scope.row.enable  ? convertTimestamp(scope.row.createTime) : convertTimestamp(scope.row.updateTime)}}
+                </template>
+            </el-table-column>
         </el-table>
         <!-- 分页 -->
         <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.page"
@@ -181,6 +186,10 @@ export default {
             formData.pageNum = val;
             getData();
         };
+       const convertTimestamp =(time)=> {
+      let date = new Date(time);
+      return date.format("yyyy-MM-dd hh:mm:ss");
+    };
         return {
             formData,
             addFormData,
@@ -191,7 +200,8 @@ export default {
             handleCurrentChange,
             addFun,
             detailPageFun,
-            deleteId
+            deleteId,
+            convertTimestamp
 
         }
   }

src/views/luckGift/luckGiftData.vue

@@ -62,6 +62,10 @@
           inquire.time = '';
         ">重置筛选
       </el-button>
+      <el-button class="primary"
+                 type="primary"
+                 v-loading="loading"
+                 @click="exportPersonalRecord()">导出</el-button>
       <el-button class="primary"
                  type="primary"
                  style="margin-left: 20px;"
@@ -263,7 +267,7 @@
 </template>
 <script>
 import { listLevel } from '@/api/userRechargeLevel/userRechargeLevel'
-import { personal, updateUserMulti, pageRecord, exportRecord, listType } from "@/api/luckGift/luckGift";
+import { personal, exportPersonal, updateUserMulti, pageRecord, exportRecord, listType } from "@/api/luckGift/luckGift";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -370,6 +374,22 @@ export default {
         this.loading = false;
       });
     },
+    exportPersonalRecord (row) {
+      this.loading = true;
+      const params = {
+        erbanNo: this.inquire.userId,
+        date: this.inquire.time
+            ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+            : null,
+        partitionId: this.inquire.value,
+        userRechargeLevel: this.inquire.userRechargeLevel,
+        poolType: this.inquire.poolType ? this.inquire.poolType : undefined,
+        sortCol: this.inquire.sortCol,
+        sortOrder: this.inquire.sortOrder
+      }
+      exportPersonal(params)
+      this.loading = false;
+    },
     // 确认保存
     editDialogClick () {
       this.butClick = true;

src/views/luckGift/luckGiftFollowUserData.vue

@@ -0,0 +1,504 @@
+<template>
+  <div class="box">
+    <!-- ID -->
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <partition-select v-model:partition-id="inquire.value" />
+      </div>
+      <!-- 送出时间 -->
+      <div class="inquire">
+        <span>时间</span>
+        <el-date-picker v-model="inquire.time"
+                        @change="handleDateChange"
+                        type="date"
+                        placeholder="请选择">
+        </el-date-picker>
+      </div>
+      <!-- 送出时间 -->
+      <div class="inquire">
+        <span>数组类型</span>
+        <el-select v-model="inquire.poolType"
+                   placeholder="请选择">
+          <el-option v-for="item in poolTypes"
+                     :key="item.type"
+                     :label="item.name"
+                     :value="item.type">
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+    <el-button type="text">总进入：{{ totalInput }}</el-button>
+    <el-button type="text">总退出：{{ totalOutput }}</el-button>
+    <el-button type="text">总比例：{{ totalProductionRatio }}</el-button>
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary"
+                 type="primary"
+                 @click="getData()">查询
+      </el-button>
+      <el-button @click="
+          inquire.userId = '';
+          inquire.time = '';
+        ">重置筛选
+      </el-button>
+      <el-button class="primary"
+                 type="primary"
+                 v-loading="loading"
+                 @click="exportPersonalRecord()">导出</el-button>
+      <el-button class="primary"
+                 type="primary"
+                 style="margin-left: 20px;"
+                 :disabled="butClick"
+                 @click="
+          editDialog = true;
+          type = 12;
+          editDialogTitle = '赠送1000倍奖励';
+          value = inquire.x;
+        ">
+        赠送</el-button>
+    </div>
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="recordDialog.show"
+               v-model:title="recordDialog.title"
+               @close="closeRecordDialog"
+               label-width="auto"
+               width="82%"
+               center>
+      <!-- 表格 -->
+      <el-table v-loading="pageRecord.loading"
+                :data="pageRecord.data"
+                border
+                style="width: 100%; margin-top: 25px">
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="时间" />
+        <el-table-column prop="partitionDesc"
+                         align="center"
+                         label="分区" />
+        <el-table-column prop="erbanNo"
+                         align="center"
+                         label="平台id" />
+        <el-table-column prop="nick"
+                         align="center"
+                         label="昵称" />
+        <el-table-column prop="receiverErbanNo"
+                         align="center"
+                         label="收礼者平台id" />
+        <el-table-column prop="receiverNick"
+                         align="center"
+                         label="收礼者昵称" />
+        <el-table-column prop="roomErbanNo"
+                         align="center"
+                         label="房间id" />
+        <el-table-column prop="giftId"
+                         align="center"
+                         label="礼物id" />
+        <el-table-column prop="giftName"
+                         align="center"
+                         label="礼物名称" />
+        <el-table-column prop="giftGoldPrice"
+                         align="center"
+                         label="礼物价格" />
+        <el-table-column prop="giftNum"
+                         align="center"
+                         label="数量" />
+        <el-table-column prop="input"
+                         align="center"
+                         label="进入" />
+        <el-table-column prop="poolTypeDesc"
+                         align="center"
+                         label="数组类型" />
+        <el-table-column prop="poolId"
+                         align="center"
+                         label="数组ID" />
+        <el-table-column prop="expect"
+                         align="center"
+                         label="期望值" />
+        <el-table-column prop="isSupplement"
+                         align="center"
+                         label="本次是否后台赠送" />
+        <el-table-column prop="drawMultiple"
+                         align="center"
+                         label="数组倍数" />
+        <el-table-column prop="afterMultiple"
+                         align="center"
+                         label="最终倍数" />
+        <el-table-column prop="winGoldNum"
+                         align="center"
+                         label="退出" />
+        <el-table-column prop="stockResult"
+                         align="center"
+                         label="库存结果" />
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination style="margin-top: 10px"
+                     class="paginationClass"
+                     v-model:current-page="pageRecord.pageNo"
+                     v-model:page-size="pageRecord.pageSize"
+                     :page-sizes="[50, 100, 200, 500]"
+                     layout="sizes, prev, pager, next"
+                     :total="pageRecord.total"
+                     @size-change="handleRecordPageChange"
+                     @current-change="handleRecordPageChange" />
+    </el-dialog>
+
+    <!-- 表格 -->
+    <el-table v-loading="loading"
+              :data="tableData"
+              @sort-change="handleSortChange"
+              border
+              style="width: 100%; margin-top: 25px">
+      <el-table-column prop="date"
+                       align="center"
+                       label="日期" />
+      <el-table-column prop="uid"
+                       align="center"
+                       label="uid" />
+      <el-table-column prop="erbanNo"
+                       align="center"
+                       label="平台id" />
+      <el-table-column prop="userRechargeLevel"
+                       align="center"
+                       label="充值等级" />
+      <el-table-column prop="totalInput"
+                       :sortable="inquire.sortable"
+                       align="center"
+                       label="进入" />
+      <el-table-column prop="totalOutput"
+                       :sortable="inquire.sortable"
+                       align="center"
+                       label="退出" />
+      <el-table-column prop="production"
+                       :sortable="inquire.sortable"
+                       align="center"
+                       label="剩余" />
+      <el-table-column prop="productionRatio"
+                       :sortable="inquire.sortable"
+                       align="center"
+                       label="退出/进入" />
+      <el-table-column prop="avgInput"
+                       align="center"
+                       label="每次进入" />
+      <el-table-column prop="num"
+                       align="center"
+                       label="总次数" />
+      <el-table-column prop="winNum"
+                       align="center"
+                       label="得到次数" />
+      <el-table-column prop="winRate"
+                       align="center"
+                       label="得到率" />
+      <el-table-column align="center"
+                       label="操作"
+                       width="180">
+        <template v-slot="scope">
+          <el-button class="primary"
+                     type="primary"
+                     @click="openRecordDialog(scope.row)">明细</el-button>
+          <el-button v-loading="exportLoading"
+                     @click="exportRecord(scope.row)">导出</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="editDialog"
+               :title="editDialogTitle"
+               width="36%"
+               center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">{{ editDialogTitle }}</span>
+        <el-input v-model="value"
+                  style="width: 75%"
+                  class="input"
+                  placeholder="请输入用户ID"></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="
+              editDialog = false;
+              butClick = false;
+            ">取消</el-button>
+          <el-button type="primary"
+                     :disabled="butClick"
+                     @click="editDialogClick()">
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { followUserPersonal, exportFollowUserPersonal, updateUserMulti, pageRecord, exportRecord, listType } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+export default {
+  name: "luckGiftFollowUserData",
+  components: {
+    PartitionSelect
+  },
+  data () {
+    return {
+      loading: false,
+      totalInput: 0,
+      totalOutput: 0,
+      totalProductionRatio: 0,
+      //查询所需条件对象
+      inquire: {
+        time: "",
+        value: undefined,
+        poolType: undefined,
+        sortable: false,
+        sortCol: undefined,
+        sortOrder: undefined
+      },
+      poolTypes: [],
+      // 表格
+      tableData: [],
+      // 分页
+      total: 20, //总页数
+      currentPage: 1, //页码
+      pageSize: 20, //条数
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+      butClick: false,
+
+      recordDialog: {
+        show: false,
+        title: "",
+      },
+
+      pageRecord: {
+        uid: undefined,
+        date: undefined,
+        poolType: undefined,
+        loading: false,
+        data: [],
+        total: 0,
+        pageNo: 1,
+        pageSize: 50,
+      },
+
+      exportLoading: false,
+    };
+  },
+  methods: {
+    loadPoolTypes () {
+      listType({ needAll: true }).then((res) => {
+        if (res.code != 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+          return
+        }
+        this.poolTypes = res.data;
+        this.inquire.poolType = this.poolTypes[0].type
+      })
+    },
+    // 查询接口
+    getData () {
+      if (!this.inquire.time) {
+        ElMessage({
+          showClose: true,
+          message: "时间需要填",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      followUserPersonal({
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        date: this.inquire.time
+          ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+          : null,
+        partitionId: this.inquire.value,
+        poolType: this.inquire.poolType ? this.inquire.poolType : undefined,
+        sortCol: this.inquire.sortCol,
+        sortOrder: this.inquire.sortOrder
+      }).then((res) => {
+        this.total = res.data.dataPage.total;
+        this.tableData = res.data.dataPage.rows;
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.loading = false;
+      });
+    },
+    exportPersonalRecord () {
+      this.loading = true;
+      const params = {
+        date: this.inquire.time
+            ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+            : null,
+        partitionId: this.inquire.value,
+        poolType: this.inquire.poolType ? this.inquire.poolType : undefined,
+        sortCol: this.inquire.sortCol,
+        sortOrder: this.inquire.sortOrder
+      }
+      exportFollowUserPersonal(params)
+      this.loading = false;
+    },
+    // 确认保存
+    editDialogClick () {
+      this.butClick = true;
+      updateUserMulti({ erbanNo: this.value }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+          setTimeout(() => {
+            this.butClick = false;
+          }, 1000);
+          this.editDialog = false;
+          this.getData();
+        } else {
+          this.butClick = false;
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    handleDateChange (val) {
+      if (val && !this.inquire.sortable) {
+        this.inquire.sortable = 'custom';
+        this.inquire.sortCol = undefined;
+        this.inquire.sortOrder = undefined;
+      }
+      if (!val && this.inquire.sortable) {
+        this.inquire.sortable = false;
+        this.inquire.sortCol = undefined;
+        this.inquire.sortOrder = undefined;
+      }
+    },
+    handleSortChange (data) {
+      if (data.order) {
+        this.inquire.sortCol = data.prop;
+        this.inquire.sortOrder = data.order == "ascending" ? "asc" : "desc";
+      } else {
+        this.inquire.sortCol = undefined;
+        this.inquire.sortOrder = undefined
+      }
+      this.getData();
+    },
+    // 分页导航
+    handleSizeChange () {
+      this.getData();
+    },
+    handleCurrentChange () {
+      this.getData();
+    },
+    openRecordDialog (row) {
+      this.recordDialog.show = true;
+      this.recordDialog.title = '[' + row.erbanNo + ']' + row.date + '明细';
+      this.pageRecord.uid = row.uid;
+      this.pageRecord.date = row.date;
+      this.pageRecord.poolType = row.poolType ? row.poolType : undefined;
+      this.pageRecordData();
+    },
+    closeRecordDialog () {
+      this.recordDialog.show = false;
+      this.recordDialog.title = undefined;
+      this.pageRecord.uid = undefined;
+      this.pageRecord.date = undefined;
+      this.pageRecord.poolType = undefined;
+    },
+    // 分页导航
+    handleRecordPageChange () {
+      this.pageRecordData();
+    },
+    pageRecordData () {
+      if (!this.pageRecord.uid && !this.pageRecord.date) {
+        ElMessage({
+          showClose: true,
+          message: "时间和ID至少填一项",
+          type: "error",
+        });
+        return;
+      }
+      this.pageRecord.loading = true;
+      pageRecord({
+        uid: this.pageRecord.uid,
+        date: this.pageRecord.date,
+        poolType: this.pageRecord.poolType,
+        pageNo: this.pageRecord.pageNo,
+        pageSize: this.pageRecord.pageSize,
+      }).then((res) => {
+        if (res.code !== 200) {
+          throw new Error(res.msg);
+        }
+        this.pageRecord.total = res.data.total;
+        this.pageRecord.data = res.data.rows;
+      }).catch((error) => {
+        ElMessage({
+          showClose: true,
+          message: error.message,
+          type: "error",
+        });
+      }).finally(() => {
+        this.pageRecord.loading = false;
+      });
+    },
+    exportRecord (row) {
+      this.exportLoading = true;
+      exportRecord({ uid: row.uid, date: row.date })
+      this.exportLoading = false;
+    },
+  },
+  mounted () {
+    this.loadPoolTypes()
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/luckGift/luckGiftSet.vue

@@ -1,6 +1,24 @@
 <template>
   <div class="box">
     <div class="condition">
+      <div class="inquire">
+        <span>后台关注用户</span>
+        <!-- @input="handleInput" -->
+        <el-input v-model="inquire.adminFollowErbanNoList"
+                  placeholder=""
+                  class="input"
+                  disabled></el-input>
+        <el-button class="primary"
+                   type="primary"
+                   @click="
+            editDialog = true;
+            butClick = false;
+            type = 16;
+            editDialogTitle = '后台关注用户';
+            value = inquire.adminFollowErbanNoList;
+          ">
+          编辑</el-button>
+      </div>
       <div class="inquire">
         <span>用户上线列表</span>
         <!-- @input="handleInput" -->
@@ -662,6 +680,7 @@ export default {
         userRevenueRatio: "",
         warnMulti: "",
         followErbanNoList: "",
+        adminFollowErbanNoList: "",
         whiteErbanNoProductionRatioMap: "",
         blackErbanNoList: "",
         preJudgeValue_H: undefined,
@@ -701,6 +720,7 @@ export default {
         this.inquire.userRevenueRatio = res.data.receiverRatio;
         this.inquire.warnMulti = res.data.warnMulti;
         this.inquire.followErbanNoList = res.data.followErbanNoList.join();
+        this.inquire.adminFollowErbanNoList = res.data.adminFollowErbanNoList.join();
         // this.inquire.whiteErbanNoProductionRatioMap = res.data.whiteErbanNoProductionRatioMap.join();
         this.inquire.blackErbanNoList = res.data.blackErbanNoList.join();
         var newArr = [];
@@ -837,6 +857,8 @@ export default {
           obj.warnMulti = this.value;
         } else if (this.type == 11) {
           obj.followErbanNoList = this.value.split(",");
+        } else if (this.type == 16) {
+          obj.adminFollowErbanNoList = this.value.split(",");
         } else if (this.type == 14) {
           obj.whiteErbanNoProductionRatioMap =
             this.whiteErbanNoProductionRatioMap;

src/views/record/OfficicalGoldView.vue

@@ -339,6 +339,8 @@ export default {
                 isGiveBol = false;
               }
             });
+          }else{
+            isGiveBol = false;
           }
         }
 

src/views/resource/GamePlayView.vue

@@ -393,7 +393,7 @@
                   style="width: 75%"
                   class="input"
                   :placeholder="rule.description"
-                  v-if="rule.ruleKind != 'IN' && rule.ruleKind != 'LEFT_LIKE' && ((rule.ruleCode == 'NOT_CHANNELS' || rule.ruleCode == 'PLATFORM' || rule.ruleCode == 'USER_LEVEL') || (!resource.ruleValue['PLATFORM'] || resource.ruleValue['PLATFORM'] == '' || resource.ruleValue['PLATFORM'] == 'null' || (rule.ruleCode == 'IOS_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'IOS_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'ANDROID_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'android') || (rule.ruleCode == 'ANDROID_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'android')))"></el-input>
+                  v-if="rule.ruleKind != 'EQ' && rule.ruleKind != 'IN' && rule.ruleKind != 'LEFT_LIKE' && ((rule.ruleCode == 'NOT_CHANNELS' || rule.ruleCode == 'PLATFORM' || rule.ruleCode == 'USER_LEVEL') || (!resource.ruleValue['PLATFORM'] || resource.ruleValue['PLATFORM'] == '' || resource.ruleValue['PLATFORM'] == 'null' || (rule.ruleCode == 'IOS_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'IOS_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'ANDROID_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'android') || (rule.ruleCode == 'ANDROID_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'android')))"></el-input>
         <el-select v-model="resource.ruleValue[rule.ruleCode]"
                    style="width: 75%"
                    placeholder="请选择"
@@ -414,6 +414,15 @@
                      :label="value"
                      :value="value"></el-option>
         </el-select>
+        <el-select v-model="resource.ruleValue[rule.ruleCode]"
+                   style="width: 75%"
+                   placeholder="请选择"
+                   v-if="rule.ruleKind == 'EQ'">
+          <el-option v-for="value in rule.ruleValue.split(',')"
+                     :key="value"
+                     :label="value == 1?'全部用户' : '非公会成员'"
+                     :value="value"></el-option>
+        </el-select>
       </div>
       <template #footer>
         <span class="dialog-footer">
@@ -497,7 +506,9 @@ export default {
         startTime: null,
         endTime: null,
         seqNo: 0,
-        ruleValue: {},
+        ruleValue: {
+          USER_LEVEL_LIMIT_ROLE:"1"
+        },
         partitionId: null,
         seriesNameZh: '',
         seriesNameEn: '',
@@ -642,6 +653,7 @@ export default {
         let rule = this.rules[i];
         this.resource.ruleValue[rule.ruleCode] = '';
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = "1";
       this.partitionId = null;
       this.editDialog = true;
     },
@@ -677,10 +689,12 @@ export default {
         }
         this.resource.ruleValue[ruleCode] = rule;
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = "1";
       this.resource.partitionId = row.partitionId;
       this.editDialog = true;
     },
     editDialogClick () {
+      console.log(this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'],'editDialogClick');
       let startTime = this.resource.startTime;
       if (startTime) {
         this.resource.startTime = new Date(startTime).format("yyyy-MM-dd hh:mm:ss");

src/views/system/I18nMessageAdminView.vue

@@ -293,6 +293,10 @@ export default {
       return str.trim();
     },
     trimTextArea (str) {
+      // 确保 str 是字符串类型，避免 split 报错
+      if (!str || typeof str !== 'string') {
+        return '';
+      }
       return str.split('\n').map((line) => line.trim())
         .filter(str => str && '' != str).join('\n');
     }

src/views/users/SuspectedUserX.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>分区</span>
+      <partition-select v-model:partition-id="formData.partitionId" />
+    </div>
+    <div class="inquire">
+      <span>用户ID:</span>
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>登录IP:</span>
+      <el-input v-model="formData.ip" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>登录设备号:</span>
+      <el-input v-model="formData.device" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span class="demonstration">是否嫌疑人</span>
+      <el-select v-model="formData.identity" placeholder="请选择">
+        <el-option label="全部" value=""></el-option>
+        <el-option label="是" :value="1"></el-option>
+        <el-option label="否" :value="0"></el-option>
+      </el-select>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
+      >导出</el-button
+    >
+     <el-button style="" type="primary" @click="addDialog = true"
+      >新增</el-button
+    >
+    <!-- 表格数据 -->
+    <el-table
+      v-loading="tableData.loading"
+      :data="tableData.data"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="chargeUserLevel" align="center" label="用户等级" />
+      <el-table-column prop="uid" align="center" label="用户UID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="regionName" align="center" label="国家" />
+      <el-table-column prop="payGold" align="center" label="投入" />
+      <el-table-column prop="winGold" align="center" label="支出" />
+      <el-table-column prop="diff" align="center" label="差额" />
+      <el-table-column prop="ip" align="center" label="登录IP" />
+      <el-table-column prop="deviceId" align="center" label="设备型号" />
+      <el-table-column prop="identity" align="center" label="当前是否为X用户">
+        <template v-slot="scope">
+          <el-tag v-if="scope.row.identity == 1" type="success">是</el-tag>
+          <el-tag v-else type="danger">否</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" align="center" label="成为X身份原因" />
+      <el-table-column
+        prop="removeReason"
+        align="center"
+        label="取消身份原因"
+      />
+      <el-table-column prop="createTime" align="center" label="创建时间" />
+      <el-table-column prop="updateTime" align="center" label="更新时间" />
+      <el-table-column align="center" label="操作" width="200">
+        <template v-slot="scope">
+          <el-button
+            class="primary"
+            type="primary"
+            @click="detailPageFun(scope.row)"
+            size="default"
+            v-if="scope.row.identity == 1"
+            >移除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      :current-page="formData.pageNo"
+      :page-size="formData.pageSize"
+      :page-sizes="[10, 20, 50, 100, 200]"
+      layout="sizes, prev, pager, next"
+      :total="tableData.total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >用户ID</span
+        >
+        <!-- <el-input v-model="addFormData.erbanNos" style="width: 50%" class="input"></el-input> -->
+        <el-input
+          v-model="addFormData.erbanNos"
+          style="width: 50%"
+          class="input"
+          :rows="5"
+          type="textarea"
+          placeholder="请输入用户ID,用逗号隔开"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addDialog = false">取消</el-button>
+          <el-button type="primary" @click="addFun()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import PartitionSelect from "../common/partitionSelect.vue";
+export default {
+  name: "SuspectedUserX",
+  components: {PartitionSelect},
+
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  getChargeUserXDetailPage,
+  exportChargeUserXDetail,
+  saveChargeUserXDetailPage,
+  deleteChargeUserXDetailPage,
+} from "@/api/users/SuspectedUserX.js";
+import { formatDate } from "@/utils/relDate";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  erbanNo: "",
+    ip: "",
+    device: "",
+  identity: "",
+  partitionId:undefined,
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const addDialog = ref(false);
+const addFormData = reactive({
+  erbanNos: "",
+});
+const getData = () => {
+  tableData.loading = true;
+  getChargeUserXDetailPage(formData).then((res) => {
+    if (res.code === 200) {
+      tableData.data = res.data.records;
+      tableData.total = res.data.total;
+      tableData.loading = false;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+// 增加
+const addFun = () => {
+  saveChargeUserXDetailPage(addFormData).then((res) => {
+    if (res.code == 200) {
+      ElMessage.success("添加成功");
+      addDialog.value = false;
+      addFormData.erbanNos = "";
+      getData();
+    } else {
+      ElMessage.error(res.message);
+      addDialog.value = false;
+    }
+  });
+};
+// 移除
+const detailPageFun = (rows) => {
+  ElMessageBox.confirm("确定要移除吗", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      deleteChargeUserXDetailPage({
+        uid: rows.uid,
+      }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            type: "success",
+            message: "操作成功!",
+          });
+          getData();
+        } else {
+          ElMessage({
+            type: "error",
+            message: res.message,
+          });
+        }
+      });
+    })
+    .catch(() => {
+      ElMessage({
+        type: "warning ",
+        message: "已取消",
+      });
+    });
+};
+// 导出
+const confirmExport2Excel = async () => {
+  try {
+    const res = await exportChargeUserXDetail(formData);
+    if (res) {
+      ElMessage({
+        message: "导出成功",
+        type: "success",
+      });
+      let time = formatDate(new Date());
+      let alink = document.createElement("a");
+      alink.download = `X垃圾嫌疑用户统计${time}.xls`;
+      alink.style.display = "none";
+      const blob = new Blob([res]);
+      alink.href = URL.createObjectURL(blob);
+      document.body.appendChild(alink);
+      alink.click();
+      URL.revokeObjectURL(alink.href);
+    }
+  } catch (error) {
+    ElMessage({
+      message: error.message,
+      type: "error",
+    });
+  }
+};
+const handleSizeChange = (val) => {
+  formData.pageSize = val;
+  getData();
+};
+const handleCurrentChange = (val) => {
+  formData.pageNo = val;
+  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>