新增 - 休闲游戏时长统计

.env.production

@@ -1,2 +1,2 @@
-VUE_APP_API_BASE_URL=http://admin.web.epartylive.com
+VUE_APP_API_BASE_URL=http://admin.web.pekolive.com
 VUE_APP_DEBUG_MODE=false

src/api/DailyTaskRewardCollection/DailyTaskRewardCollection.js

@@ -0,0 +1,27 @@
+
+import request from "@/utils/request";
+// 日任务奖励领取详情
+export const getDailyTaskCoinRecvNums = query => {
+    return request({
+        url: '/admin/dailyTask/coinRecvNums',
+        method: 'get',
+        params: query
+    });
+};
+// 日任务奖励领取详情-明细
+export const getDailyTaskcoinRecvDetail = query => {
+    return request({
+        url: '/admin/dailyTask/coinRecvDetail',
+        method: 'get',
+        params: query
+    });
+};
+// 日任务奖励领取详情-明细-导出
+export const exportMiniGameDetail = query => {
+    return request({
+        url: `/admin/dailyTask/coinRecvDetailExport`,
+        method: 'get',
+        params: query,
+        responseType: 'blob'
+    });
+}

src/api/SalaryDetails/SalaryDetails.js

@@ -49,4 +49,21 @@ export const exportClearDiamond = query => {
         params: query,
         responseType: 'blob'
     });
-}
+}
+// 紫水晶清空记录列表
+export const getGuildAmethystClearRecordList = query => {
+    return request({
+        url: '/admin/guild/guildCrystal/page',
+        method: 'get',
+        params: query
+    });
+};
+// 紫水晶清空记录列表 - 导出
+export const exportClearAmethyst = query => {
+    return request({
+        url: '/admin/guild/guildCrystal/export',
+        method: 'get',
+        params: query,
+         responseType: 'blob'
+    });
+};

src/api/nobleman/nobleman.js

@@ -175,6 +175,19 @@ export const statExportFamilyMember = query => {
     window.location.href = `/admin/family/wage/stat/exportFamilyMember?${genQueryParam(query)}`;
     return;
 };
+// 工会统计-每日工会详情
+export const listFamilyMemberDaily = query => {
+    return request({
+        url: '/admin/family/wage/stat/listFamilyMemberDaily',
+        method: 'get',
+        params: query
+    });
+};
+// 工会统计-单每日会导出
+export const exportFamilyMemberDaily = query => {
+    window.location.href = `/admin/family/wage/stat/exportFamilyMemberDaily?${genQueryParam(query)}`;
+    return;
+};
 // 工会统计-导出公会工资统计
 export const statExportFamily = query => {
     window.location.href = `/admin/family/wage/stat/exportFamily?${genQueryParam(query)}`;

src/api/relAgency/relAgency.js

@@ -44,7 +44,7 @@ export const familyMemberWeekLevelRewardExport = query => {
 // 获取 公会钻石薪资流水统计 列表
 export const getAgencyDiamondFlow = query => {
     return request({
-        url: '/agency/diamond/flow/page',
+        url: '/agency/diamond/flow/list',
         method: 'get',
         params: query
     });
@@ -272,199 +272,62 @@ export const exportRoomHourDiamondList = query => {
         responseType: 'blob'
     });
 };
-// 主播游戏薪资操作(不用分区)
-export const getAnchorGameSalaryBill = query => {
-    return request({
-        url: '/anchorGameSalaryBill/anchorSummary/list',
-        method: 'get',
-        params: query
-    });
-};
-// salaryType 1钻石兑换薪资明细 2 薪资转赠充值代理 明细 3薪资转增公会长明细 4官方提现 6 薪资兑换金币明细
-export const anchorGameSalaryBillDetail = query => {
-    return request({
-        url: '/anchorGameSalaryBill/detail/list',
-        method: 'get',
-        params: query
-    });
-};
 
-// 游戏薪资官方提现记录 列表
+// CIS公会钻石 - 列表
-export const gameUsdWithdrawExamineList = query => {
+export const getSovietList = query => {
     return request({
-        url: '/gameUsdWithdrawExamine/list',
+        url: '/admin/soviet/list',
         method: 'get',
         params: query
     });
 };
-// 游戏薪资官方提现记录 导出
+// CIS公会钻石 - 导出
-export const gameUsdWithdrawExamineExport = query => {
+export const exportSovietList = query => {
     return request({
-        url: `/gameUsdWithdrawExamine/export`,
+        url: '/admin/soviet/export',
         method: 'post',
         params: query,
         responseType: 'blob'
     });
 };
-
+// CIS公会成员钻石 - 列表
-// 游戏薪资官方提现记录 结算
+export const getSovietMemberList = query => {
-export const gameUsdWithdrawExamineSet = query => {
     return request({
-        url: '/gameUsdWithdrawExamine/batchSettle',
+        url: '/admin/soviet/memberList',
+        method: 'get',
+        params: query
+    });
+};
+// CIS公会成员钻石 - 导出
+export const exportSovietMemberList = query => {
+    return request({
+        url: '/admin/soviet/memberExport',
         method: 'post',
-        params: query
-    });
-};
-// 游戏薪资官方提现记录 批量驳回
-export const batchGameUsdWithdrawExamineReject = query => {
-    return request({
-        url: '/gameUsdWithdrawExamine/batchReject',
-        method: 'post',
-        params: query
-    });
-};
-// 充值代理转增游戏薪资 
-export const chargeGameAgentList = query => {
-    return request({
-        url: '/anchorGameSalaryBill/chargeAgent/list',
-        method: 'get',
-        params: query
-    });
-};
-// 充值代理转增薪资 总值
-export const chargeGameAgentSum = query => {
-    return request({
-        url: '/anchorGameSalaryBill/chargeAgent/sum',
-        method: 'get',
-        params: query
-    });
-};
-//  充值代理转增薪资导出
-export const chargeGameAgentExport = query => {
-    window.location.href = `/anchorGameSalaryBill/chargeAgent/export?${genQueryParam(query)}`;
-    return;
-};
-
-// 游戏薪资明细
-export const getGameUsdList = query => {
-    return request({
-        url: '/gameUsd/detail',
-        method: 'get',
-        params: query
-    });
-};
-// 游戏薪资官方提现方式配置渠道 列表
-export const getGamelistAccountType = query => {
-    return request({
-        url: '/admin/gameUsdWithdrawAccountConfig/listAccountType',
-        method: 'get',
-        params: query
-    });
-};
-// 游戏薪资官方提现方式配置 列表
-export const getGameAccountConfigList = query => {
-    return request({
-        url: '/admin/gameUsdWithdrawAccountConfig/page',
-        method: 'get',
-        params: query
-    });
-};
-// 游戏薪资官方提现方式配置 编辑
-export const saveGameAccountConfig = query => {
-    return request({
-        url: '/admin/gameUsdWithdrawAccountConfig/save',
-        method: 'get',
-        params: query
-    });
-};
-// 房间金币流水 -列表
-export const getRoomWeekDiamondPage = query => {
-    return request({
-        url: '/admin/roomWeekDiamond/page',
-        method: 'get',
-        params: query
-    });
-};
-// 房间金币流水-导出
-export const exportRoomWeekDiamond = query => {
-    return request({
-        url: `/admin/roomWeekDiamond/export`,
-        method: 'get',
         params: query,
         responseType: 'blob'
     });
-}
+};
-// 房间金币流水 -发放
+// CIS房主钻石 - 列表
-export const sendRoomWeekDiamondRaward = query => {
+export const getSovietRoomList = query => {
     return request({
-        url: '/admin/roomWeekDiamond/send',
+        url: '/admin/soviet/roomList',
+        method: 'get',
+        params: query
+    });
+};
+// CIS房主钻石 - 导出
+export const exportSovietRoomList = query => {
+    return request({
+        url: '/admin/soviet/roomExport',
         method: 'post',
-        params: query
-    });
-};
-// 房间金币流水 -档位列表
-export const getRoomWeekDiamondListLevel = query => {
-    return request({
-        url: '/admin/roomWeekDiamond/listLevel',
-        method: 'get',
-        params: query
-    });
-};
-// 主播周奖励 - 列表
-export const getguildMemberWeekLevelRewardPage = query => {
-    return request({
-        url: '/admin/guildMemberWeekLevelReward/page',
-        method: 'get',
-        params: query
-    });
-};
-
-// 主播周奖励 - 周期
-export const getguildMemberWeekLevelRewardListCycleDate = query => {
-    return request({
-        url: '/admin/guildMemberWeekLevelReward/listCycleDate',
-        method: 'get',
-        params: query
-    });
-};
-// 主播周奖励-导出
-export const exportGuildMemberWeekLevelReward = query => {
-    return request({
-        url: `/admin/guildMemberWeekLevelReward/export`,
-        method: 'get',
         params: query,
         responseType: 'blob'
     });
-}
-// 房间日流水 -列表
-export const getRoomSendRankDayRewardPage = query => {
-    return request({
-        url: '/admin/roomSendRank/dayReward/page',
-        method: 'get',
-        params: query
-    });
 };
-// 房间日流水-导出
+// CIS房主钻石 - CIS房主钻石-周期
-export const exportRoomSendRankDayReward = query => {
+export const getRoomCycleDateList = query => {
     return request({
-        url: `/admin/roomSendRank/dayReward/export`,
+        url: '/admin/soviet/roomCycleDateList',
-        method: 'get',
-        params: query,
-        responseType: 'blob'
-    });
-}
-// 房间日流水 -明细
-export const getRoomSendRankDayRewardListDetail = query => {
-    return request({
-        url: '/admin/roomSendRank/dayReward/listDetail',
-        method: 'get',
-        params: query
-    });
-};
-// 半个月周期
-export const getWageStatListDateCycle = query => {
-    return request({
-        url: '/admin/family/wage/stat/listDateCycle',
         method: 'get',
         params: query
     });

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/api/users/userGameDataDetails.js

@@ -1,10 +0,0 @@
-import request from "@/utils/request";
-// 列表
-export const getMiniGameLudoList = query => {
-    return request({
-        url: '/admin/miniGame/ludo/stat',
-        method: 'get',
-        params: query,
-
-    });
-}

src/components/header/index.vue

@@ -6,7 +6,7 @@
             <!-- mini logo for sidebar mini 50x50 pixels -->
             <span class="logo-mini"><b>M</b>S</span>
             <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><b>e-party</b>管理系统</span>
+            <span class="logo-lg"><b>molistar</b>管理系统</span>
         </a>
         <!-- Header Navbar: style can be found in header.less -->
         <nav class="navbar navbar-static-top" role="navigation">
@@ -92,12 +92,4 @@ export default {
 }
 </script>
   
-<style scoped>
+<style scoped></style>
-.navbar,.logo,.user-header{
-    /* background-color: ; */
-    background-color: #04D5C6 !important;
-}
-.sidebar-toggle:hover{
-    background-color:#04D5C6 !important;
-}
-</style>

src/components/maintainer/index.vue

@@ -250,7 +250,4 @@ export default {
   
 <style scoped>
 @import "@/css/main.css";
-.pull-right{
-  background-color:#04D5C6 !important;
-}
 </style>

src/utils/partitionDesc.js

@@ -4,6 +4,7 @@ const partitionInfoMap = {
     4: '华语区',
     8: '土耳其区',
     16: '英语2区',
+    32: '独联体',
 }
 
 export const partitionDesc = (val) => {

src/views/GiftPanelManagement/GiftPanelManagement.vue

@@ -202,6 +202,9 @@ export default {
       } else if (val == 16) {
         this.eidDialogTitle = `编辑礼物面板信息-英语2区`;
         this.eidText = `英语2区`;
+      }else if (val == 32) {
+        this.eidDialogTitle = `编辑礼物面板信息-独联体`;
+        this.eidText = `独联体`;
       }
       this.getData();
     },

src/views/car/CarGoodsAdminView.vue

@@ -117,6 +117,9 @@
                 <input type="checkbox"
                        name="partitionFlag"
                        value="16" />英语2区<br>
+                       <input type="checkbox"
+                       name="partitionFlag"
+                       value="32" />独联体<br>
               </div>
             </div>
             <div class="form-group">
@@ -183,6 +186,36 @@
                        id="pt_name">
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru_name"
+                     class="col-sm-3 control-label">俄语名称</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="ru_name">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_name"
+                     class="col-sm-3 control-label">西班牙名称</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="es_name">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_name"
+                     class="col-sm-3 control-label">乌兹别克名称</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="uz_name">
+              </div>
+            </div>
 
             <div class="form-group">
               <label class="col-sm-3 control-label">使用萝卜购买</label>
@@ -687,6 +720,10 @@ export default {
             { field: 'name.ar', title: '阿语名称', align: 'center', width: '20%' },
             { field: 'name.tr', title: '土耳其语名称', align: 'center', width: '20%' },
             { field: 'name.pt', title: '葡萄牙语名称', align: 'center', width: '20%' },
+            { field: 'name.ru', title: '俄语名称', align: 'center', width: '20%' },
+            { field: 'name.es', title: '西班牙名称', align: 'center', width: '20%' },
+            { field: 'name.uz', title: '乌兹别克名称', align: 'center', width: '20%' },
+
             {
               field: "pic",
               title: "座驾样式",
@@ -726,6 +763,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -921,11 +961,17 @@ export default {
           $('#en_name').val('');
           $('#tr_name').val('');
           $('#pt_name').val('');
+          $('#ru_name').val('');
+          $('#es_name').val('');
+          $('#uz_name').val('');
           $("#name").attr('readonly', false);
           $("#ar_name").attr('readonly', false);
           $("#en_name").attr('readonly', false);
           $("#tr_name").attr('readonly', false);
           $("#pt_name").attr('readonly', false);
+          $("#ru_name").attr('readonly', false);
+          $("#es_name").attr('readonly', false);
+          $("#uz_name").attr('readonly', false);
           // $("#price").attr('readonly', false);
           // $("#renewPrice").attr('readonly', false);
           $("#seq").val('');
@@ -1126,12 +1172,18 @@ export default {
                   $("#en_name").val(jsonName.en);
                   $("#tr_name").val(jsonName.tr);
                   $("#pt_name").val(jsonName.pt);
+                  $("#ru_name").val(jsonName.ru);
+                  $("#es_name").val(jsonName.es);
+                  $("#uz_name").val(jsonName.uz);
                 } else {
                   $("#name").val(name);
                   $("#ar_name").val(name);
                   $("#en_name").val(name);
                   $("#tr_name").val(name);
                   $("#pt_name").val(name);
+                  $("#ru_name").val(name);
+                  $("#es_name").val(name);
+                  $("#uz_name").val(name);
                 }
                 $("#price").val(json.entity.price);
                 $("#renewPrice").val(json.entity.renewPrice);
@@ -1270,6 +1322,11 @@ export default {
                 } else {
                   $("input:checkbox[name='partitionFlag']")[4].checked = false;
                 }
+                if ((partitionFlag & 32) != 0) {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = true;
+                } else {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = false;
+                }
 
                 // 打开编辑弹窗
                 $("#cardGoodsModal").modal('show');
@@ -1353,8 +1410,11 @@ export default {
             // 土耳其名称
             var tr_name = $("#tr_name").val();
             var pt_name = $("#pt_name").val();
+            var ru_name = $("#ru_name").val();
+            var es_name = $("#es_name").val();
+            var uz_name = $("#uz_name").val();
             // 国际化字段
-            var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name, "pt": pt_name }
+            var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name, "pt": pt_name, "ru": ru_name , "es": es_name , "uz": uz_name  }
             const nameValue = JSON.stringify(jsonName);
             // 修改属性值
             formData.name = nameValue; // 将giftName修改为"newGiftName"

src/views/chatbubble/ChatbubbleManageView.vue

@@ -111,6 +111,9 @@
                 <input type="checkbox"
                        name="partitionFlag"
                        value="16" />英语2区<br>
+                       <input type="checkbox"
+                       name="partitionFlag"
+                       value="32" />独联体<br>
               </div>
             </div>
             <div class="form-group">
@@ -181,6 +184,39 @@
                        placeholder="请输入气泡名称">
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru_modal_name"
+                     class="col-sm-4 control-label">俄语装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="ru_modal_name"
+                       placeholder="请输入气泡名称">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_modal_name"
+                     class="col-sm-4 control-label">西班牙语装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="es_modal_name"
+                       placeholder="请输入气泡名称">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_modal_name"
+                     class="col-sm-4 control-label">乌兹别克语装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="uz_modal_name"
+                       placeholder="请输入气泡名称">
+              </div>
+            </div>
             <form class="form-horizontal"
                   id="addForm1">
               <div class="form-group">
@@ -370,6 +406,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -378,6 +417,9 @@ export default {
             { field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%' },
             { field: 'name.tr', title: '土耳其语扮名称', align: 'middle', width: '5%' },
             { field: 'name.pt', title: '葡萄牙语名称', align: 'middle', width: '5%' },
+            { field: 'name.ru', title: '俄语名称', align: 'middle', width: '5%' },
+            { field: 'name.es', title: '西班牙语名称', align: 'middle', width: '5%' },
+            { field: 'name.uz', title: '乌兹别克语名称', align: 'middle', width: '5%' },
             {
               field: 'iosUrl',
               title: '装扮图片',
@@ -538,6 +580,9 @@ export default {
             // 土耳其名称
             $("#tr_modal_name").val(row.name.tr);
             $("#pt_modal_name").val(row.name.pt);
+            $("#ru_modal_name").val(row.name.ru);
+            $("#es_modal_name").val(row.name.es);
+            $("#uz_modal_name").val(row.name.uz);
           } else {
             $("#modal_name").val(name);
             // 阿语名称
@@ -547,6 +592,9 @@ export default {
             // 土耳其名称
             $("#tr_modal_name").val(name);
             $("#pt_modal_name").val(name);
+            $("#ru_modal_name").val(name);
+            $("#es_modal_name").val(name);
+            $("#uz_modal_name").val(name);
           }
           $('#addAndroidIconPicUrl').attr("src", row.androidUrl);
           $("#addForm #androidUrl").val(row.androidUrl);
@@ -580,6 +628,11 @@ export default {
           } else {
             $("input:checkbox[name='partitionFlag']")[4].checked = false;
           }
+          if ((partitionFlag & 32) != 0) {
+            $("input:checkbox[name='partitionFlag']")[5].checked = true;
+          } else {
+            $("input:checkbox[name='partitionFlag']")[5].checked = false;
+          }
           $("#addModal").modal('show');
         });
 
@@ -645,8 +698,11 @@ export default {
           // 土耳其名称
           var tr_name = $("#tr_modal_name").val();
           var pt_name = $("#pt_modal_name").val();
+          var ru_name = $("#ru_modal_name").val();
+          var es_name = $("#es_modal_name").val();
+          var uz_name = $("#uz_modal_name").val();
           // 国际化字段
-          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name, "pr": pt_name }
+          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name, "pr": pt_name , "ru": ru_name, "es": es_name, "uz": uz_name}
           const nameValue = JSON.stringify(jsonName);
           // 修改属性值
           formData.name = nameValue; // 将giftName修改为"newGiftName"
@@ -688,6 +744,21 @@ export default {
             $("#tipModal").modal('show');
             return;
           }
+          if (isEmpty(ru_name)) {
+            $("#tipMsg").text("俄语装扮名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (isEmpty(es_name)) {
+            $("#tipMsg").text("西班牙语装扮名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (isEmpty(uz_name)) {
+            $("#tipMsg").text("乌兹别克语装扮名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
           if ($("#addForm").validationEngine('validate')) {
             console.log('$("#addForm").serialize()', $("#addForm").serialize())
             $.ajax({
@@ -728,6 +799,9 @@ export default {
           $('#en_modal_name').val('');
           $('#tr_modal_name').val('');
           $('#pt_modal_name').val('');
+          $('#ru_modal_name').val('');
+          $('#es_modal_name').val('');
+          $('#uz_modal_name').val('');
           $('input[name="partitionFlag"]').each(function () {
             $(this).checked = false;
           });

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/data/userGameDataDetails.vue

@@ -1,185 +0,0 @@
-<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="请输入用户ID"
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span class="demonstration">游戏渠道</span>
-      <el-select v-model="formData.entrance" placeholder="请选择">
-        <el-option label="全部" :value="''"></el-option>
-        <el-option label="首页" :value="1"></el-option>
-        <el-option label="房间" :value="2"></el-option>
-      </el-select>
-    </div>
-    <div class="inquire" style="margin-top: 20px">
-      <span class="demonstration">日期</span>
-      <el-date-picker
-        v-model="dataTime"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      >
-      </el-date-picker>
-    </div>
-    <el-button style="" type="primary" @click="getData()">查询</el-button>
-    <div class="title_txt">
-       <span>游戏总耗时:{{ totalDurationFormatter }} </span> 
-       <span>游戏次数:{{ roundCount }} </span> 
-       <span>消耗钻石完成次数:{{ paidRoundCount }} </span> 
-    </div> 
-    <!-- 表格数据 -->
-    <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="partitionDesc" align="center" label="分区" />
-      <el-table-column prop="mgName" align="center" label="游戏昵称" />
-      <el-table-column prop="mgId" align="center" label="游戏ID" />
-      <el-table-column prop="startTime" align="center" label="游戏开始时间" />
-      <el-table-column prop="playerNum" align="center" label="游戏参与人数" />
-      <el-table-column prop="durationFormatter" align="center" label="游戏耗时" />
-      <el-table-column prop="erbanNo" align="center" label="用户ID" />
-      <el-table-column prop="nick" align="center" label="用户昵称" />
-      <el-table-column prop="entranceDesc" align="center" label="游戏渠道" />
-      <el-table-column prop="ticket" align="center" label="消耗钻石" />
-      <el-table-column prop="isWinner" align="center" label="赢家" >
-        <template v-slot="scope">
-            {{ scope.row.isWinner? '是' : '否' }}
-        </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"
-    />
-  </div>
-</template>
-<script>
-import PartitionSelect from "../common/partitionSelect.vue";
-export default {
-  name: "userGameDataDetails",
-  components: { PartitionSelect },
-};
-</script>
-<script setup>
-import { ref, onMounted, reactive, computed } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { dateFormat } from "@/utils/system-helper";
-import {getMiniGameLudoList } from "@/api/users/userGameDataDetails.js";
-const dataTime = ref("");
-const formData = reactive({
-  partitionId: undefined,
-  pageNo: 1,
-  pageSize: 10,
-  erbanNo: "",
-  startTime: "",
-  endTime: "",
-  entrance:''
-});
-const tableData = reactive({
-  data: [],
-  total: 0,
-  loading: false,
-});
-const paidRoundCount = ref('0');
-const roundCount = ref('0');
-const totalDurationFormatter = ref('0');
-const getData = () => {
-  tableData.loading = true;
-  if (dataTime.value && dataTime.value.length > 0) {
-    formData.startTime = dateFormat(dataTime.value[0], "yyyy-MM-dd");
-    formData.endTime = dateFormat(dataTime.value[1], "yyyy-MM-dd");
-  } else {
-    formData.startTime = dataTime.value;
-    formData.endTime = dataTime.value;
-  }
-  getMiniGameLudoList(formData).then((res) => {
-    if (res.code === 200) {
-      tableData.data = res.data.page.records;
-      tableData.total = res.data.page.total;
-      tableData.loading = false;
-      if(formData.pageNo == 1){
-        paidRoundCount.value = res.data.paidRoundCount;
-        roundCount.value = res.data.roundCount;
-        totalDurationFormatter.value = res.data.totalDurationFormatter;
-      }
-    } else {
-      tableData.loading = false;
-      ElMessage.error(res.message);
-    }
-  });
-};
-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;
-}
-.title_txt{
-    font-weight: 600;
-    margin-top: 20px;
-    span{
-        margin-right: 20px;
-    }
-}
-</style>

src/views/dressShop/DressShopAdminView.vue

@@ -270,6 +270,41 @@ export default {
             valign: "middle",
             width: "10%",
           },
+          {
+            field: "name.tr",
+            title: "土耳其装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.pt",
+            title: "葡萄牙语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.ru",
+            title: "俄语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.es",
+            title: "西班牙语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.uz",
+            title: "乌兹别克语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
           {
             field: "pic",
             title: "装扮图片",

src/views/firstpage/RecommendResourceAdminView.vue

@@ -280,6 +280,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },

src/views/giftPackCenter/distributionRecord.vue

@@ -52,6 +52,27 @@
         <template v-slot="scope">{{
           getJsonField(scope.row.packName, "pt")
         }}</template>
+      </el-table-column>
+       <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-俄语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "ru")
+        }}</template>
+      </el-table-column>
+       <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-西班牙语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "es")
+        }}</template>
+      </el-table-column>
+       <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-乌兹别克语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "uz")
+        }}</template>
       </el-table-column>
       <el-table-column prop="erbanNo"
                        align="center"

src/views/giftPackCenter/giftPackageConfiguration.vue

@@ -56,6 +56,27 @@
           getJsonField(scope.row.packName, "pt")
         }}</template>
       </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-俄语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "ru")
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-西班牙语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "es")
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-乌兹别克语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "uz")
+        }}</template>
+      </el-table-column>
       <el-table-column prop="status"
                        align="center"
                        label="礼包状态">
@@ -174,6 +195,28 @@
                   style="width: 50%"
                   class="input"></el-input>
       </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">礼包名称-俄语</span>
+        <el-input v-model="addFormData.packNameRu"
+                  style="width: 50%"
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">礼包名称-西班牙语</span>
+        <el-input v-model="addFormData.packNameEs"
+                  style="width: 50%"
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">礼包名称-乌兹别克语</span>
+        <el-input v-model="addFormData.packNameUz"
+                  style="width: 50%"
+                  class="input"></el-input>
+      </div>
+      
       <div class="selectBox selectBoxImg">
         <span class="left"
               style="display: inline-block; margin-right: 20px; width: 100px">礼包样式</span>
@@ -372,6 +415,9 @@ export default {
       packNameAr: "",
       packNameTr: "",
       packNamePt: "",
+      packNameRu: "",
+      packNameEs: "",
+      packNameUz: "",
       awardId: "",
       erbanNo: "",
       packNum: "",
@@ -418,6 +464,9 @@ export default {
           ar: addFormData.packNameAr,
           tr: addFormData.packNameTr,
           pt: addFormData.packNamePt,
+          ru: addFormData.packNameRu,
+          es: addFormData.packNameEs,
+          uz: addFormData.packNameUz,
         }),
         partitionId: addFormData.partitionId,
       };
@@ -453,6 +502,9 @@ export default {
         packNameAr: "",
         packNameTr: "",
         packNamePt: "",
+        packNameRu: "",
+        packNameEs: "",
+        packNameUz: "",
         awardId: "",
         erbanNo: "",
         packNum: "",
@@ -468,6 +520,9 @@ export default {
         addFormData.packNameAr = JSON.parse(row.packName).ar;
         addFormData.packNameTr = JSON.parse(row.packName).tr;
         addFormData.packNamePt = JSON.parse(row.packName).pt;
+        addFormData.packNameRu = JSON.parse(row.packName).ru;
+        addFormData.packNameEs = JSON.parse(row.packName).es;
+        addFormData.packNameUz = JSON.parse(row.packName).uz;
       }
       addDialog.value = true;
     };

src/views/giftPackCenter/usageRecord.vue

@@ -56,6 +56,27 @@
           getJsonField(scope.row.packName, "pt")
         }}</template>
       </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-俄语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "ru")
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-西班牙语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "es")
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="packName"
+                       align="center"
+                       label="礼包名称-乌兹别克语">
+        <template v-slot="scope">{{
+          getJsonField(scope.row.packName, "uz")
+        }}</template>
+      </el-table-column>
       <el-table-column prop="erbanNo"
                        align="center"
                        label="用户ID" />

src/views/guildOperationManagement/DailyTaskRewardCollection.vue

@@ -0,0 +1,280 @@
+<template>
+  <div class="box">
+    <!-- 表格数据 -->
+    <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="statDate" align="center" label="日期" />
+      <el-table-column
+        prop="reachNum"
+        align="center"
+        label="公会成员达到人数"
+      />
+      <el-table-column
+        prop="receiveNum"
+        align="center"
+        label="公会成员领取人数"
+      >
+        <template v-slot="scope">
+          <el-button @click="detailFun(scope.row)" type="text" size="small">
+            {{ scope.row.receiveNum }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="guildMemberNumn"
+        align="center"
+        label="公会成员人数"
+      />
+    </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="dailydetailDialog"
+      title="日任务奖励领取明细"
+      width="60%"
+      center
+    >
+      <div>
+        <div class="inquire">
+          <span>用户ID:</span>
+          <el-input v-model="detailData.erbanNo" placeholder="" class="input" />
+        </div>
+        <div class="inquire">
+          <span>设备:</span>
+          <el-input
+            v-model="detailData.deviceId"
+            placeholder="支持模糊搜索"
+            class="input"
+          />
+        </div>
+        <div class="inquire">
+          <span>IP:</span>
+          <el-input
+            v-model="detailData.ip"
+            placeholder="支持模糊搜索"
+            class="input"
+          />
+        </div>
+        <el-button style="" type="primary" @click="detailFun()">查询</el-button>
+        <el-button style="" type="primary" @click="confirmExport2Excel()"
+          >导出</el-button
+        >
+      </div>
+      <el-table
+        :data="detailtableData.data"
+        style="width: 100%; margin-top: 30px"
+        ref="multipleTable"
+        border
+      >
+        <el-table-column prop="guildId" align="center" label="公会ID" />
+        <el-table-column prop="erbanNo" align="center" label="用户ID" />
+        <el-table-column prop="uid" align="center" label="用户UID" />
+        <el-table-column prop="deviceId" align="center" label="领取设备" />
+        <el-table-column prop="ip" align="center" label="领取IP" />
+        <el-table-column prop="statusStr" align="center" label="主播状态" />
+        <el-table-column prop="receiveTime" align="center" label="领取时间" />
+      </el-table>
+      <el-pagination
+        style="margin-top: 10px"
+        class="paginationClass"
+        :current-page="detailData.pageNo"
+        :page-size="detailData.pageSize"
+        :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: "DailyTaskRewardCollection",
+};
+</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 {
+  getDailyTaskCoinRecvNums,
+  getDailyTaskcoinRecvDetail,
+  exportMiniGameDetail,
+} from "@/api/DailyTaskRewardCollection/DailyTaskRewardCollection";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const detailData = reactive({
+  partitionId: "",
+  statDate: "",
+  pageNo: 1,
+  pageSize: 10,
+  deviceId: "",
+  ip: "",
+  erbanNo: "",
+});
+const detailtableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const dailydetailDialog = ref(false);
+
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  getDailyTaskCoinRecvNums(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data.rows;
+      tableData.loading = false;
+      tableData.total = res.data.total;
+    } else {
+      tableData.loading = false;
+
+      ElMessage.error(res.message);
+    }
+  });
+};
+// 明细
+const detailFun = (row) => {
+  if (row) {
+    detailData.partitionId = row.partitionId;
+    detailData.statDate = row.statDate;
+  }
+  getDailyTaskcoinRecvDetail(detailData).then((res) => {
+    if (res.code == 200) {
+      detailtableData.data = res.data.rows;
+      detailtableData.loading = false;
+      detailtableData.total = res.data.total;
+      dailydetailDialog.value = true;
+    } else {
+      ElMessage.error(res.message);
+    }
+  });
+};
+// 导出
+const confirmExport2Excel = 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 handleSizeChange = (val) => {
+  formData.pageSize = val;
+  getData();
+};
+const handleCurrentChange = (val) => {
+  formData.pageNo = val;
+  getData();
+};
+const handleSizeChangeDetail = (val) => {
+  detailData.pageSize = val;
+  detailFun();
+};
+const handleCurrentChangeDetail = (val) => {
+  detailData.pageNo = val;
+  detailFun();
+};
+onMounted(() => {
+  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;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>

src/views/guildOperationManagement/GuildSozinhoInfoNew.vue

@@ -29,6 +29,20 @@
                                  v-model:after-init="getData" />
       </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>
     <div class="inquire">
       <span>邀请人ID</span>
       <el-input v-model="inquire.inviteErbanNo"
@@ -732,8 +746,8 @@ export default {
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
         regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
-        // startDate: startTime,
+        startTime: startTime,
-        // endDate: endTime,
+        endTime: endTime,
         inviteErbanNo: this.inquire.inviteErbanNo,
         pageNum: this.currentPage,
         pageSize: this.pageSize,

src/views/guildOperationManagement/agencyDiamondFlow.vue

@@ -27,13 +27,13 @@
                                        v-model:after-init="getData" />
             </el-form-item>
             <el-form-item label="公会ID"
-                          prop="guildId">
+                          prop="agencyId">
-              <el-input v-model.trim="searchForm.guildId"
+              <el-input v-model.trim="searchForm.agencyId"
                         placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="公会长ID"
-                          prop="guildOwnerErbanNo">
+                          prop="agencyOwnerId">
-              <el-input v-model.trim="searchForm.guildOwnerErbanNo"
+              <el-input v-model.trim="searchForm.agencyOwnerId"
                         placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="周期"
@@ -74,55 +74,44 @@
                            prop="partitionDesc"
                            label="分区"> </el-table-column>
           <el-table-column align="center"
-                           prop="guildId"
+                           prop="agencyId"
                            label="公会ID">
           </el-table-column>
           <el-table-column align="center"
-                           prop="guildName"
+                           prop="agencyName"
                            label="公会名称">
           </el-table-column>
           <el-table-column align="center"
-                           prop="memberCount"
+                           prop="hallMemberCount"
                            label="主播人数">
           </el-table-column>
           <!-- <el-table-column align="center" prop="agencyAbbr" label="公会国家"> </el-table-column> -->
           <el-table-column align="center"
-                           prop="guildOwnerUid"
+                           prop="agencyErbanNo"
                            label="公会长ID">
           </el-table-column>
           <el-table-column align="center"
-                           prop="guildOwnerRegionId"
+                           prop="agencyRegionName"
                            label="公会长地区">
           </el-table-column>
           <el-table-column align="center"
-                           prop="diamondNum"
+                           prop="energyValue"
                            label="总钻石流水">
             <template v-slot="scope">
               {{
-                scope.row.diamondNum
+                scope.row.energyValue
               }}
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           prop="activeMemberCount"
+                           prop="salaryRate"
-                           label="公会有效主播">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="activeMemberBonusRatio"
-                           label="公会有效主播薪资比例">
-                           <template v-slot="scope">
-              {{ toPercentage(scope.row.activeMemberBonusRatio) }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="baseSalaryRatio"
                            label="公会长薪资比例">
             <template v-slot="scope">
-              {{ toPercentage(scope.row.baseSalaryRatio) }}
+              {{ scope.row.salaryRate ? scope.row.salaryRate + "%" : "0%" }}
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           prop="totalSalary"
+                           prop="hallSalary"
                            label="公会长薪资">
           </el-table-column>
         </el-table>
@@ -165,8 +154,8 @@ export default {
             },
             // 搜索表单相关
             searchForm: {
-                guildOwnerErbanNo: null,
+                agencyOwnerId: null,
-                guildId: null,
+                agencyId: null,
                 dateCycle: null,
                 region: null,
                 partitionId: undefined,
@@ -316,11 +305,7 @@ export default {
         },
         headerCopy(column, e) {
             this.$copy(column.label);
-        },
+        }
-            // 百分比
-     toPercentage  (value) {
-      return (value * 100).toFixed(2) + "%";
-    }
     },
     computed: {
         convertTimestamp1() {

src/views/guildOperationManagement/agentSendGameSalary.vue

@@ -1,318 +0,0 @@
-<template>
-  <div class="agent-send-salary">
-    <div class="container">
-      <div class="handle-box">
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          :rules="searchRule"
-          label-width="90px"
-          :disabled="tableLoading"
-        >
-          <div class="search-line">
-            <el-form-item label="分区" prop="partitionId">
-              <partition-select v-model:partition-id="searchForm.partitionId"
-                                v-model:partition-infos="partitionArr"
-                                v-model:after-init="getData"
-              />
-            </el-form-item>
-            <el-form-item label="充值代理ID" prop="chargeAgentErbanNo">
-              <el-input
-                v-model.trim="searchForm.chargeAgentErbanNo"
-                placeholder="请输入"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="主播ID" prop="erbanNo">
-              <el-input
-                v-model.trim="searchForm.erbanNo"
-                placeholder="请输入"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="时间" class="large">
-              <el-form-item prop="startTime">
-                <el-date-picker
-                  type="datetime"
-                  placeholder="选择开始时间"
-                  v-model="searchForm.startTime"
-                ></el-date-picker>
-              </el-form-item>
-              <el-col :span="2" align="center">-</el-col>
-              <el-form-item prop="endTime">
-                <el-date-picker
-                  type="datetime"
-                  placeholder="选择结束时间"
-                  v-model="searchForm.endTime"
-                ></el-date-picker>
-              </el-form-item>
-            </el-form-item>
-            <div class='title'>统计时间按照东八区统计。东三区时间筛选需要增加5小时！！！！！</div> 
-
-            <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="chargeGameAgentExportFun"
-                >导出</el-button
-              >
-            </el-form-item>
-          </div>
-        </el-form>
-        <el-button type="text" class="total"
-          >转增薪资总额:{{ total ? total.toLocaleString() : "0" }}</el-button
-        >
-      </div>
-      <div class="table">
-        <el-table
-          :data="tableData"
-          border
-          v-loading="tableLoading"
-          @header-click="headerCopy"
-          style="width: 100%"
-        >
-          <el-table-column align="center" prop="partitionDesc" label="分区">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="receiveErbano"
-            label="充值代理ID"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="receiveNick"
-            label="充值代理昵称"
-          >
-          </el-table-column>
-          <!-- <el-table-column
-            align="center"
-            prop="receiveAbbr"
-            label="充值代理国家"
-          >
-          </el-table-column> -->
-          <el-table-column align="center" prop="erbano" label="主播ID">
-          </el-table-column>
-          <el-table-column align="center" prop="nick" label="主播昵称">
-          </el-table-column>
-          <!-- <el-table-column align="center" prop="abbr" label="主播国家">
-          </el-table-column> -->
-          <el-table-column align="center" prop="tradeUsb" label="转增游戏薪资">
-          </el-table-column>
-          <el-table-column align="center" prop="gold" label="对应金币数">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="createTimeStr"
-            label="创建时间"
-            width="160"
-          >
-          </el-table-column>
-        </el-table>
-      </div>
-      <table-pagination
-        :pageParams="pageParams"
-        :pageTotal="pageTotal"
-        :page-sizes="[10, 20, 100, 200]"
-        @handleSizeChange="handleSizeChange"
-        @handlePageChange="handlePageChange"
-      ></table-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  chargeGameAgentList,
-  chargeGameAgentSum,
-  chargeGameAgentExport,
-} from "@/api/relAgency/relAgency.js";
-import TablePagination from "@/components/common/TablePagination";
-import { formatDate, formatDateYMD } from "@/utils/relDate";
-import { dateFormat } from "@/utils/system-helper";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-import { ref } from "vue";
-import PartitionSelect from "@/views/common/partitionSelect.vue";
-export default {
-  name: "agentSendGameSalary",
-  components: {PartitionSelect, TablePagination },
-  data() {
-    return {
-      total: 0,
-      btnLoading: false, // 导出弹出框(dialog)的确认按钮
-      tableLoading: false, // 表格是否加载中
-
-      tableData: [], // 接口返回的表格数据
-      pageTotal: 0, // 接口返回的表格总条数
-      pageParams: {
-        pageNo: 1,
-        pageSize: 20,
-      },
-      // 搜索表单相关
-      searchForm: {
-        erbanNo: null,
-        chargeAgentErbanNo: null,
-        startTime: null,
-        endTime: null,
-        partitionId: undefined,
-      },
-      partitionArr: [],
-      searchRule: {
-        startTime: [
-          {
-            validator: (rule, value, callback) => {
-              this.$refs["searchForm"].validateField("endTime");
-              callback();
-            },
-            trigger: "change",
-          },
-        ],
-        endTime: [
-          {
-            validator: (rule, value, callback) => {
-              const { startTime } = this.searchForm;
-              if (startTime !== null && startTime !== "" && value) {
-                if (value <= startTime) {
-                  callback(new Error("须晚于开始时间"));
-                } else {
-                  callback();
-                }
-              } else {
-                callback();
-              }
-            },
-            trigger: "change",
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    getData() {
-      this.tableLoading = true;
-
-      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);
-
-      chargeGameAgentList(pageParams).then((res) => {
-        this.tableLoading = false;
-        if (res.code == 200) {
-          let data = res.data;
-          this.tableData = data.records;
-          this.pageTotal = data.total;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-      chargeGameAgentSum(pageParams).then((res) => {
-        if (res.code == 200) {
-          this.total = res.data;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-    },
-    // 导出
-    chargeGameAgentExportFun() {
-
-      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);
-
-      chargeGameAgentExport(pageParams).then((res) => {});
-    },
-    // 点击搜索
-    handSearch() {
-      this.$refs["searchForm"].validate((valid) => {
-        if (valid) {
-          this.pageParams.pageNo = 1;
-          this.getData();
-        }
-      });
-    },
-    // 重置搜索表单
-    resetSearchForm() {
-      this.$refs["searchForm"].resetFields();
-      this.pageParams.pageNo = 1;
-      this.getData();
-    },
-
-    // 分页导航
-    handleSizeChange(val) {
-      // this.$set(this.pageParams, 'pageSize', val);
-      this.pageParams.pageSize = val;
-      this.getData();
-    },
-    handlePageChange(val) {
-      // this.$set(this.pageParams, 'pageNo', val);
-      this.pageParams.pageNo = val;
-      this.getData();
-    },
-    headerCopy(column, e) {
-      this.$copy(column.label);
-    },
-  }
-};
-</script>
-
-<style scope>
-.exportBtn {
-  margin-bottom: 20px;
-}
-.total {
-  font-size: 18px;
-}
-.container {
-  width: 100%;
-}
-.search-line {
-  width: 38%;
-}
-.title{
-  color: red;
-  font-size: 16px;
-  margin-bottom: 18px;
-  margin-left:40px;
-}
-</style>

src/views/guildOperationManagement/amethystClearRecord.vue

@@ -1,46 +1,33 @@
 <template>
   <div class="box">
     <div class="inquire">
-      <span>分区</span>
+      <span>公会ID:</span>
-      <partition-select v-model:partition-id="formData.partitionId" />
+      <el-input v-model="formData.guildId" placeholder="" class="input" />
     </div>
     <div class="inquire">
-      <span>用户ID</span>
+      <span>公会长ID:</span>
-      <el-input
+      <el-input v-model="formData.ownerErbanNo" placeholder="" class="input" />
-        v-model="formData.erbanNo"
-        placeholder="请输入用户ID"
-        class="input"
-      ></el-input>
     </div>
     <div class="inquire">
-      <span>公会ID</span>
+      <span>主播ID:</span>
-      <el-input
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
-        v-model="formData.guildId"
-        placeholder="请输入用户ID"
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span>公会长ID</span>
-      <el-input
-        v-model="formData.ownerErbanNo"
-        placeholder="请输入用户ID"
-        class="input"
-      ></el-input>
     </div>
     <div class="inquire">
       <span>周期</span>
-      <el-select v-model="formData.cycleDate" placeholder="请选择">
+      <el-select v-model="formData.cycleDate" placeholder="请选择" clearable>
         <el-option
-          v-for="(item,index) in dateCycleArr"
+          v-for="item in dateCycleArr"
-          :key="index"
+          :key="item.cycleDate"
-          :label="item.startDateStr + '~' + item.endDateStr"
+          :label="item.intervalFormatter"
-          :value="item.dateCycle"
+          :value="item.cycleDate"
         >
         </el-option>
       </el-select>
     </div>
     <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button style="" type="primary" @click="confirmExportExcel()"
+      >导出</el-button
+    >
     <!-- 表格数据 -->
     <el-table
       v-loading="tableData.loading"
@@ -50,16 +37,17 @@
       border
       style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="partitionDesc" align="center" label="分区" />
-      <el-table-column prop="statDate" align="center" label="日期" />
-      <el-table-column prop="erbanNo" align="center" label="用户ID" />
-      <el-table-column prop="nick" align="center" label="用户昵称" />
       <el-table-column prop="guildId" align="center" label="公会ID" />
       <el-table-column prop="guildName" align="center" label="公会昵称" />
-      <el-table-column prop="diamondNum" align="center" label="投入钻石" />
+      <el-table-column prop="uid" align="center" label="主播UID" />
-      <el-table-column prop="playGameNum" align="center" label="游戏次数" />
+      <el-table-column prop="erbanNo" align="center" label="主播ID" />
-      <el-table-column prop="gameUsd" align="center" label="游戏薪资" />
+      <el-table-column prop="nick" align="center" label="主播昵称" />
-      <el-table-column prop="purseUsd" align="center" label="剩余薪资" />
+      <el-table-column prop="guildCrystalNum" align="center" label="清除紫水晶数" />
+            <el-table-column align="center" prop="createTime" label="清除时间">
+        <template v-slot="scope">{{
+          dateFormat(scope.row.createTime)
+        }}</template>
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <el-pagination
@@ -77,18 +65,20 @@
 </template>
 
 <script>
-import PartitionSelect from "../common/partitionSelect.vue";
 export default {
-  name: "gameSalaryDetails",
+  name: "amethystClearRecord",
-  components: { PartitionSelect },
 };
 </script>
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { getDateCycleList ,getGameUsdList} from "@/api/relAgency/relAgency.js";
+import {
+  getGuildAmethystClearRecordList,
+  exportClearAmethyst,
+  getGuildPolicyCycleDates,
+} from "@/api/SalaryDetails/SalaryDetails.js";
+import { formatDate } from "@/utils/relDate";
 const formData = reactive({
-  partitionId: undefined,
   pageNo: 1,
   pageSize: 10,
   erbanNo: "",
@@ -96,30 +86,57 @@ const formData = reactive({
   ownerErbanNo: "",
   cycleDate: "",
 });
-const dateCycleArr = ref([]);
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const dateCycleArr = ref([]);
 // 查询
 const getData = () => {
   tableData.loading = true;
-  getGameUsdList(formData).then((res) => {
+  getGuildAmethystClearRecordList(formData).then((res) => {
     if (res.code == 200) {
       tableData.data = res.data.rows;
-      tableData.loading = false;
       tableData.total = res.data.total;
+      tableData.loading = false;
     } else {
       tableData.loading = false;
       ElMessage.error(res.message);
     }
   });
 };
-// const dateFormat = (row) => {
+// 导出
-//   const date = new Date(row);
+const confirmExportExcel = async () => {
-//   return date.format("yyyy-MM-dd hh:mm:ss");
+  // Object.assign(formData, { pageSize: 10000, pageNo: 1 });
-// }
+  try {
+    const res = await exportClearAmethyst(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 dateFormat = (row) => {
+      const date = new Date(row);
+      return date.format("yyyy-MM-dd hh:mm:ss");
+    }
 const handleSizeChange = (val) => {
   formData.pageSize = val;
   getData();
@@ -129,10 +146,9 @@ const handleCurrentChange = (val) => {
   getData();
 };
 onMounted(() => {
-
+  getGuildPolicyCycleDates().then((res) => {
-  getDateCycleList({ month: 3 }).then((res) => {
     if (res.code == 200) {
-      dateCycleArr.value = res.data || [];
+      dateCycleArr.value = res.data;
     } else {
       ElMessage({
         showClose: true,
@@ -178,4 +194,8 @@ onMounted(() => {
   line-height: 35px;
   margin-bottom: 20px;
 }
+
+.selectBoxImg {
+  height: 150px;
+}
 </style>

src/views/guildOperationManagement/anchorGameSalaryOperation.vue

@@ -1,657 +0,0 @@
-<template>
-  <div class="anchor-salary-operate">
-    <div class="container">
-      <div class="handle-box">
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          :rules="searchRule"
-          label-width="90px"
-          :disabled="tableLoading"
-        >
-          <div class="search-line">
-            <el-form-item label="分区" prop="partitionId">
-              <partition-select
-                v-model:partition-id="searchForm.partitionId"
-                v-model:partition-infos="partitionArr"
-                v-model:after-init="getData"
-              />
-            </el-form-item>
-            <el-form-item label="主播ID" prop="erbanNo">
-              <el-input
-                v-model.trim="searchForm.erbanNo"
-                placeholder="请输入"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="公会ID" prop="agencyId">
-              <el-input
-                v-model.trim="searchForm.agencyId"
-                placeholder="请输入"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="公会长ID" prop="agencyOwnerId">
-              <el-input
-                v-model.trim="searchForm.agencyOwnerId"
-                placeholder="请输入"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="周期" prop="dateCycle">
-              <el-select placeholder="请选择" v-model="searchForm.dateCycle">
-                <el-option
-                  v-for="(item, i) in dateCycleList"
-                  :key="i"
-                  :label="item.startDateStr + '~' + item.endDateStr"
-                  :value="item.dateCycle"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label-width="40px">
-              <el-button type="primary" @click="handSearch">搜索</el-button>
-              <el-button plain @click="resetSearchForm">重置搜索</el-button>
-            </el-form-item>
-          </div>
-        </el-form>
-      </div>
-      <div class="table">
-        <el-table
-          :data="tableData"
-          border
-          v-loading="tableLoading"
-          @header-click="headerCopy"
-          style="width: 100%"
-        >
-          <!-- <el-table-column align="center" prop="dateCycle" label="周期" width="105">
-                        <template v-slot="scope">
-                            {{ dateCycleType(scope.row.dateCycle) }}
-                        </template>
-                    </el-table-column> -->
-          <el-table-column align="center" prop="partitionDesc" label="分区" />
-          <el-table-column align="center" prop="erbano" label="主播ID">
-          </el-table-column>
-          <el-table-column align="center" prop="nick" label="主播昵称">
-          </el-table-column>
-          <el-table-column align="center" prop="agencyId" label="公会ID">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="agencyOwnerErbanNo"
-            label="公会长ID"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="agencyOwnerRegionDesc"
-            label="公会长地区"
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="gameUsd"
-            label="本周起获得游戏薪资"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(0, scope.row)">
-                {{ scope.row.gameUsd + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="receiveUsd"
-            label="本周期已领取的薪资"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(1, scope.row)">
-                {{ scope.row.receiveUsd + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="usbToAgent"
-            label="薪资转增代理"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(3, scope.row)">
-                {{ scope.row.usbToAgent + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="usbToOwner"
-            label="薪资转增公会长"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(4, scope.row)">
-                {{ scope.row.usbToOwner + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="officialWithdram"
-            label="官方提现"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(5, scope.row)">
-                {{ scope.row.officialWithdram + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="platformOperationUsb"
-            label="官方操作"
-          >
-            <template v-slot="scope">
-              <el-button type="text" @click="handleOpen(9, scope.row)">
-                {{ scope.row.platformOperationUsb + "us" }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="usb" label="剩余薪资">
-          </el-table-column>
-        </el-table>
-      </div>
-      <table-pagination
-        :pageParams="pageParams"
-        :pageTotal="pageTotal"
-        :page-sizes="[10, 20, 100, 200]"
-        @handleSizeChange="handleSizeChange"
-        @handlePageChange="handlePageChange"
-      ></table-pagination>
-    </div>
-
-    <!-- 弹出框 -->
-    <el-dialog :title="dialogTitle" v-model="dialogVisible" width="60%">
-      <el-table
-        :data="dialogData"
-        border
-        class="received-table"
-        v-loading="dialogLoading"
-      >
-        <el-table-column prop="createTime" label="日期" align="center">
-          <template v-slot="scope">{{
-            convertTimestamp(scope.row.createTime)
-          }}</template>
-        </el-table-column>
-        <el-table-column
-          prop="nick"
-          label="主播昵称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="erbano"
-          label="主播ID"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          prop="playGameNum"
-          label="完成次数"
-          v-if="dialogType == 0"
-        >
-          <template v-slot="scope">
-            {{ scope.row.playGameNum }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="gameUsd"
-          label="获得薪资"
-          v-if="dialogType == 0"
-        >
-          <template v-slot="scope">
-            {{ scope.row.gameUsd }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="tradeUsb"
-          label="领取薪资"
-          v-if="dialogType == 1"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="receiveStatDate"
-          label="薪资产生时间"
-          v-if="dialogType == 1"
-        >
-          <template v-slot="scope">
-            {{ scope.row.receiveStatDate }}
-          </template>
-        </el-table-column>
-        <!-- 薪资兑换金币6 -->
-        <el-table-column
-          v-if="dialogType == 6"
-          prop="gold"
-          label="兑换金币数量"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.gold ? scope.row.gold.toLocaleString() : "0" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="dialogType == 6"
-          prop="tradeUsb"
-          label="兑换薪资数"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb + "us" }}
-          </template>
-        </el-table-column>
-        <!-- 薪资转增代理2 -->
-        <el-table-column
-          v-if="dialogType == 2"
-          prop="receiveErbano"
-          label="充值代理ID"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          v-if="dialogType == 2"
-          prop="receiveNick"
-          label="充值代理名称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          v-if="dialogType == 2"
-          prop="beforeUsb"
-          label="当前薪资"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.beforeUsb + "us" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="dialogType == 2"
-          prop="tradeUsb"
-          label="转增代理"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb + "us" }}
-          </template>
-        </el-table-column>
-        <!-- 薪资转增公会长3 -->
-        <el-table-column
-          v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
-          prop="receiveNick"
-          label="公会长昵称"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
-          prop="receiveErbano"
-          label="公会长ID"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          v-if="dialogType == 3"
-          prop="tradeUsb"
-          label="转增公会长"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb + "us" }}
-          </template>
-        </el-table-column>
-        <!-- 官方提现4 -->
-        <el-table-column
-          v-if="dialogType == 4"
-          prop="tradeUsb"
-          label="官方提现"
-          align="center"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb + "us" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          v-if="dialogType == 9"
-          align="center"
-          prop="type"
-          label="赠送方式"
-        >
-          <template v-slot="scope">
-            {{
-              scope.row.type == "9" ? "官方增加游戏薪资" : "官方减少游戏薪资"
-            }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          v-if="dialogType == 9"
-          align="center"
-          prop="tradeUsb"
-          label="操作数量"
-        >
-          <template v-slot="scope">
-            {{ scope.row.tradeUsb + "us" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          v-if="dialogType == 9"
-          align="center"
-          prop="remark"
-          label="备注"
-        >
-        </el-table-column>
-
-        <el-table-column
-          align="center"
-          prop="afterUsb"
-          label="剩余薪资"
-          v-if="dialogType != 0"
-        >
-          <template v-slot="scope">
-            {{ scope.row.afterUsb + "us" }}
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <table-pagination
-        :pageParams="pageParams1"
-        :pageTotal="pageTotal1"
-        :page-sizes="[5, 10, 20]"
-        @handleSizeChange="handleSizeChange1"
-        @handlePageChange="handlePageChange1"
-      ></table-pagination>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  getDateCycleList,
-  getAnchorGameSalaryBill,
-  anchorGameSalaryBillDetail,
-} from "@/api/relAgency/relAgency.js";
-import TablePagination from "@/components/common/TablePagination";
-import { formatDate, formatDateYMD } from "@/utils/relDate";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-import PartitionSelect from "@/views/common/partitionSelect.vue";
-
-export default {
-  name: "anchorGameSalaryOperation",
-  components: { PartitionSelect, TablePagination },
-  data() {
-    return {
-      dateCycleList: [],
-      btnLoading: false, // 导出弹出框(dialog)的确认按钮
-      tableLoading: false, // 表格是否加载中
-
-      tableData: [], // 接口返回的表格数据
-      pageTotal: 0, // 接口返回的表格总条数
-      pageParams: {
-        pageNo: 1,
-        pageSize: 20,
-      },
-      // 搜索表单相关
-      searchForm: {
-        agencyOwnerId: null,
-        agencyId: null,
-        dateCycle: null,
-        erbanNo: null,
-        partitionId: undefined,
-      },
-      partitionArr: [],
-      searchRule: {
-        startTime: [
-          {
-            validator: (rule, value, callback) => {
-              this.$refs["searchForm"].validateField("endTime");
-              callback();
-            },
-            trigger: "change",
-          },
-        ],
-        endTime: [
-          {
-            validator: (rule, value, callback) => {
-              const { startTime } = this.searchForm;
-              if (startTime !== null && startTime !== "" && value) {
-                if (value <= startTime) {
-                  callback(new Error("须晚于开始时间"));
-                } else {
-                  callback();
-                }
-              } else {
-                callback();
-              }
-            },
-            trigger: "change",
-          },
-        ],
-      },
-      dialogData: [], //弹窗表格数据
-      dialogVisible: false,
-      dialogLoading: false,
-      pageTotal1: 0, // 接口返回的表格总条数
-      pageParams1: {
-        pageNo: 1,
-        pageSize: 10,
-      },
-      dialogParams: {},
-      dialogTitle: "钻石兑换薪资",
-      dialogType: 1,
-    };
-  },
-  created() {
-    this.getDateCycleList();
-  },
-  methods: {
-    getDateCycleList() {
-      getDateCycleList({ month: 3 }).then((res) => {
-        this.dateCycleList = res.data || [];
-        this.searchForm.dateCycle = res.data
-          ? res.data[0].dateCycle
-          : undefined;
-      });
-    },
-    getData() {
-      if (this.searchForm.dateCycle == undefined) {
-        return;
-      }
-
-      this.tableLoading = true;
-
-      let { pageParams, searchForm } = this;
-      searchForm = JSON.parse(JSON.stringify(searchForm));
-      pageParams = JSON.parse(JSON.stringify(pageParams));
-      Object.keys(searchForm).forEach((item) => {
-        if (
-          !searchForm[item] ||
-          (searchForm[item] !== undefined && searchForm[item] === "")
-        ) {
-          delete searchForm[item];
-        }
-      });
-      Object.assign(pageParams, searchForm);
-
-      getAnchorGameSalaryBill(pageParams).then((res) => {
-        this.tableLoading = false;
-        if (res.code == 200) {
-          let data = res.data;
-          this.tableData = data.records;
-          this.pageTotal = data.total;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-    },
-    // 弹窗
-    handleOpen(index, row) {
-      console.log(index, "----------");
-      switch (index) {
-        case 0:
-          this.dialogTitle = "本周起获得游戏薪资";
-          this.dialogType = 0;
-          break;
-        case 1:
-          this.dialogTitle = "本周期已领取的薪资";
-          this.dialogType = 1;
-          break;
-        case 3:
-          this.dialogTitle = "薪资转增代理";
-          this.dialogType = 2;
-          break;
-        case 4:
-          this.dialogTitle = "薪资转增公会长";
-          this.dialogType = 3;
-          break;
-        case 5:
-          this.dialogTitle = "官方提现";
-          this.dialogType = 4;
-          break;
-        case 2:
-          this.dialogTitle = "薪资兑换金币";
-          this.dialogType = 6;
-          break;
-        case 9:
-          this.dialogTitle = "官方操作";
-          this.dialogType = 9;
-          break;
-        default:
-          break;
-      }
-      this.dialogParams = {
-        salaryType: String(index),
-        dateCycle: this.searchForm.dateCycle,
-        uid: row.uid,
-        hallId: row.hallId,
-      };
-      this.pageParams1 = {
-        pageNo: 1,
-        pageSize: 10,
-      };
-      console.log(this.dialogParams);
-
-      this.getDetail();
-    },
-    getDetail() {
-      let { pageParams1, dialogParams } = this;
-      pageParams1 = JSON.parse(JSON.stringify(pageParams1));
-      dialogParams = JSON.parse(JSON.stringify(dialogParams));
-      Object.keys(dialogParams).forEach((item) => {
-        if (
-          !dialogParams[item] ||
-          (dialogParams[item] !== undefined && dialogParams[item] === "")
-        ) {
-          delete dialogParams[item];
-        }
-      });
-      Object.assign(pageParams1, dialogParams);
-      this.dialogVisible = true;
-      this.dialogLoading = true;
-      anchorGameSalaryBillDetail(pageParams1).then((res) => {
-        if (res.success === true) {
-          let data = res.data;
-          this.dialogData = data.records;
-          this.pageTotal1 = data.total;
-        }
-        this.dialogLoading = false;
-      });
-    },
-    // 点击搜索
-    handSearch() {
-      this.$refs["searchForm"].validate((valid) => {
-        if (valid) {
-          this.pageParams.pageNo = 1;
-          this.getData();
-        }
-      });
-    },
-    // 重置搜索表单
-    resetSearchForm() {
-      this.$refs["searchForm"].resetFields();
-      this.pageParams.pageNo = 1;
-      this.tableData = [];
-      this.getData();
-    },
-    // 分页导航
-    handleSizeChange(val) {
-      this.pageParams.pageSize = val;
-      this.getData();
-    },
-    handlePageChange(val) {
-      this.pageParams.pageNo = val;
-      this.getData();
-    },
-    // 弹窗分页导航
-    handleSizeChange1(val) {
-      this.pageParams1.pageSize = val;
-      this.getDetail();
-    },
-    handlePageChange1(val) {
-      this.pageParams1.pageNo = val;
-      this.getDetail();
-    },
-
-    headerCopy(column, e) {
-      this.$copy(column.label);
-    },
-  },
-  computed: {
-    convertTimestamp1() {
-      return function (time) {
-        let date = new Date(time);
-        return formatDateYMD(date);
-      };
-    },
-    convertTimestamp() {
-      return function (time) {
-        let date = new Date(time);
-        return formatDate(date);
-      };
-    },
-    dateCycleType() {
-      const { dateCycleList } = this;
-      return function (value) {
-        for (let item of dateCycleList) {
-          if (item.dateCycle === value) {
-            return (
-              this.convertTimestamp1(item.startDate) +
-              "~" +
-              this.convertTimestamp1(item.endDate)
-            );
-          }
-        }
-        return "";
-      };
-    },
-  },
-};
-</script>
-
-<style scope>
-.el-button--text {
-  font-size: 16px;
-  text-decoration: underline;
-}
-
-.container {
-  width: 100%;
-}
-.search-line {
-  width: 38%;
-}
-</style>

src/views/guildOperationManagement/cisGuildDiamondReward.vue

@@ -0,0 +1,208 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>公会ID:</span>
+      <el-input v-model="formData.guildId" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>公会长ID:</span>
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>国家</span>
+      <el-select v-model="formData.regionId" placeholder="请选择">
+        <el-option
+          v-for="item in adminCountryArr"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button style="" type="primary" @click="confirmExportExcel()"
+      >导出</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="statDate" 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 prop="guildRegionName" align="center" label="公会国家" />
+      <el-table-column prop="diamondNum" align="center" label="公会基础收益" />
+      <el-table-column prop="extraDiamondNum" align="center" label="公会长额外收益" />
+    </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"
+    />
+  </div>
+</template>
+<script>
+export default {
+  name: "cisGuildDiamondReward",
+};
+</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 { getSovietList, exportSovietList} from "@/api/relAgency/relAgency.js";
+import { getlistByPartitionId } from "@/api/BD/IdentitySettings.js";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  guildId: "",
+  erbanNo: "",
+  regionId: 0,
+  startDate:'',
+  endDate:'',
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const dataTime = ref([]);
+const adminCountryArr = ref([]);
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  if (dataTime.value && dataTime.value.length > 0) {
+    formData.startDate = dateFormat(dataTime.value[0], "yyyy-MM-dd");
+    formData.endDate = dateFormat(dataTime.value[1], "yyyy-MM-dd");
+  } else {
+    formData.startDate = dataTime.value;
+    formData.endDate = dataTime.value;
+  }
+  getSovietList(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data.rows;
+      tableData.loading = false;
+      tableData.total = res.data.total;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+ // 导出
+        const confirmExportExcel = async () => {
+      try {
+        const res = await exportSovietList(formData)
+        if (res) {
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+          let time = formatDate(new Date());
+          let alink = document.createElement("a");
+          alink.download = `CIS公会钻石奖励${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();
+};
+onMounted(() => {
+  getlistByPartitionId({ partitionId: 32, containAll: true }).then((res) => {
+    if (res.code == 200) {
+      adminCountryArr.value = res.data;
+    }
+  });
+});
+</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/cisGuildMemberDiamond.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>用户ID:</span>
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>公会ID:</span>
+      <el-input v-model="formData.guildId" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>公会长ID:</span>
+      <el-input v-model="formData.ownerErbanNo" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>国家</span>
+      <el-select v-model="formData.regionId" placeholder="请选择">
+        <el-option
+          v-for="item in adminCountryArr"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="dataTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+            <span class="demonstration">状态</span>
+            <el-select v-model="formData.enable" placeholder="请选择">
+          <el-option label="全部" :value="-1"></el-option>
+          <el-option label="无效" :value="0"></el-option>
+          <el-option label="有效" :value="1"></el-option>
+        </el-select>
+        </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button style="" type="primary" @click="confirmExportExcel()"
+      >导出</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="statDate" align="center" label="日期" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="enbale" align="center" label="主播状态" >
+        <template v-slot="scope">
+                    {{scope.row.enbale ==0 ? '无效' : '有效'}}
+                </template>
+        </el-table-column>
+      <el-table-column prop="regionName" align="center" label="用户国家" />
+      <el-table-column prop="diamondNum" align="center" label="基础收益" />
+      <el-table-column prop="extraDiamondNum" align="center" label="额外收益" />
+      <el-table-column prop="guildExtraDiamondNum" align="center" label="公会长额哇收益" />
+      <el-table-column prop="anchorSendStatus" align="center" label="主播额外收益发放状态" >
+         <template v-slot="scope">
+                    {{scope.row.anchorSendStatus ==0 ? '未发放' : '已发放'}}
+                </template>
+        </el-table-column>
+        <el-table-column prop="ownerSendStatus" align="center" label="公会长额外收益发放状态" >
+         <template v-slot="scope">
+                    {{scope.row.ownerSendStatus ==0 ? '未发放' : '已发放'}}
+                </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"
+    />
+  </div>
+</template>
+<script>
+export default {
+  name: "cisGuildMemberDiamond",
+};
+</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 { getSovietMemberList, exportSovietMemberList} from "@/api/relAgency/relAgency.js";
+import { getlistByPartitionId } from "@/api/BD/IdentitySettings.js";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  erbanNo: "",
+  regionId: 0,
+  startDate:'',
+  endDate:'',
+  enable:-1,
+  ownerErbanNo:'',
+  guildId:''
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const dataTime = ref([]);
+const adminCountryArr = ref([]);
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  if (dataTime.value && dataTime.value.length > 0) {
+    formData.startDate = dateFormat(dataTime.value[0], "yyyy-MM-dd");
+    formData.endDate = dateFormat(dataTime.value[1], "yyyy-MM-dd");
+  } else {
+    formData.startDate = dataTime.value;
+    formData.endDate = dataTime.value;
+  }
+  getSovietMemberList(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data.rows;
+      tableData.loading = false;
+      tableData.total = res.data.total;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+ // 导出
+        const confirmExportExcel = async () => {
+      try {
+        const res = await exportSovietMemberList(formData)
+        if (res) {
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+          let time = formatDate(new Date());
+          let alink = document.createElement("a");
+          alink.download = `CIS公会成员钻石奖励${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();
+};
+onMounted(() => {
+  getlistByPartitionId({ partitionId: 32, containAll: true }).then((res) => {
+    if (res.code == 200) {
+      adminCountryArr.value = res.data;
+    }
+  });
+});
+</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/cisHomeOwnerDiamond.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>房间ID:</span>
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
+    </div>
+    <div class="inquire">
+      <span>国家</span>
+      <el-select v-model="formData.regionId" placeholder="请选择">
+        <el-option
+          v-for="item in adminCountryArr"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>周期</span>
+      <el-select v-model="formData.cycleDate" placeholder="请选择" clearable>
+        <el-option
+          v-for="item in dateCycleArr"
+          :key="item.cycleDate"
+          :label="item.intervalFormatter"
+          :value="item.cycleDate"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button style="" type="primary" @click="confirmExportExcel()"
+      >导出</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="statDate" align="center" label="日期" />
+      <el-table-column prop="erbanNo" align="center" label="房间ID" />
+      <el-table-column prop="nick" align="center" label="房主昵称" />
+      <el-table-column prop="regionName" align="center" label="国家" />
+      <el-table-column prop="diamondNum" align="center" label="房间钻石收益" />
+      <el-table-column prop="extraDiamondNum" align="center" label="房主额外收益" />
+      <el-table-column prop="sendStatus" align="center" label="额外收益发放状态" >
+         <template v-slot="scope">
+                    {{scope.row.sendStatus ==0 ? '未发放' : '已发放'}}
+                </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"
+    />
+  </div>
+</template>
+<script>
+export default {
+  name: "cisHomeOwnerDiamond",
+};
+</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 { getSovietRoomList, exportSovietRoomList ,getRoomCycleDateList} from "@/api/relAgency/relAgency.js";
+import { getlistByPartitionId } from "@/api/BD/IdentitySettings.js";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  erbanNo: "",
+  regionId: 0,
+  cycleDate:'',
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const dateCycleArr = ref([]);
+const adminCountryArr = ref([]);
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  getSovietRoomList(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data.rows;
+      tableData.loading = false;
+      tableData.total = res.data.total;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+ // 导出
+        const confirmExportExcel = async () => {
+      try {
+        const res = await exportSovietRoomList(formData)
+        if (res) {
+          ElMessage({
+            message: '导出成功',
+            type: 'success',
+          });
+          let time = formatDate(new Date());
+          let alink = document.createElement("a");
+          alink.download = `CIS房主钻石奖励${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();
+};
+onMounted(() => {
+  getlistByPartitionId({ partitionId: 32, containAll: true }).then((res) => {
+    if (res.code == 200) {
+      adminCountryArr.value = res.data;
+    }
+  });
+   getRoomCycleDateList().then((res) => {
+      dateCycleArr.value = res;
+  });
+});
+</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/dailyDiamondFlow.vue

@@ -2,204 +2,203 @@
   <div class="box">
     <div class="inquire">
       <span>分区</span>
-      <el-select v-model="formData.partitionId"
+      <el-select
-                 placeholder="请选择"
+        v-model="formData.partitionId"
-                 @change="getlistByPartition()">
+        placeholder="请选择"
-        <el-option v-for="item in partitionOptions"
+        @change="getlistByPartition()"
-                   :key="item.id"
+      >
-                   :label="item.desc"
+        <el-option
-                   :value="item.id">
+          v-for="item in partitionOptions"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
         </el-option>
       </el-select>
     </div>
 
     <div class="inquire">
       <span>国家</span>
-      <el-select v-model="formData.regionId"
+      <el-select v-model="formData.regionId" placeholder="请选择">
-                 placeholder="请选择">
+        <el-option
-        <el-option v-for="item in adminCountryArr"
+          v-for="item in adminCountryArr"
-                   :key="item.id"
+          :key="item.id"
-                   :label="item.name"
+          :label="item.name"
-                   :value="item.id">
+          :value="item.id"
+        >
         </el-option>
       </el-select>
     </div>
     <div class="inquire">
       <span>用户ID</span>
-      <el-input v-model="formData.erbanNo"
+      <el-input
-                placeholder=""
+        v-model="formData.erbanNo"
-                class="input"></el-input>
+        placeholder=""
+        class="input"
+      ></el-input>
     </div>
     <div class="inquire">
       <span>公会长ID</span>
-      <el-input v-model="formData.ownerErbanNo"
+      <el-input
-                placeholder=""
+        v-model="formData.ownerErbanNo"
-                class="input"></el-input>
+        placeholder=""
+        class="input"
+      ></el-input>
     </div>
     <div class="inquire">
       <span>公会ID</span>
-      <el-input v-model="formData.guildId"
+      <el-input
-                placeholder=""
+        v-model="formData.guildId"
-                class="input"></el-input>
+        placeholder=""
+        class="input"
+      ></el-input>
     </div>
-    <div class="inquire"
+    <div class="inquire" style="margin-top: 20px">
-         style="margin-top: 20px;">
       <span class="demonstration">日期</span>
-      <el-date-picker v-model="dataTime"
+      <el-date-picker
-                      type="daterange"
+        v-model="dataTime"
-                      range-separator="至"
+        type="daterange"
-                      start-placeholder="开始日期"
+        range-separator="至"
-                      end-placeholder="结束日期">
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
       </el-date-picker>
     </div>
 
     <div class="inquire">
       <span class="demonstration">状态</span>
-      <el-select v-model="formData.status"
+      <el-select v-model="formData.status" placeholder="请选择">
-                 placeholder="请选择">
+        <el-option label="全部" :value="-1"></el-option>
-        <el-option label="全部"
+        <el-option label="未发放" :value="0"></el-option>
-                   :value="-1"></el-option>
+        <el-option label="已经发放" :value="1"></el-option>
-        <el-option label="未发放"
+        <el-option label="当天不可操作" :value="2"></el-option>
-                   :value="0"></el-option>
-        <el-option label="已经发放"
-                   :value="1"></el-option>
       </el-select>
     </div>
-    <el-button style=""
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
-               type="primary"
+    <el-button class="primary" type="primary" @click="resetFormData()"
-               @click="getData()">查询</el-button>
+      >重置</el-button
-    <el-button class="primary"
+    >
-               type="primary"
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
-               @click="resetFormData()">重置</el-button>
+      >导出</el-button
-    <el-button class="primary"
+    >
-               type="primary"
-               @click="confirmExport2Excel()">导出</el-button>
     <!-- 表格数据 -->
-    <el-table v-loading="tableData.loading"
+    <el-table
-              :data="tableData.data"
+      v-loading="tableData.loading"
-              ref="multipleTable"
+      :data="tableData.data"
-              @selection-change="handleSelectionChange"
+      ref="multipleTable"
-              border
+      @selection-change="handleSelectionChange"
-              style="width: 100%; margin-top: 25px">
+      border
-      <el-table-column prop="statDate"
+      style="width: 100%; margin-top: 25px"
-                       align="center"
+    >
-                       label="日期" />
+      <el-table-column prop="statDate" align="center" label="日期" />
-      <el-table-column prop="erbanNo"
+      <el-table-column prop="erbanNo" align="center" label="房间ID" />
-                       align="center"
+      <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
-                       label="房间ID" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
-      <el-table-column prop="ownerErbanNo"
+      <el-table-column prop="roomName" align="center" label="房间昵称" />
-                       align="center"
+      <el-table-column prop="partitionIdDesc" align="center" label="分区" />
-                       label="公会长ID" />
+      <el-table-column prop="regionName" align="center" label="国家" />
-      <el-table-column prop="guildId"
+      <el-table-column prop="diamondNum" align="center" label="钻石流水" />
-                       align="center"
+      <el-table-column prop="goldNum" align="center" label="金币流水" />
-                       label="公会ID" />
+      <el-table-column
-      <el-table-column prop="roomName"
+        prop="rewardGold"
-                       align="center"
+        align="center"
-                       label="房间昵称" />
+        label="对应流水发放金币"
-      <el-table-column prop="partitionIdDesc"
+      />
-                       align="center"
+      <el-table-column prop="receivedGold" align="center" label="已领取金币" >
-                       label="分区" />
-      <el-table-column prop="regionName"
-                       align="center"
-                       label="国家" />
-      <el-table-column prop="diamondNum"
-                       align="center"
-                       label="钻石流水" />
-      <el-table-column prop="goldNum"
-                       align="center"
-                       label="金币流水" />
-      <el-table-column prop="rewardGold"
-                       align="center"
-                       label="对应流水发放金币" />
-      <el-table-column prop="status"
-                       align="center"
-                       label="状态">
         <template #default="row">
-          <span>{{ row.row.status == 0?'未发放':'已经发放'}}</span>
+          {{ row.row.receivedGold || 0}}
         </template>
       </el-table-column>
-      <el-table-column prop="sendTime"
+      <el-table-column prop="receiveErbanNo" align="center" label="领取人ID" />
-                       align="center"
+      <el-table-column prop="status" align="center" label="状态">
-                       label="发放时间" />
+        <template #default="row">
-      <el-table-column align="center"
+          <span>{{ row.row.status == 0 ? "未发放" : row.row.status == 1?"已经发放":'当天不可操作' }}</span>
-                       label="操作"
+        </template>
-                       width="300">
+      </el-table-column>
+      <el-table-column prop="sendTime" align="center" label="发放时间" />
+      <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
-          <el-button class="primary"
+          <el-button
-                     type="primary"
+            class="primary"
-                     @click="
+            type="primary"
-                        sendDiamond(scope.row);
+            @click="sendDiamond(scope.row)"
-                    "
+            size="default"
-                     size="default"
+            v-if="scope.row.status == 0"
-                     v-if='scope.row.status == 0'>发放</el-button>
+            >发放</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column prop="operator"
+      <el-table-column prop="operator" align="center" label="操作人" />
-                       align="center"
-                       label="操作人" />
     </el-table>
     <!-- 分页 -->
-    <el-pagination style="margin-top: 10px"
+    <el-pagination
-                   class="paginationClass"
+      style="margin-top: 10px"
-                   :current-page="formData.pageNo"
+      class="paginationClass"
-                   :page-size="formData.pageSize"
+      :current-page="formData.pageNo"
-                   :page-sizes="[10, 20, 50, 100, 200]"
+      :page-size="formData.pageSize"
-                   layout="sizes, prev, pager, next"
+      :page-sizes="[10, 20, 50, 100, 200]"
-                   :total="tableData.total"
+      layout="sizes, prev, pager, next"
-                   @size-change="handleSizeChange"
+      :total="tableData.total"
-                   @current-change="handleCurrentChange" />
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
   </div>
 </template>
-    <script>
+<script>
-import { ref, onMounted, reactive } from 'vue'
+import { ref, onMounted, reactive } from "vue";
 import { getPartitionInfoList } from "@/api/partition/partitionInfo";
 import { dateFormat } from "@/utils/system-helper";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { formatDate } from "@/utils/relDate";
 import {
-  getlistByPartitionId, getroomDayDiamondList
+  getlistByPartitionId,
-  , roomDayDiamondExport, sendroomDayDiamond
+  getroomDayDiamondList,
+  roomDayDiamondExport,
+  sendroomDayDiamond,
 } from "@/api/relAgency/relAgency.js";
 export default {
   name: "dailyDiamondFlow",
-  setup () {
+  setup() {
-    const dataTime = ref('');
+    const dataTime = ref("");
     const formData = reactive({
-      partitionId: '',
+      partitionId: "",
-      erbanNo: '',
+      erbanNo: "",
       pageNo: 1,
       pageSize: 10,
-      startTime: '',
+      startTime: "",
-      endTime: '',
+      endTime: "",
       status: -1,
-      regionId: '',
+      regionId: "",
-      ownerErbanNo: '',
+      ownerErbanNo: "",
-      guildId: ''
+      guildId: "",
-    })
+    });
     const tableData = reactive({
       data: [],
       total: 0,
       loading: false,
-    })
+    });
-    const adminCountryArr = ref([])
+    const adminCountryArr = ref([]);
     const partitionOptions = ref([]);
     const getlistByPartition = () => {
-      getlistByPartitionId({ partitionId: formData.partitionId, containAll: true }).then((res) => {
+      getlistByPartitionId({
+        partitionId: formData.partitionId,
+        containAll: true,
+      }).then((res) => {
         if (res.code == 200) {
           adminCountryArr.value = res.data;
         }
       });
-    }
+    };
     const getData = () => {
       tableData.loading = true;
       if (dataTime.value && dataTime.value.length > 0) {
         formData.startTime = dateFormat(dataTime.value[0], "yyyy-MM-dd");
         formData.endTime = dateFormat(dataTime.value[1], "yyyy-MM-dd");
       } else {
-        formData.startTime = dataTime.value
+        formData.startTime = dataTime.value;
-        formData.endTime = dataTime.value
+        formData.endTime = dataTime.value;
       }
-      getroomDayDiamondList(formData).then(res => {
+      getroomDayDiamondList(formData).then((res) => {
         if (res.code === 200) {
           tableData.data = res.data.rows;
           tableData.total = res.data.total;
@@ -207,38 +206,35 @@ export default {
         } else {
           tableData.loading = false;
           ElMessage.error(res.message);
-
         }
-      })
+      });
-    }
+    };
     const sendDiamond = (row) => {
       const id = row.id;
-      ElMessageBox.confirm('确认发放吗', "提示", {
+      ElMessageBox.confirm("确认发放吗", "提示", {
         type: "warning",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
       }).then(() => {
-        sendroomDayDiamond({ id }).then(res => {
+        sendroomDayDiamond({ id }).then((res) => {
           if (res.code === 200) {
-            ElMessage.success('发放成功');
+            ElMessage.success("发放成功");
             getData();
           } else {
             ElMessage.error(res.message);
           }
-        })
+        });
-      })
+      });
-
+    };
-
-    }
     // 导出
     const confirmExport2Excel = async () => {
       Object.assign(formData, { pageSize: 10000, pageNo: 1 });
       try {
-        const res = await roomDayDiamondExport(formData)
+        const res = await roomDayDiamondExport(formData);
         if (res) {
           ElMessage({
-            message: '导出成功',
+            message: "导出成功",
-            type: 'success',
+            type: "success",
           });
           let time = formatDate(new Date());
           let alink = document.createElement("a");
@@ -250,29 +246,28 @@ export default {
           alink.click();
           URL.revokeObjectURL(alink.href);
         }
-
       } catch (error) {
         ElMessage({
           message: error.message,
-          type: 'error',
+          type: "error",
         });
       }
-    }
+    };
     //重置
     const resetFormData = () => {
       Object.assign(formData, {
-        partitionId: '',
+        partitionId: "",
-        erbanNo: '',
+        erbanNo: "",
         pageNo: 1,
         pageSize: 10,
-        startTime: '',
+        startTime: "",
-        endTime: '',
+        endTime: "",
         status: -1,
-        regionId: ''
+        regionId: "",
       });
       tableData.data = [];
       tableData.total = 0;
-      dataTime.value = '';
+      dataTime.value = "";
     };
     const handleSizeChange = (val) => {
       formData.pageSize = val;
@@ -283,7 +278,7 @@ export default {
       getData();
     };
     onMounted(() => {
-      getPartitionInfoList().then(res => {
+      getPartitionInfoList().then((res) => {
         partitionOptions.value = res.data;
         formData.partitionId = partitionOptions.value[0].id;
         getlistByPartition();
@@ -301,10 +296,10 @@ export default {
       handleCurrentChange,
       sendDiamond,
       resetFormData,
-      confirmExport2Excel
+      confirmExport2Excel,
-    }
+    };
   },
-}
+};
 </script>
 <style lang="less" scoped>
 .box {
@@ -334,4 +329,4 @@ export default {
     margin: 15px 0 5px 0px;
   }
 }
-</style>
+</style>

src/views/guildOperationManagement/dailyRoomFlow.vue

@@ -1,361 +0,0 @@
-<template>
-  <div class="box">
-    <div class="inquire">
-      <span>分区</span>
-      <partition-select v-model:partition-id="formData.partitionId" />
-    </div>
-    <div class="inquire">
-      <div class="block">
-        <span class="demonstration">地区</span>
-        <partition-region-select
-          v-model:partition-id="formData.partitionId"
-          v-model:region-id="formData.regionId"
-        />
-      </div>
-    </div>
-    <div class="inquire">
-      <span>用户ID</span>
-      <el-input
-        v-model="formData.erbanNo"
-        placeholder="请输入用户ID"
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span class="demonstration">状态</span>
-      <el-select v-model="formData.status" placeholder="请选择">
-        <el-option label="全部" :value="-1"></el-option>
-        <el-option label="未发放" :value="0"></el-option>
-        <el-option label="已经发放" :value="1"></el-option>
-      </el-select>
-    </div>
-    <div class="inquire" style="margin-top: 20px">
-      <span class="demonstration">日期</span>
-      <el-date-picker
-        v-model="dataTime"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      >
-      </el-date-picker>
-    </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="statDate" align="center" label="日期" />
-      <el-table-column prop="erbanNo" align="center" label="房间ID" />
-      <el-table-column prop="roomTitle" align="center" label="房间昵称" />
-      <el-table-column prop="partitionIdDesc" align="center" label="分区" />
-      <el-table-column prop="regionName" align="center" label="国家" />
-      <el-table-column prop="serialValue" align="center" label="房间流水">
-        <template v-slot="scope">
-          <el-button
-            @click="
-              detailDialogFun(
-                scope.row.partitionId,
-                scope.row.roomUid,
-                scope.row.statDate
-              )
-            "
-            type="text"
-            size="medium "
-            >{{ scope.row.serialValue }}</el-button
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="levelName" align="center" label="档位" />
-      <el-table-column prop="ownerReward" align="center" label="目标获得金币" />
-      <el-table-column
-        prop="ownerReceiveReward"
-        align="center"
-        label="已获得金币"
-      />
-      <el-table-column prop="receiveTime" align="center" label="领取时间" />
-      <el-table-column prop="isWinner" align="center" label="操作人">
-        <template v-slot="scope">
-          <template v-if="scope.row.ownerReceiveReward > 0">
-            {{
-              "用户ID:" + scope.row.erbanNo + "(uid:" + scope.row.roomUid + ")"
-            }}
-          </template>
-        </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="detailDialog" title="房间贡献明细" width="60%" center>
-      <!-- 表格数据 -->
-
-      <div style="margin-bottom: 25px">
-        <span style="display: inline-block; margin-right: 20px">用户ID:</span>
-        <el-input
-          style="width: 15%"
-          class="input"
-          v-model="detailData.erbanNo"
-        ></el-input>
-        <el-button
-          style="margin-left: 20px"
-          type="primary"
-          @click="searchSpecificData()"
-          >查询</el-button
-        >
-      </div>
-
-      <el-table
-        v-loading="detailData.loading"
-        :data="detailData.showData"
-        border
-        style="width: 100%; margin-top: 25px"
-      >
-        <el-table-column prop="statDate" align="center" label="日期" />
-        <el-table-column prop="rank" align="center" label="排行" />
-        <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="regionDesc" align="center" label="国家" />
-        <el-table-column prop="userSerialValue" align="center" label="贡献值" />
-        <el-table-column prop="rewardRatio" align="center" label="比例">
-          <template v-slot="scope">
-            {{ (scope.row.rewardRatio * 100).toFixed(2) + "%" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="userReward"
-          align="center"
-          label="目标获得金币"
-        />
-        <el-table-column
-          prop="userReceiveReward"
-          align="center"
-          label="已获得金币"
-        />
-        <el-table-column prop="receiveTime" align="center" label="领取时间" />
-        <el-table-column align="center" label="领取人">
-          <template v-slot="scope">
-          <template v-if="scope.row.userReceiveReward !=0">
-            {{
-              "用户ID:" + scope.row.erbanNo + "(uid:" + scope.row.uid + ")"
-            }}
-          </template>
-        </template>
-
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import PartitionSelect from "../common/partitionSelect.vue";
-import PartitionRegionSelect from "@/views/common/partitionRegionSelect.vue";
-export default {
-  name: "dailyRoomFlow",
-  components: { PartitionSelect, PartitionRegionSelect },
-};
-</script>
-<script setup>
-import { ref, onMounted, reactive, computed } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { dateFormat } from "@/utils/system-helper";
-import { formatDate } from "@/utils/relDate";
-import {
-  getRoomSendRankDayRewardPage,
-  exportRoomSendRankDayReward,
-  getRoomSendRankDayRewardListDetail,
-} from "@/api/relAgency/relAgency.js";
-const dataTime = ref("");
-const formData = reactive({
-  partitionId: undefined,
-  pageNo: 1,
-  pageSize: 10,
-  erbanNo: "",
-  startDate: "",
-  endDate: "",
-  status: -1,
-  regionId: "",
-});
-const tableData = reactive({
-  data: [],
-  total: 0,
-  loading: false,
-});
-const detailDialog = ref(false);
-const detailData = reactive({
-  data: [],
-  showData: [],
-  loading: false,
-  erbanNo: "",
-});
-const getData = () => {
-  tableData.loading = true;
-  if (dataTime.value && dataTime.value.length > 0) {
-    formData.startDate = dateFormat(dataTime.value[0], "yyyy-MM-dd");
-    formData.endDate = dateFormat(dataTime.value[1], "yyyy-MM-dd");
-  } else {
-    formData.startDate = dataTime.value;
-    formData.endDate = dataTime.value;
-  }
-  getRoomSendRankDayRewardPage(formData).then((res) => {
-    if (res.code === 200) {
-      tableData.data = res.data.rows;
-      tableData.total = res.data.total;
-      tableData.loading = false;
-    } else {
-      tableData.loading = false;
-      ElMessage.error(res.message);
-    }
-  });
-};
-// 贡献明细
-const detailDialogFun = (partitionId, roomUid, statDate) => {
-  detailData.loading = true;
-  getRoomSendRankDayRewardListDetail({
-    partitionId,
-    roomUid,
-    statDate,
-  }).then((res) => {
-    if (res.code == 200) {
-      detailData.data = res.data;
-      detailData.showData = res.data;
-      detailData.loading = false;
-      detailDialog.value = true;
-    } else {
-      detailData.loading = false;
-      ElMessage({
-        message: res.message,
-        type: "error",
-      });
-    }
-  });
-};
-const searchSpecificData = () => {
-  // 假设你想根据房间ID查找
-  if (detailData.erbanNo) {
-    const specificData = detailData.data.filter(
-      (item) => item.erbanNo == detailData.erbanNo
-    );
-    detailData.showData = specificData;
-  } else {
-    detailData.showData = detailData.data;
-  }
-};
-//重置
-const resetFormData = () => {
-  Object.assign(formData, {
-    partitionId: undefined,
-    pageNo: 1,
-    pageSize: 10,
-    erbanNo: "",
-    startTime: "",
-    endTime: "",
-    status: -1,
-    regionId: "",
-  });
-  tableData.data = [];
-  tableData.total = 0;
-  dataTime.value = "";
-};
-// 导出
-const confirmExport2Excel = async () => {
-  try {
-    const res = await exportRoomSendRankDayReward(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 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;
-}
-.title_txt {
-  font-weight: 600;
-  margin-top: 20px;
-  span {
-    margin-right: 20px;
-  }
-}
-</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/guildOperationManagement/officialGameSalaryWithdrawalRecord.vue

@@ -1,651 +0,0 @@
-<template>
-  <div class="official-withdraw-record">
-    <div class="container">
-      <div class="region-box">
-        <el-radio-group v-model="region">
-          <el-radio v-for="(item, index) in userAreaRegion"
-                    :key="index"
-                    :label="item.value">{{ item.name }}</el-radio>
-        </el-radio-group>
-      </div>
-      <div class="handle-box">
-        <el-form ref="searchForm"
-                 :model="searchForm"
-                 :rules="searchRule"
-                 label-width="90px"
-                 :disabled="tableLoading">
-          <div class="search-line">
-            <el-form-item label="分区"
-                          prop="partitionId">
-              <partition-select v-model:partition-id="searchForm.partitionId"
-                                v-model:partition-infos="partitionArr"
-                                v-model:handle-change="getlistByPartitionId"
-                                v-model:after-init="getData" />
-            </el-form-item>
-            <el-form-item label="MoliStar ID"
-                          prop="agencyOwnerErbanNo">
-              <el-input v-model.trim="searchForm.agencyOwnerErbanNo"
-                        placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="提现状态"
-                          prop="status">
-              <el-select v-model="searchForm.status">
-                <el-option label="审核中"
-                           value="0"></el-option>
-                <el-option label="审核通过"
-                           value="1"></el-option>
-                <el-option label="未通过"
-                           value="2"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="提现账户"
-                          prop="accountType">
-              <el-select v-model="searchForm.accountType">
-                <el-option label="Vodafone"
-                           value="VODAFONE"></el-option>
-                <el-option label="Payonner"
-                           value="PAYONNER"></el-option>
-                <el-option label="USD"
-                           value="USDT"></el-option>
-                <el-option label="Bank"
-                           value="BANK"></el-option>
-                <el-option label="Other"
-                           value="OTHER"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="国家"
-                          prop="country">
-              <el-select v-model="searchForm.country">
-                <el-option v-for="(item, index) in adminCountryArr"
-                           :key="index"
-                           :label="item.label"
-                           :value="item.value"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="时间"
-                          class="large">
-              <el-form-item prop="startTime">
-                <el-date-picker type="datetime"
-                                placeholder="选择开始时间"
-                                v-model="searchForm.startTime"></el-date-picker>
-              </el-form-item>
-              <el-col :span="2"
-                      align="center">-</el-col>
-              <el-form-item prop="endTime">
-                <el-date-picker type="datetime"
-                                placeholder="选择结束时间"
-                                v-model="searchForm.endTime"></el-date-picker>
-              </el-form-item>
-            </el-form-item>
-
-            <el-form-item label-width="40px">
-              <el-button type="primary"
-                         @click="handSearch">搜索</el-button>
-              <el-button type="primary"
-                         plain
-                         @click="resetSearchForm">重置搜索</el-button>
-              <el-button type="primary"
-                         class="exportBtn"
-                         @click="confirmExport2Excel">导出</el-button>
-              <el-button @click="handleChangeAll()"
-                         type="info"
-                         plain>批量发放</el-button>
-              <el-button @click="
-                  centerDialogVisible = true;
-                  centerDialogVisibleType = 1;
-                "
-                         type="info"
-                         plain>批量驳回</el-button>
-            </el-form-item>
-          </div>
-        </el-form>
-      </div>
-      <!-- 表格 -->
-      <div class="table">
-        <el-table :data="tableData"
-                  border
-                  v-loading="tableLoading"
-                  @header-click="headerCopy"
-                  @selection-change="handleSelectionChange"
-                  style="width: 100%; overflow-x: auto">
-          <el-table-column type="selection"> </el-table-column>
-          <el-table-column align="center"
-                           prop="erbanNo"
-                           label="MoliStar ID" />
-          <el-table-column align="center"
-                           prop="partitionDesc"
-                           label="分区" />
-          <el-table-column align="center"
-                           prop="nick"
-                           label="昵称" />
-          <el-table-column align="center"
-                           prop="guildId"
-                           label="公会id" />
-          <el-table-column align="center"
-                           prop="roleTypeDesc"
-                           label="角色" />
-          <el-table-column align="center"
-                           prop="guildOwnerErbanNo"
-                           label="公会长id" />
-          <el-table-column align="center"
-                           prop="accountCountry"
-                           label="国家" />
-          <el-table-column align="center"
-                           prop="blocked"
-                           label="用户当前账户状态">
-            <template v-slot="scope">
-              {{ scope.row.blocked ? "封禁" : "正常" }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="status"
-                           label="申请状态">
-            <template v-slot="scope">
-              {{
-                scope.row.status == 0
-                  ? "审核中"
-                  : scope.row.status == 1
-                  ? "通过"
-                  : "未通过"
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="createTime"
-                           label="申请时间" />
-          <el-table-column align="center"
-                           prop="accountType"
-                           label="提现类型  " />
-          <el-table-column align="center"
-                           prop="guildUsdNum"
-                           label="提现薪资US" />
-          <el-table-column align="center"
-                           prop="currency"
-                           label="发放币种" />
-          <el-table-column align="center"
-                           prop="currencyNum"
-                           label="发放金额" />
-          <el-table-column align="center"
-                           prop="withdrawRate"
-                           label="手续费" />
-          <el-table-column align="center"
-                           prop="withdrawNum"
-                           label="核销薪资" />
-                           <el-table-column align="center"
-                           prop="operator"
-                           label="操作人" />
-                           <el-table-column align="center"
-                           prop="updateTime"
-                           label="操作时间" />
-          <el-table-column align="center"
-                           prop="remark"
-                           label="驳回理由">
-            <template v-slot="scope">
-              {{ scope.row.remark ? scope.row.remark : "/" }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="hallSalary"
-                           label="操作"
-                           width="150">
-            <template v-slot="scope">
-              <div v-if="scope.row.status == 0">
-                <el-button @click="handleChange(scope.row)"
-                           type="text"
-                           size="mini">
-                  发放
-                </el-button>
-                <el-button @click="
-                    centerDialogVisible = true;
-                    centerDialogVisibleType = 2;
-                    centerDialogVisibleID = scope.row.id;
-                  "
-                           type="text"
-                           size="mini">
-                  驳回
-                </el-button>
-              </div>
-              <div>
-                <el-button @click="accountInfosFun(scope.row)"
-                           type="text"
-                           size="mini">
-                  查看详情
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <!-- 分页 -->
-      <table-pagination :pageParams="pageParams"
-                        :pageTotal="pageTotal"
-                        :page-sizes="[10, 20, 100, 200]"
-                        @handleSizeChange="handleSizeChange"
-                        @handlePageChange="handlePageChange"></table-pagination>
-      <!-- 驳回弹窗 -->
-      <el-dialog v-model="centerDialogVisible"
-                 title="提示"
-                 width="30%"
-                 center>
-        <span> 请选择驳回理由:</span>
-        <div class="boxs">
-          <el-radio class="radios"
-                    v-model="radio"
-                    label="用户消息提供不足">用户消息提供不足</el-radio>
-        </div>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="centerDialogVisible = false">取消</el-button>
-            <el-button type="primary"
-                       @click="dialogClick()"> 确认 </el-button>
-          </span>
-        </template>
-      </el-dialog>
-      <!-- 提现详情弹窗 -->
-      <el-dialog v-model="centerDialogVisible2"
-                 title="提现详情">
-        <div class="boxs2">
-          <div>申请提现时间：{{ accountDetails.createTime }}</div>
-          <div>申请ID：{{ accountDetails.erbanNo }}</div>
-          <div>country：{{ accountDetails.country }}</div>
-          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
-          <div>Bank Name：{{ accountDetails.bank_name }}</div>
-          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
-          <div>payeeName:：{{ accountDetails.full_name }}</div>
-          <div>address：{{ accountDetails.address }}</div>
-          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
-          <div>
-            发放金额：{{ accountDetails.currency }}
-            {{ accountDetails.currencyNum }}
-          </div>
-          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
-          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
-        </div>
-        <template #footer>
-          <span class="dialog-footer">
-            <el-button @click="centerDialogVisible2 = false">确认</el-button>
-          </span>
-        </template>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  gameUsdWithdrawExamineList,
-  gameUsdWithdrawExamineExport,
-  gameUsdWithdrawExamineSet,
-  batchGameUsdWithdrawExamineReject,
-  adminCountry,
-} from "@/api/relAgency/relAgency.js";
-import TablePagination from "@/components/common/TablePagination";
-import { formatDate, formatDateYMD } from "@/utils/relDate";
-import { dateFormat } from "@/utils/system-helper";
-import { ElMessage } from "element-plus";
-import { ElMessageBox } from "element-plus";
-import PartitionSelect from "@/views/common/partitionSelect.vue"; // 正确引入 ElM
-// 混入
-
-export default {
-  name: "officialGameSalaryWithdrawalRecord",
-  // mixins: [Mixin],
-  components: { PartitionSelect, TablePagination },
-  data () {
-    return {
-      dateCycleList: [],
-      btnLoading: false, // 导出弹出框(dialog)的确认按钮
-      tableLoading: false, // 表格是否加载中
-
-      tableData: [], // 接口  返回的表格数据
-      pageTotal: 0, // 接口返回的表格总条数
-      pageParams: {
-        pageNo: 1,
-        pageSize: 20,
-      },
-      centerDialogVisible: false, //驳回弹窗
-      centerDialogVisibleType: null, //驳回弹窗
-      centerDialogVisibleID: null, //驳回弹窗
-      centerDialogVisible2: false, //操作弹窗
-      radio: "用户消息提供不足", //驳回原因
-      // 搜索表单相关
-      searchForm: {
-        agencyOwnerErbanNo: null,
-        status: null,
-        startTime: null,
-        endTime: null,
-        adminCountry: null,
-        country: null,
-        partitionId: null,
-      },
-      partitionArr: [],
-      adminCountryArr: [],
-      searchRule: {
-        startTime: [
-          {
-            validator: (rule, value, callback) => {
-              this.$refs["searchForm"].validateField("endTime");
-              callback();
-            },
-            trigger: "change",
-          },
-        ],
-        endTime: [
-          {
-            validator: (rule, value, callback) => {
-              const { startTime } = this.searchForm;
-              if (startTime !== null && startTime !== "" && value) {
-                if (value <= startTime) {
-                  callback(new Error("须晚于开始时间"));
-                } else {
-                  callback();
-                }
-              } else {
-                callback();
-              }
-            },
-            trigger: "change",
-          },
-        ],
-      },
-      idStr: [], //批量删除ID
-      // 查看薪资弹窗数据存储
-      accountDetails: {
-        createTime: null,
-        erbanNo: null,
-        country: null,
-        bank_account: null,
-        bank_name: null,
-        swift_code: null,
-        full_name: null,
-        address: null,
-        guildUsdNum: null,
-        currency: null,
-        currencyNum: null,
-        withdrawRate: null,
-        withdrawNum: null,
-      },
-    };
-  },
-  methods: {
-    getlistByPartitionId () {
-      adminCountry({ partitionId: this.searchForm.partitionId }).then((res) => {
-        if (res.code == 200) {
-          this.adminCountryArr = res.data;
-          this.searchForm.country = ''
-        }
-      });
-    },
-    getData () {
-      this.tableLoading = true;
-
-      let { pageParams, searchForm } = this;
-      searchForm.startTime = searchForm.startTime
-        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
-        : "";
-      searchForm.endTime = searchForm.endTime
-        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
-        : "";
-      searchForm = JSON.parse(JSON.stringify(searchForm));
-      pageParams = JSON.parse(JSON.stringify(pageParams));
-      Object.keys(searchForm).forEach((item) => {
-        if (
-          (searchForm[item] !== undefined && searchForm[item] === "")
-        ) {
-          delete searchForm[item];
-        }
-      });
-      Object.assign(pageParams, searchForm);
-      console.log(pageParams);
-      console.log(searchForm);
-        gameUsdWithdrawExamineList(pageParams).then((res) => {
-        this.tableLoading = false;
-        if (res.code == 200) {
-          let data = res.data;
-          this.tableData = data.records;
-          this.pageTotal = data.total;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-    },
-    handleSelectionChange (rows) {
-      this.idStr = null;
-      this.idStr = rows.map((obj) => obj.id).join(",");
-    },
-    handleChangeAll () {
-      ElMessageBox.confirm("确定要结算吗", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          gameUsdWithdrawExamineSet({ ids: this.idStr }).then((res) => {
-            if (res.success === true) {
-              ElMessage({
-                type: "success",
-                message: "操作成功!",
-              });
-              this.getData();
-              this.idStr = null;
-            }
-          });
-        })
-        .catch(() => {
-          ElMessage({
-            type: "warning ",
-            message: "已取消",
-          });
-        });
-    },
-    // 查看详情处理函数
-    accountInfosFun (res) {
-      var obj = JSON.parse(res.accountInfos);
-      console.log(obj);
-      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
-      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
-      this.accountDetails.country = obj.country ? obj.country : "-";
-      this.accountDetails.bank_account = obj.bank_account
-        ? obj.bank_account
-        : "-";
-      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
-      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
-      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
-      this.accountDetails.address = obj.address ? obj.address : "-";
-      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
-      this.accountDetails.currency = res.currency ? res.currency : "-";
-      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
-      this.accountDetails.withdrawRate = res.withdrawRate
-        ? res.withdrawRate
-        : "-";
-      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
-      this.centerDialogVisible2 = true;
-    },
-    // 批量驳回
-    dialogClick () {
-      batchGameUsdWithdrawExamineReject({
-        ids:
-          this.centerDialogVisibleType == 1
-            ? this.idStr
-            : this.centerDialogVisibleID,
-        remark: this.radio,
-      })
-        .then((res) => {
-          if (res.code == 200) {
-            ElMessage({
-              type: "success",
-              message: "操作成功!",
-            });
-            this.getData();
-            this.centerDialogVisible = false;
-            this.idStr = null;
-          } else {
-            ElMessage({
-              type: "error",
-              message: res.message,
-            });
-          }
-        })
-        .catch(() => {
-          ElMessage({
-            type: "warning ",
-            message: "已取消",
-          });
-        });
-    },
-    handleChange (row) {
-      ElMessageBox.confirm("确定要结算吗", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          gameUsdWithdrawExamineSet({ ids: row.id }).then((res) => {
-            if (res.success === true) {
-              ElMessage({
-                type: "success",
-                message: "操作成功!",
-              });
-              this.getData();
-              this.idStr = null;
-            }
-          });
-        })
-        .catch(() => {
-          ElMessage({
-            type: "warning ",
-            message: "已取消",
-          });
-        });
-    },
-    // 点击搜索
-    handSearch () {
-      this.$refs["searchForm"].validate((valid) => {
-        if (valid) {
-          this.pageParams.pageNo = 1;
-          this.getData();
-        }
-      });
-    },
-    // 重置搜索表单
-    resetSearchForm () {
-      this.$refs["searchForm"].resetFields();
-      this.pageParams.pageNo = 1;
-      this.getData();
-    },
-    // 确认导出
-    confirmExport2Excel () {
-      ElMessageBox.confirm("确定以当前筛选条件导出Excel吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.btnLoading = true;
-          let { searchForm } = this;
-          searchForm = JSON.parse(JSON.stringify(searchForm));
-          Object.keys(searchForm).forEach((item) => {
-            if (
-              !searchForm[item] ||
-              (searchForm[item] !== undefined && searchForm[item] === "")
-            ) {
-              delete searchForm[item];
-            }
-          });
-          Object.assign(searchForm, { pageSize: -1, pageNo: 1 });
-
-          gameUsdWithdrawExamineExport(searchForm)
-            .then((res) => {
-              if (res) {
-                this.exportVisible = false;
-                this.btnLoading = false;
-                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((err) => {
-              console.error(err); // 打印错误信息
-              ElMessage.error("导出失败");
-            });
-        })
-        .catch(() => {
-          ElMessage({
-            type: "info",
-            message: "取消",
-          });
-        });
-    },
-    // 分页导航
-    handleSizeChange (val) {
-      this.pageParams.pageSize = val;
-      this.getData();
-    },
-    handlePageChange (val) {
-      this.pageParams.pageNo = val;
-      this.getData();
-    },
-    headerCopy (column, e) {
-      this.$copy(column.label);
-    },
-  },
-  computed: {
-    convertTimestamp1 () {
-      return function (time) {
-        let date = new Date(time);
-        return formatDateYMD(date);
-      };
-    },
-    convertTimestamp () {
-      return function (time) {
-        let date = new Date(time);
-        return formatDate(date);
-      };
-    },
-  },
-};
-</script>
-
-<style scope>
-.exportBtn {
-  margin-bottom: 0;
-}
-.text {
-  margin-left: 20px;
-}
-.container {
-  width: 100%;
-}
-.search-line {
-  width: 38%;
-}
-.boxs {
-  margin-top: 10px;
-  width: 100%;
-  word-wrap: break-word; /* 允许在单词内换行 */
-  overflow-wrap: break-word; /* 同上，现代浏览器推荐使用 */
-  white-space: normal; /* 允许换行 */
-}
-.radios {
-  display: block !important;
-  width: 100% !important;
-  word-wrap: break-word !important; /* 允许在单词内换行 */
-  overflow-wrap: break-word !important; /* 同上，现代浏览器推荐使用 */
-  white-space: normal !important; /* 允许换行 */
-  height: auto !important;
-}
-.boxs2 div {
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-</style>

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -452,10 +452,10 @@ export default {
       this.accountDetails.country = obj.country ? obj.country : "-";
       this.accountDetails.bank_account = obj.bank_account
         ? obj.bank_account
-        : "-";
+        : obj.account_no? obj.account_no : "-";
-      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name :"-";
       this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
-      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : obj.account_name?obj.account_name: "-";
       this.accountDetails.address = obj.address ? obj.address : "-";
       this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
       this.accountDetails.currency = res.currency ? res.currency : "-";

src/views/guildOperationManagement/officialWithdrawalGameMethodConfiguration.vue

@@ -1,330 +0,0 @@
-<template>
-  <div class="box">
-    <div class="inquire">
-      <span>分区</span>
-      <partition-select
-        v-model:partition-id="formData.partitionId"
-        @update:partitionId="getlistByPartition"
-        v-model:delete-id="deleteId"
-        :needAll="true"
-        :needAllPartition="true"
-      />
-    </div>
-    <div class="inquire">
-      <span>渠道</span>
-      <el-select
-        v-model="formData.accountType"
-        placeholder="请选择"
-        @change="getAdminCountryArr"
-        clearable
-      >
-        <el-option
-          v-for="item in accountTypeArr"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="inquire">
-      <span>国家</span>
-      <el-select v-model="formData.country" placeholder="请选择" clearable>
-        <el-option
-          v-for="item in adminCountryArr"
-          :key="item"
-          :label="item"
-          :value="item"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <el-button style="" type="primary" @click="getData()">查询</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="partitionDesc" align="center" label="分区" />
-      <el-table-column prop="accountTypeDesc" align="center" label="渠道" />
-      <el-table-column prop="country" align="center" label="国家" />
-      <el-table-column prop="currency" align="center" label="货币" />
-      <el-table-column prop="usdRatio" align="center" label="汇率" />
-      <el-table-column prop="updateTime" align="center" label="更新时间" />
-      <el-table-column prop="enable" align="center" label="是否展示">
-        <template v-slot="scope">
-          {{ scope.row.enable ? "是" : "否" }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="feeRate" align="center" label="手续费" />
-      <el-table-column prop="seq" align="center" label="排序" />
-      <el-table-column align="center" label="操作" width="300">
-        <template v-slot="scope">
-          <el-button
-            class="primary"
-            type="primary"
-            @click="detailPageFun(scope.row)"
-            size="default"
-            >编辑</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="editDialog" 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"
-          >分区</span
-        >{{ editFormData.partitionDesc }}
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >国家</span
-        >{{ editFormData.country }}
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >货币</span
-        >{{ editFormData.currency }}
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >汇率</span
-        >
-        <el-input
-          v-model="editFormData.usdRatio"
-          style="width: 50%"
-          class="input"
-        ></el-input>
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >手续费</span
-        >
-        <el-input
-          v-model="editFormData.feeRate"
-          style="width: 50%"
-          class="input"
-        ></el-input>
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >排序</span
-        >
-        <el-input
-          v-model="editFormData.seq"
-          style="width: 50%"
-          class="input"
-        ></el-input>
-      </div>
-      <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >是否展示</span
-        >
-        <el-select v-model="editFormData.enable" placeholder="请选择" >
-          <el-option label="是" :value="true"></el-option>
-          <el-option label="否" :value="false"></el-option>
-        </el-select>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()"> 确认 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { ref, onMounted, reactive, computed } from "vue";
-import PartitionSelect from "@/views/common/partitionSelect.vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import {
-  getGamelistAccountType,
-  getGameAccountConfigList,
-  saveGameAccountConfig
-} from "@/api/relAgency/relAgency";
-export default {
-  name: "officialWithdrawalGameMethodConfiguration",
-  components: {
-    PartitionSelect,
-  },
-  setup() {
-    const formData = reactive({
-      partitionId: undefined,
-      pageNo: 1,
-      pageSize: 10,
-      country: "",
-      accountType: "",
-    });
-    const tableData = reactive({
-      data: [],
-      total: 0,
-      loading: false,
-    });
-    const deleteId = ref(4);
-    const accountTypeArr = ref([]);
-    const accountTypeAllArr = ref([]);
-    const adminCountryArr = ref([]);
-    const editFormData = reactive({});
-    const editDialog = ref(false);
-    // 选择分区
-    const getlistByPartition = (e) => {
-      console.log(e);
-      if (e) {
-        formData.partitionId = e;
-        const matchedItems = accountTypeAllArr.value.filter(
-          (item) => (item.partitionFlag & formData.partitionId) != 0
-        );
-        accountTypeArr.value = matchedItems;
-      } else {
-        formData.partitionId = undefined;
-        accountTypeArr.value = accountTypeAllArr.value;
-      }
-      formData.accountType = "";
-      formData.country = "";
-    };
-    // 选择渠道
-    const getAdminCountryArr = (e) => {
-      const arr = accountTypeAllArr.value.filter((item) => item.value == e);
-      formData.country = "";
-      adminCountryArr.value = arr[0].country;
-    };
-    // 查询
-    const getData = () => {
-      tableData.loading = true;
-      getGameAccountConfigList(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 detailPageFun = (row) => {
-      editDialog.value = true;
-      Object.assign(editFormData, row);
-    };
-    const editDialogClick = () => { 
-        let obj = {
-            accountType : editFormData.accountType,
-            country : editFormData.country,
-            partitionId  : editFormData.partitionId,
-            seq  : editFormData.seq,
-            usdRatio  : editFormData.usdRatio,
-            withdrawRate : editFormData.feeRate,
-            enable:editFormData.enable
-        }
-        saveGameAccountConfig(obj).then((res) => { 
-            if (res.code == 200) {
-                ElMessage.success(res.message);
-                editDialog.value = false;
-                getData();
-            } else {
-                ElMessage.error(res.message);
-            }
-        });
-    };
-    onMounted(() => {
-      getGamelistAccountType().then((res) => {
-        if (res.code == 200) {
-          accountTypeAllArr.value = res.data;
-          // const matchedItems = accountTypeAllArr.value.filter(item=>
-          //     (item.partitionFlag & 1) != 0
-          // )
-          accountTypeArr.value = res.data;
-        } else {
-          ElMessage.error(res.message);
-        }
-      });
-    });
-    const handleSizeChange = (val) => {
-      formData.pageSize = val;
-      getData();
-    };
-    const handleCurrentChange = (val) => {
-      formData.pageNo = val;
-      getData();
-    };
-    return {
-      formData,
-      adminCountryArr,
-      getlistByPartition,
-      tableData,
-      getData,
-      editDialog,
-      editFormData,
-      deleteId,
-      accountTypeArr,
-      accountTypeAllArr,
-      getAdminCountryArr,
-      handleSizeChange,
-      handleCurrentChange,
-      detailPageFun,
-      editDialogClick
-    };
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-
-    span {
-      margin-right: 10px;
-    }
-
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/guildOperationManagement/roomGoldCoinFlow.vue

@@ -1,349 +0,0 @@
-<template>
-  <div class="box">
-    <div class="inquire">
-      <span>分区</span>
-      <el-select
-        v-model="formData.partitionId"
-        placeholder="请选择"
-        @change="getlistByPartition()"
-      >
-        <el-option
-          v-for="item in partitionOptions"
-          :key="item.id"
-          :label="item.desc"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div>
-
-    <div class="inquire">
-      <span>国家</span>
-      <el-select v-model="formData.regionId" placeholder="请选择">
-        <el-option
-          v-for="item in adminCountryArr"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="inquire">
-      <span>用户ID</span>
-      <el-input
-        v-model="formData.erbanNo"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span>公会长ID</span>
-      <el-input
-        v-model="formData.ownerErbanNo"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span>公会ID</span>
-      <el-input
-        v-model="formData.guildId"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span>周期</span>
-      <el-select v-model="formData.dateCycle" placeholder="请选择">
-        <el-option
-           v-for="item in dateCycleArr"
-          :key="item.timeId"
-          :label="item.timeName"
-          :value="item.timeId"
-        >
-        </el-option>
-      </el-select>
-    </div>
-
-    <div class="inquire">
-      <span class="demonstration">状态</span>
-      <el-select v-model="formData.status" placeholder="请选择">
-        <el-option label="全部" :value="-1"></el-option>
-        <el-option label="本周" :value="0"></el-option>
-        <el-option label="未发放" :value="1"></el-option>
-        <el-option label="已经发放" :value="2"></el-option>
-      </el-select>
-    </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="statDate" align="center" label="周期" />
-      <el-table-column prop="erbanNo" align="center" label="用户ID" />
-      <el-table-column prop="roomName" align="center" label="房间昵称" />
-      <el-table-column prop="partitionIdDesc" align="center" label="分区" />
-      <el-table-column prop="regionName" align="center" label="国家" />
-      <el-table-column prop="goldNum" align="center" label="金币流水" />
-      <el-table-column prop="diamondNum" align="center" label="钻石流水" />
-      <el-table-column prop="levelName" align="center" label="档位" />
-      <el-table-column
-        prop="rewardGold"
-        align="center"
-        label="对应金币流水发放金币"
-      />
-      <el-table-column prop="status" align="center" label="状态">
-        <template #default="row">
-          <span>{{ row.row.status == 0 ? "本周" :row.row.status == 1 ?'未发放' :"已经发放" }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sendTime" align="center" label="发放时间" />
-      <el-table-column align="center" label="操作" width="300">
-        <template v-slot="scope">
-          <el-button
-            class="primary"
-            type="primary"
-            @click="sendDiamond(scope.row)"
-            size="default"
-            v-if="scope.row.status == 1"
-            >发放</el-button
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="operator" align="center" label="操作人" />
-    </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"
-    />
-  </div>
-</template>
-<script>
-import { ref, onMounted, reactive } from "vue";
-import { getPartitionInfoList } from "@/api/partition/partitionInfo";
-import { dateFormat } from "@/utils/system-helper";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { formatDate } from "@/utils/relDate";
-import {
-  getlistByPartitionId,
-  getRoomWeekDiamondPage,
-  exportRoomWeekDiamond,
-  sendRoomWeekDiamondRaward,
-  getDateCycleList,
-  getRoomWeekDiamondListLevel,
-} from "@/api/relAgency/relAgency.js";
-import { familyMemberWeekLevelRewardListCycleDate } from "@/api/ResponsiblePersonManagement/ResponsiblePersonManagement.js";
-export default {
-  name: "roomGoldCoinFlow",
-  setup() {
-    const dataTime = ref("");
-    const formData = reactive({
-      partitionId: "",
-      erbanNo: "",
-      pageNo: 1,
-      pageSize: 10,
-      status: -1,
-      regionId: "",
-      ownerErbanNo: "",
-      guildId: "",
-      dateCycle: "",
-    });
-    const tableData = reactive({
-      data: [],
-      total: 0,
-      loading: false,
-    });
-    const adminCountryArr = ref([]);
-    const partitionOptions = ref([]);
-    const dateCycleArr = ref([]);
-    const levelArr = ref([]);
-
-    const getlistByPartition = () => {
-      getlistByPartitionId({
-        partitionId: formData.partitionId,
-        containAll: true,
-      }).then((res) => {
-        if (res.code == 200) {
-          adminCountryArr.value = res.data;
-        }
-      });
-    };
-    const getData = () => {
-      tableData.loading = true;
-      getRoomWeekDiamondPage(formData).then((res) => {
-        if (res.code === 200) {
-          tableData.data = res.data.rows;
-          tableData.total = res.data.total;
-          tableData.loading = false;
-        } else {
-          tableData.loading = false;
-          ElMessage.error(res.message);
-        }
-      });
-    };
-    const sendDiamond = (row) => {
-      const roomUid = row.roomUid;
-      const partitionId = row.partitionId;
-      const statDate = row.statDate;
-      ElMessageBox.confirm("确认发放吗", "提示", {
-        type: "warning",
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-      }).then(() => {
-        sendRoomWeekDiamondRaward({ roomUid, partitionId, statDate }).then(
-          (res) => {
-            if (res.code === 200) {
-              ElMessage.success("发放成功");
-              getData();
-            } else {
-              ElMessage.error(res.message);
-            }
-          }
-        );
-      });
-    };
-    // 导出
-    const confirmExport2Excel = async () => {
-      Object.assign(formData, { pageSize: 10000, pageNo: 1 });
-      try {
-        const res = await exportRoomWeekDiamond(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 resetFormData = () => {
-      Object.assign(formData, {
-        erbanNo: "",
-        pageNo: 1,
-        pageSize: 10,
-        status: -1,
-        regionId: "",
-        ownerErbanNo: "",
-        guildId: "",
-        dateCycle: "",
-      });
-      tableData.data = [];
-      tableData.total = 0;
-      dataTime.value = "";
-    };
-    const handleSizeChange = (val) => {
-      formData.pageSize = val;
-      getData();
-    };
-    const handleCurrentChange = (val) => {
-      formData.pageNo = val;
-      getData();
-    };
-    onMounted(() => {
-      getPartitionInfoList().then((res) => {
-        partitionOptions.value = res.data;
-        formData.partitionId = partitionOptions.value[0].id;
-        getlistByPartition();
-      });
-      familyMemberWeekLevelRewardListCycleDate().then((res) => {
-        if (res.code == 200) {
-          res.data.forEach((res, i) => {
-            dateCycleArr.value[i] = {
-              timeName: `${dateFormat(
-                res.startDate,
-                "yyyy-MM-dd"
-              )}~${dateFormat(res.endDate, "yyyy-MM-dd")}`,
-              timeId: res.dateCycle,
-            };
-          });
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-    });
-    return {
-      formData,
-      partitionOptions,
-      adminCountryArr,
-      getlistByPartition,
-      dataTime,
-      tableData,
-      getData,
-      handleSizeChange,
-      handleCurrentChange,
-      sendDiamond,
-      resetFormData,
-      confirmExport2Excel,
-      dateCycleArr,
-      levelArr,
-    };
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-
-    span {
-      margin-right: 10px;
-    }
-
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/guildOperationManagement/weeklyRewards.vue

@@ -1,54 +1,63 @@
 <template>
   <div class="box">
+    <!-- 查询 -->
     <div class="inquire">
-      <span>公会ID</span>
+      <div class="block">
-      <el-input
+        <span class="demonstration">分区</span>
-        v-model="formData.guildId"
+        <partition-select v-model:partition-id="inquire.partitionId"
-        placeholder=""
+                          v-model:partition-infos="inquire.partitionArr"
-        class="input"
+        />
-      ></el-input>
+      </div>
     </div>
-    <div class="inquire">
-      <span>公会长ID</span>
-      <el-input
-        v-model="formData.guildOwnerErbanNo"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-    <div class="inquire">
-      <span>主播ID</span>
-      <el-input
-        v-model="formData.erbanNo"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-
     <div class="inquire">
       <span>周期</span>
-      <el-select v-model="formData.cycleDate " placeholder="请选择">
+      <el-select v-model="inquire.gameArrVal" placeholder="请选择">
         <el-option
-          v-for="item in dateCycleArr"
+          v-for="item in inquire.gamesArr"
-          :key="item.timeId"
+          :key="item.gameId"
-          :label="item.timeName"
+          :label="item.gameName"
-          :value="item.timeId"
+          :value="item.gameId"
         >
         </el-option>
       </el-select>
     </div>
-
+    <div class="inquire">
-    <el-button style="" type="primary" @click="getData()">查询</el-button>
+      <span>ID</span>
-    <el-button class="primary" type="primary" @click="resetFormData()"
+      <el-input
-      >重置</el-button
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        tableData = [];
+        currentPage = 1;
+        isFinished = false;
+        getData();
+      "
+      >查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        this.inquire.userId = '';
+        this.getData();
+      "
+      >重置搜索</el-button
     >
     <el-button class="primary" type="primary" @click="confirmExport2Excel()"
       >导出</el-button
     >
-    <!-- 表格数据 -->
+
+    <!-- 表格 -->
     <el-table
-      v-loading="tableData.loading"
+      v-loading="loading"
-      :data="tableData.data"
+      :data="tableData"
       ref="multipleTable"
       @selection-change="handleSelectionChange"
       border
@@ -58,136 +67,123 @@
       <el-table-column prop="familyId" align="center" label="公会ID" />
       <el-table-column prop="familyName" align="center" label="公会昵称" />
       <el-table-column prop="familyOwnerId" align="center" label="公会长ID" />
-      <el-table-column prop="familyOwnerNick" align="center" label="公会长昵称" />
+      <el-table-column
+        prop="familyOwnerNick"
+        align="center"
+        label="公会长昵称"
+      />
       <el-table-column prop="erbanNo" align="center" label="主播ID" />
       <el-table-column prop="nick" align="center" label="主播昵称" />
+      <el-table-column prop="level" align="center" label="主播等级" />
       <el-table-column prop="processNum" align="center" label="钻石流水" />
-      <el-table-column prop="rewardNum" align="center" label="金币奖励" />
+      <el-table-column prop="rewardNum" align="center" label="已获得金币" />
-      <el-table-column prop="micValidDay" align="center" label="天数" />
+      <el-table-column prop="receivedNum" align="center" label="已领取金币" />
-      <el-table-column prop="bonusRewardNum" align="center" label="时长奖励" />
-      <el-table-column prop="totalRewardNum" align="center" label="目标领取金币" />
-      <el-table-column prop="receivedNum" align="center" label="用户已领金币" />
     </el-table>
+
     <!-- 分页 -->
     <el-pagination
       style="margin-top: 10px"
       class="paginationClass"
-      :current-page="formData.pageNo"
+      v-model:current-page="currentPage"
-      :page-size="formData.pageSize"
+      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 50, 100, 200]"
+      :page-sizes="[1, 10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
       layout="sizes, prev, pager, next"
-      :total="tableData.total"
+      :total="total"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
   </div>
 </template>
 <script>
-import { ref, onMounted, reactive } from "vue";
-import { dateFormat } from "@/utils/system-helper";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { formatDate } from "@/utils/relDate";
 import {
-  getguildMemberWeekLevelRewardPage,
+  familyMemberWeekLevelRewardPage,
-  exportGuildMemberWeekLevelReward,
+  familyMemberWeekLevelRewardExport,
-  getguildMemberWeekLevelRewardListCycleDate
+  familyMemberWeekLevelRewardListCycleDate,
-} from "@/api/relAgency/relAgency.js";
+} from "@/api/relAgency/relAgency";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus";
+import PartitionSelect from "@/views/common/partitionSelect.vue"; // 正确引入 ElM
 export default {
   name: "weeklyRewards",
-  setup() {
+  components: {PartitionSelect},
-    const formData = reactive({
+  data() {
-      erbanNo: "",
+    return {
-      pageNo: 1,
-      pageSize: 10,
-      guildOwnerErbanNo: "",
-      guildId: "",
-      cycleDate : "",
-      partitionId:2
-    });
-    const tableData = reactive({
-      data: [],
-      total: 0,
       loading: false,
-    });
+      //查询所需条件对象
-    const dateCycleArr = ref([]);
+      inquire: {
-
+        userId: "",
-    const getData = () => {
+        gamesArr: [],
-      if(formData.cycleDate == ""){
+        gameArrVal: 1,
-        ElMessage.error("请选择周期");
+        partitionId: 1,
-        return;
+        partitionArr: [
-      }
+          { id: 1, desc: "英语区" },
-      tableData.loading = true;
+          { id: 2, desc: "阿拉伯" },
-      getguildMemberWeekLevelRewardPage(formData).then((res) => {
+        ],
-        if (res.code === 200) {
+      },
-          tableData.data = res.data.rows;
+      // 表格
-          tableData.total = res.data.total;
+      tableData: [],
-          tableData.loading = false;
+      // 分页
-        } else {
+      total: 0, //总页数
-          tableData.loading = false;
+      currentPage: 1, //页码
-          ElMessage.error(res.message);
+      pageSize: 10, //条数
-        }
-      });
     };
-    // 导出
+  },
-    const confirmExport2Excel = async () => {
+  created() {
-      try {
+    // const timestamps = this.getCurrentWeekTimestamps();
-        const res = await exportGuildMemberWeekLevelReward(formData);
+    // var obj = {};
-        if (res) {
+    // timestamps.forEach((res, i) => {
-          ElMessage({
+    //   this.inquire.gamesArr[i] = {
-            message: "导出成功",
+    //     gameName: dateFormat(res, "yyyy-MM-dd"),
-            type: "success",
+    //     gameId: dateFormat(res, "yyyy-MM-dd"),
-          });
+    //   };
-          let time = formatDate(new Date());
+    // });
-          let alink = document.createElement("a");
+    // this.inquire.gameArrVal = this.inquire.gamesArr[0].gameId;
-          alink.download = `主播周奖励${time}.xls`;
+    familyMemberWeekLevelRewardListCycleDate().then((res) => {
-          alink.style.display = "none";
+      if (res.code == 200) {
-          const blob = new Blob([res]);
+        res.data.forEach((res, i) => {
-          alink.href = URL.createObjectURL(blob);
+          this.inquire.gamesArr[i] = {
-          document.body.appendChild(alink);
+            gameName: `${dateFormat(res.startDate, "yyyy-MM-dd")}~${dateFormat(
-          alink.click();
+              res.endDate,
-          URL.revokeObjectURL(alink.href);
+              "yyyy-MM-dd"
-        }
+            )}`,
-      } catch (error) {
+            gameId: res.dateCycle,
+          };
+        });
+        this.inquire.gameArrVal = this.inquire.gamesArr[0].gameId;
+        this.getData();
+      } else {
         ElMessage({
-          message: error.message,
+          showClose: true,
+          message: res.message,
           type: "error",
         });
       }
-    };
+    });
-    //重置
+    // listPartitionInfo().then((res) => {
-    const resetFormData = () => {
+    //   this.inquire.partitionArr = res.data;
-      Object.assign(formData, {
+    //   this.inquire.partitionId = this.inquire.partitionArr[0].id;
-        erbanNo: "",
+    //   this.getData();
-      pageNo: 1,
+    // });
-      pageSize: 10,
+  },
-      guildOwnerErbanNo: "",
+  methods: {
-      guildId: "",
+    // 查询接口
-      cycleDate : "",
+    getData() {
-      partitionId:2
+      this.isLoading = true;
-      });
+      this.loading = true;
-      tableData.data = [];
+      familyMemberWeekLevelRewardPage({
-      tableData.total = 0;
+        cycleDate: this.inquire.gameArrVal,
-    };
+        erbanNo: this.inquire.userId,
-    const handleSizeChange = (val) => {
+        pageNo: this.currentPage,
-      formData.pageSize = val;
+        pageSize: this.pageSize,
-      getData();
+        partitionId: this.inquire.partitionId,
-    };
+      }).then((res) => {
-    const handleCurrentChange = (val) => {
-      formData.pageNo = val;
-      getData();
-    };
-    onMounted(() => {
-      getguildMemberWeekLevelRewardListCycleDate().then((res) => {
         if (res.code == 200) {
-          res.data.forEach((res, i) => {
+          this.total = res.data.total;
-            dateCycleArr.value[i] = {
+          this.tableData = res.data.rows;
-              timeName: `${dateFormat(
-                res.startDate,
-                "yyyy-MM-dd"
-              )}~${dateFormat(res.endDate, "yyyy-MM-dd")}`,
-              timeId: res.dateCycle,
-            };
-          });
         } else {
           ElMessage({
             showClose: true,
@@ -195,18 +191,42 @@ export default {
             type: "error",
           });
         }
+        this.loading = false;
+        this.isLoading = false;
       });
-    });
+    },
-    return {
+    getCurrentWeekTimestamps() {
-      formData,
+      const today = new Date();
-      tableData,
+      const dayOfWeek = today.getDay(); // 0（周日）到6（周六）
-      getData,
+      // 计算到周一的天数差：周日需-6天，其他天减(当前星期数 - 1)
-      handleSizeChange,
+      const diffToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek;
-      handleCurrentChange,
+      const monday = new Date(today);
-      resetFormData,
+      monday.setDate(monday.getDate() + diffToMonday);
-      confirmExport2Excel,
+      monday.setHours(0, 0, 0, 0); // 设置为周一的0点
-      dateCycleArr,
+
-    };
+      const weekTimestamps = [];
+      for (let i = 0; i < 7; i++) {
+        const date = new Date(monday);
+        date.setDate(monday.getDate() + i);
+        weekTimestamps.push(date.getTime());
+      }
+      return weekTimestamps; // 包含周一到周日每天0点的时间戳数组
+    },
+    // 导出
+    confirmExport2Excel() {
+      familyMemberWeekLevelRewardExport({
+        cycleDate: this.inquire.gameArrVal,
+        erbanNo: this.inquire.userId,
+        partitionId: this.inquire.partitionId,
+      }).then();
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
   },
 };
 </script>
@@ -214,28 +234,41 @@ export default {
 .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;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
 </style>

src/views/headwear/HeadwearAdminView.vue

@@ -119,6 +119,9 @@
                 <input type="checkbox"
                        name="partitionFlag"
                        value="16" />英语2区<br>
+                       <input type="checkbox"
+                       name="partitionFlag"
+                       value="32" />独联体<br>
               </div>
             </div>
             <div class="form-group">
@@ -171,6 +174,36 @@
                        id="headwearPtName">
               </div>
             </div>
+            <div class="form-group">
+              <label for="headwearRuName"
+                     class="col-sm-3 control-label">俄语头饰名称:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control"
+                       name="headwearName"
+                       id="headwearRuName">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="headwearEsName"
+                     class="col-sm-3 control-label">西班牙头饰名称:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control"
+                       name="headwearName"
+                       id="headwearEsName">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="headwearUzName"
+                     class="col-sm-3 control-label">乌兹别克头饰名称:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control"
+                       name="headwearName"
+                       id="headwearUzName">
+              </div>
+            </div>
             <div class="form-group">
               <label class="col-sm-3 control-label">使用萝卜购买</label>
               <div class="col-sm-9">
@@ -601,6 +634,9 @@ export default {
             { field: 'name.en', title: '英语头饰名称', align: 'center', width: '5%' },
             { field: 'name.tr', title: '土耳其头饰名称', align: 'center', width: '5%' },
             { field: 'name.pt', title: '葡萄牙头饰名称', align: 'center', width: '5%' },
+            { field: 'name.ru', title: '俄语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.es', title: '西班牙头饰名称', align: 'center', width: '5%' },
+            { field: 'name.uz', title: '乌兹别克头饰名称', align: 'center', width: '5%' },
             {
               field: "pic",
               title: "头饰样式",
@@ -640,6 +676,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -866,6 +905,9 @@ export default {
           $("#headwearEnName").val("");
           $("#headwearTrName").val("");
           $("#headwearPtName").val("");
+          $("#headwearRuName").val("");
+          $("#headwearEsName").val("");
+          $("#headwearUzName").val("");
           $("#price").val("");
           $("#renewPrice").val("");
           $("#originalPrice").val("");
@@ -913,8 +955,11 @@ export default {
           var headwearEnName = $("#headwearEnName").val();
           var headwearTrName = $("#headwearTrName").val();
           var headwearPtName = $("#headwearPtName").val();
+          var headwearRuName = $("#headwearRuName").val();
+          var headwearEsName = $("#headwearEsName").val();
+          var headwearUzName = $("#headwearUzName").val();
           // 国际化字段
-          var jsonName = { "zh": headwearName, "ar": headwearArName, "en": headwearEnName, "tr": headwearTrName, "pt": headwearPtName }
+          var jsonName = { "zh": headwearName, "ar": headwearArName, "en": headwearEnName, "tr": headwearTrName, "pt": headwearPtName,"ru": headwearRuName ,"es": headwearEsName ,"uz": headwearUzName  }
           const nameValue = JSON.stringify(jsonName);
           var price = $("#price").val();
           var renewPrice = $("#renewPrice").val();
@@ -1052,12 +1097,18 @@ export default {
                   $("#headwearEnName").val(jsonName.en);
                   $("#headwearTrName").val(jsonName.tr);
                   $("#headwearPtName").val(jsonName.pt);
+                  $("#headwearRuName").val(jsonName.ru);
+                  $("#headwearEsName").val(jsonName.es);
+                  $("#headwearUzName").val(jsonName.uz);
                 } else {
                   $("#headwearName").val(name);
                   $("#headwearArName").val(name);
                   $("#headwearEnName").val(name);
                   $("#headwearTrName").val(name);
                   $("#headwearPtName").val(name);
+                  $("#headwearRuName").val(name);
+                  $("#headwearEsName").val(name);
+                  $("#headwearUzName").val(name);
                 }
 
                 $("#price").val(json.price);
@@ -1196,6 +1247,11 @@ export default {
                 } else {
                   $("input:checkbox[name='partitionFlag']")[4].checked = false;
                 }
+                if ((partitionFlag & 32) != 0) {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = true;
+                } else {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = false;
+                }
 
                 // 打开编辑弹窗
                 $("#headwearModal").modal('show');

src/views/infocard/InfocardManageView.vue

@@ -116,6 +116,9 @@
                 <input type="checkbox"
                        name="partitionFlag"
                        value="16" />英语2区<br />
+                       <input type="checkbox"
+                       name="partitionFlag"
+                       value="32" />独联体<br />
               </div>
             </div>
             <div class="form-group">
@@ -186,6 +189,39 @@
                        placeholder="请输入资料卡名称" />
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru_modal_name"
+                     class="col-sm-4 control-label">俄语装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="ru_modal_name"
+                       placeholder="请输入资料卡名称" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_modal_name"
+                     class="col-sm-4 control-label">西班牙装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="es_modal_name"
+                       placeholder="请输入资料卡名称" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_modal_name"
+                     class="col-sm-4 control-label">乌兹别克装扮名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="uz_modal_name"
+                       placeholder="请输入资料卡名称" />
+              </div>
+            </div>
             <form class="form-horizontal"
                   id="addForm1">
               <div class="form-group">
@@ -402,6 +438,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += "英语2区<br>";
                 }
+                if ((val & 32) != 0) {
+                  value += "独联体<br>";
+                }
                 return value;
               },
             },
@@ -435,6 +474,24 @@ export default {
               align: "middle",
               width: "5%",
             },
+            {
+              field: "name.ru",
+              title: "俄语装扮名称",
+              align: "middle",
+              width: "5%",
+            },
+            {
+              field: "name.es",
+              title: "西班牙语装扮名称",
+              align: "middle",
+              width: "5%",
+            },
+            {
+              field: "name.uz",
+              title: "乌兹别克语装扮名称",
+              align: "middle",
+              width: "5%",
+            },
             {
               field: "pic",
               title: "装扮图片",
@@ -653,6 +710,9 @@ export default {
             // 土耳其
             $("#addForm #tr_modal_name").val(row.name.tr);
             $("#addForm #pt_modal_name").val(row.name.pt);
+            $("#addForm #ru_modal_name").val(row.name.ru);
+            $("#addForm #es_modal_name").val(row.name.es);
+            $("#addForm #uz_modal_name").val(row.name.uz);
           } else {
             $("#addForm #modal_name").val(name);
             // 阿语
@@ -662,6 +722,9 @@ export default {
             // 土耳其
             $("#addForm #tr_modal_name").val(name);
             $("#addForm #pt_modal_name").val(name);
+            $("#addForm #ru_modal_name").val(name);
+            $("#addForm #es_modal_name").val(name);
+            $("#addForm #uz_modal_name").val(name);
           }
           $("#addIconPicUrl").attr("src", row.pic);
           $("#addIconPicUrl2").attr("src", row.effect);
@@ -696,6 +759,11 @@ export default {
           } else {
             $("input:checkbox[name='partitionFlag']")[4].checked = false;
           }
+          if ((partitionFlag & 32) != 0) {
+            $("input:checkbox[name='partitionFlag']")[5].checked = true;
+          } else {
+            $("input:checkbox[name='partitionFlag']")[5].checked = false;
+          }
           $("#addModal").modal("show");
         });
 
@@ -761,6 +829,9 @@ export default {
           var enName = $("#en_modal_name").val();
           var trName = $("#tr_modal_name").val();
           var ptName = $("#pt_modal_name").val();
+          var ruName = $("#ru_modal_name").val();
+          var esName = $("#es_modal_name").val();
+          var uzName = $("#uz_modal_name").val();
           //做下数据校验
           if (isEmpty(name)) {
             $("#tipMsg").text("装扮名字不能为空");
@@ -787,6 +858,21 @@ export default {
             $("#tipModal").modal("show");
             return;
           }
+          if (isEmpty(ruName)) {
+            $("#tipMsg").text("俄语装扮名字不能为空");
+            $("#tipModal").modal("show");
+            return;
+          }
+          if (isEmpty(esName)) {
+            $("#tipMsg").text("西班牙装扮名字不能为空");
+            $("#tipModal").modal("show");
+            return;
+          }
+          if (isEmpty(uzName)) {
+            $("#tipMsg").text("乌兹别克装扮名字不能为空");
+            $("#tipModal").modal("show");
+            return;
+          }
           if (isEmpty(pic)) {
             $("#tipMsg").text("图片不能为空");
             $("#tipModal").modal("show");
@@ -803,7 +889,7 @@ export default {
               }, {});
 
             // 国际化字段
-            var jsonName = { zh: name, ar: arName, en: enName, tr: trName, pt: ptName };
+            var jsonName = { zh: name, ar: arName, en: enName, tr: trName, pt: ptName, ru: ruName , es: esName , uz: uzName  };
             const nameValue = JSON.stringify(jsonName);
             // 修改属性值
             formData.name = nameValue; // 将giftName修改为"newGiftName"

src/views/login/index.vue

@@ -4,7 +4,7 @@
          :style="[smsSwitch ? 'height: 350px' : '']">
       <div class="login_box">
         <div class="login_logo">
-          <span style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;E-Party&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
+          <span style="font-size:24px;color:#222;font-weight:bold;">&nbsp;&nbsp;MOLISTAR&nbsp;管&nbsp;理&nbsp;系&nbsp;统</span>
         </div>
         <div class="login_form">
           <form id="loginForm"

src/views/medal/MedalInfo.vue

@@ -69,6 +69,21 @@
                        label="勋章名称-葡萄牙语区">
         <template v-slot="scope">{{ getJsonField(scope.row.name, 'pt') }}</template>
       </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章名称-俄语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'ru') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章名称-西班牙语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'es') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章名称-乌兹别克语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'uz') }}</template>
+      </el-table-column>
       <el-table-column prop="medalDesc"
                        align="center"
                        label="勋章获得方式-华语区">
@@ -94,6 +109,21 @@
                        label="勋章获得方式-葡萄牙语区">
         <template v-slot="scope">{{ getJsonField(scope.row.medalDesc, 'pt')}}</template>
       </el-table-column>
+      <el-table-column prop="medalDesc"
+                       align="center"
+                       label="勋章获得方式-俄语">
+        <template v-slot="scope">{{ getJsonField(scope.row.medalDesc, 'ru')}}</template>
+      </el-table-column>
+       <el-table-column prop="medalDesc"
+                       align="center"
+                       label="勋章获得方式-西班牙语">
+        <template v-slot="scope">{{ getJsonField(scope.row.medalDesc, 'es')}}</template>
+      </el-table-column>
+       <el-table-column prop="medalDesc"
+                       align="center"
+                       label="勋章获得方式-乌兹别克语">
+        <template v-slot="scope">{{ getJsonField(scope.row.medalDesc, 'uz')}}</template>
+      </el-table-column>
       <el-table-column align="center"
                        prop="picUrl"
                        label="勋章图片"
@@ -215,6 +245,27 @@
                   placeholder=""
                   class="input"></el-input>
       </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章名称-俄语</span>
+        <el-input v-model="controlsObj.nickRu"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章名称-西班牙语</span>
+        <el-input v-model="controlsObj.nickEs"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章名称-乌兹别克语</span>
+        <el-input v-model="controlsObj.nickUz"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
 
       <!-- 勋章获得方式-华语 -->
       <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
@@ -257,6 +308,27 @@
                   placeholder=""
                   class="input"></el-input>
       </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章获得方式-俄语</span>
+        <el-input v-model="controlsObj.medalDescRu"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章获得方式-西班牙语</span>
+        <el-input v-model="controlsObj.medalDescEs"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">勋章获得方式-乌兹别克语</span>
+        <el-input v-model="controlsObj.medalDescUz"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
 
       <!-- 勋章图片 -->
       <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
@@ -417,6 +489,9 @@ export default {
         nickAr: "",
         nickTr: "",
         nickPt: "",
+        nickRu: "",
+        nickEs: "",
+        nickUz: "",
         imageUrl1: "",
         imageUrl2: '',
         value2: "",
@@ -425,6 +500,9 @@ export default {
         medalDescAr: '',
         medalDescTr: '',
         medalDescPt: '',
+        medalDescRu: '',
+        medalDescEs: '',
+        medalDescUz: '',
         options2: [
           {
             desc: "生效",
@@ -486,6 +564,9 @@ export default {
       this.controlsObj.nickAr = "";
       this.controlsObj.nickTr = "";
       this.controlsObj.nickPt = "";
+      this.controlsObj.nickRu = "";
+      this.controlsObj.nickEs = "";
+      this.controlsObj.nickUz = "";
       this.controlsObj.imageUrl1 = "";
       this.controlsObj.imageUrl2 = "";
       this.controlsObj.medalDescZh = "";
@@ -493,6 +574,9 @@ export default {
       this.controlsObj.medalDescAr = "";
       this.controlsObj.medalDescTr = "";
       this.controlsObj.medalDescPt = "";
+      this.controlsObj.medalDescRu = "";
+      this.controlsObj.medalDescEs = "";
+      this.controlsObj.medalDescUz = "";
       this.controlsObj.value2 = "";
       this.controlsDialog = true;
     },
@@ -506,12 +590,18 @@ export default {
       this.controlsObj.nickAr = JSON.parse(val.name).ar;
       this.controlsObj.nickTr = JSON.parse(val.name).tr;
       this.controlsObj.nickPt = JSON.parse(val.name).pt;
+      this.controlsObj.nickRu = JSON.parse(val.name).ru;
+      this.controlsObj.nickEs = JSON.parse(val.name).es;
+      this.controlsObj.nickUz = JSON.parse(val.name).uz;
       if (val.medalDesc) {
         this.controlsObj.medalDescZh = JSON.parse(val.medalDesc).zh;
         this.controlsObj.medalDescEn = JSON.parse(val.medalDesc).en;
         this.controlsObj.medalDescAr = JSON.parse(val.medalDesc).ar;
         this.controlsObj.medalDescTr = JSON.parse(val.medalDesc).tr;
         this.controlsObj.medalDescPt = JSON.parse(val.medalDesc).pt;
+        this.controlsObj.medalDescRu = JSON.parse(val.medalDesc).ru;
+        this.controlsObj.medalDescEs = JSON.parse(val.medalDesc).es;
+        this.controlsObj.medalDescUz = JSON.parse(val.medalDesc).uz;
       }
       this.controlsObj.imageUrl1 = val.picUrl;
       this.controlsObj.imageUrl2 = val.mp4Url;
@@ -538,6 +628,9 @@ export default {
           ar: this.controlsObj.nickAr,
           tr: this.controlsObj.nickTr,
           pt: this.controlsObj.nickPt,
+          ru: this.controlsObj.nickRu,
+          es: this.controlsObj.nickEs,
+          uz: this.controlsObj.nickUz,
         });
 
         obj.medalDesc = JSON.stringify({
@@ -546,6 +639,9 @@ export default {
           ar: this.controlsObj.medalDescAr,
           tr: this.controlsObj.medalDescTr,
           pt: this.controlsObj.medalDescPt,
+          ru: this.controlsObj.medalDescRu,
+          es: this.controlsObj.medalDescEs,
+          uz: this.controlsObj.medalDescUz,
         });
         obj.picUrl = this.controlsObj.imageUrl1;
         obj.mp4Url = this.controlsObj.imageUrl2;
@@ -577,6 +673,9 @@ export default {
           ar: this.controlsObj.nickAr,
           tr: this.controlsObj.nickTr,
           pt: this.controlsObj.nickPt,
+          ru: this.controlsObj.nickRu,
+          es: this.controlsObj.nickEs,
+          uz: this.controlsObj.nickUz,
         });
         obj1.medalDesc = JSON.stringify({
           zh: this.controlsObj.medalDescZh,
@@ -584,6 +683,9 @@ export default {
           ar: this.controlsObj.medalDescAr,
           tr: this.controlsObj.medalDescTr,
           pt: this.controlsObj.medalDescPt,
+          ru: this.controlsObj.medalDescRu,
+          es: this.controlsObj.medalDescEs,
+          uz: this.controlsObj.medalDescUz,
         });
         obj1.picUrl = this.controlsObj.imageUrl1;
         obj1.mp4Url = this.controlsObj.imageUrl2;
@@ -654,6 +756,9 @@ export default {
         if ((num & 16) != 0) {
           valArr.push(16);
         }
+        if ((num & 32) != 0) {
+          valArr.push(32);
+        }
         return valArr;
       } else {
         if ((num & 1) != 0) {
@@ -671,6 +776,9 @@ export default {
         if ((num & 16) != 0) {
           val += '英语2区    ';
         }
+        if ((num & 32) != 0) {
+          val += '独联体    ';
+        }
         return val;
       }
 

src/views/medal/MedalLevelManagement.vue

@@ -68,6 +68,21 @@
                        label="勋章等级名称-葡萄牙语区">
         <template v-slot="scope">{{ getJsonField(scope.row.seriesName, 'pt') }}</template>
       </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章等级名称-俄语">
+        <template v-slot="scope">{{ getJsonField(scope.row.seriesName, 'ru') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章等级名称-西班牙语">
+        <template v-slot="scope">{{ getJsonField(scope.row.seriesName, 'es') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="勋章等级名称-乌兹别克语">
+        <template v-slot="scope">{{ getJsonField(scope.row.seriesName, 'uz') }}</template>
+      </el-table-column>
       <el-table-column prop="partitionDesc"
                        align="center"
                        label="分区">
@@ -187,6 +202,30 @@
                   class="input"
                   style="width: 50%"></el-input>
       </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">勋章等级名称-俄语</span>
+        <el-input v-model="addFormData.seriesNameRu"
+                  placeholder=""
+                  class="input"
+                  style="width: 50%"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">勋章等级名称-西班牙语</span>
+        <el-input v-model="addFormData.seriesNameEs"
+                  placeholder=""
+                  class="input"
+                  style="width: 50%"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">勋章等级名称-乌兹别克语</span>
+        <el-input v-model="addFormData.seriesNameUz"
+                  placeholder=""
+                  class="input"
+                  style="width: 50%"></el-input>
+      </div>
 
       <div style="margin-bottom: 25px">
         <span style="display: inline-block; margin-right: 20px; width: 100px"
@@ -325,6 +364,9 @@ export default {
       seriesNameAr: '',
       seriesNameTr: '',
       seriesNamePt: '',
+      seriesNameRu: '',
+      seriesNameEs: '',
+      seriesNameUz: '',
       seq: '',
       seriesId: '',
     })
@@ -369,6 +411,9 @@ export default {
         ar: addFormData.seriesNameAr,
         tr: addFormData.seriesNameTr,
         pt: addFormData.seriesNamePt,
+        ru: addFormData.seriesNameRu,
+        es: addFormData.seriesNameEs,
+        uz: addFormData.seriesNameUz,
       });
       obj.status = addFormData.status;
       obj.squareShow = addFormData.squareShow;
@@ -415,6 +460,9 @@ export default {
         addFormData.seriesNameAr = JSON.parse(val.seriesName).ar;
         addFormData.seriesNameTr = JSON.parse(val.seriesName).tr;
         addFormData.seriesNamePt = JSON.parse(val.seriesName).pt;
+        addFormData.seriesNameRu = JSON.parse(val.seriesName).ru;
+        addFormData.seriesNameEs = JSON.parse(val.seriesName).es;
+        addFormData.seriesNameUz = JSON.parse(val.seriesName).uz;
       }
       selectedCount.value = val.medalLevel;
       addDialog.value = true;
@@ -445,6 +493,9 @@ export default {
         if ((num & 16) != 0) {
           valArr.push(16);
         }
+        if ((num & 32) != 0) {
+          valArr.push(32);
+        }
         return valArr;
       } else {
         if ((num & 1) != 0) {
@@ -462,6 +513,9 @@ export default {
         if ((num & 16) != 0) {
           val += '英语2区    ';
         }
+        if ((num & 32) != 0) {
+          val += '独联体    ';
+        }
         return val;
       }
 
@@ -488,6 +542,9 @@ export default {
         seriesNameAr: '',
         seriesNameTr: '',
         seriesNamePt: '',
+        seriesNameRu: '',
+        seriesNameEs: '',
+        seriesNameUz: '',
         seq: '',
         seriesId: '',
       });

src/views/nameplate/NameplateInfoView.vue

@@ -136,6 +136,9 @@
                 <input type="checkbox"
                        name="partitionFlag"
                        value="16" />英语2区<br>
+                       <input type="checkbox"
+                       name="partitionFlag"
+                       value="32" />独联体<br>
               </div>
             </div>
             <div class="form-group">
@@ -204,6 +207,39 @@
                        id="pt_name1"
                        placeholder="请输入,5个字符内">
               </div>
+            </div>
+             <div class="form-group">
+              <label for="ru_name1"
+                     class="col-sm-4 control-label">俄语铭牌名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name1"
+                       id="ru_name1"
+                       placeholder="请输入,5个字符内">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_name1"
+                     class="col-sm-4 control-label">西班牙语铭牌名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name1"
+                       id="es_name1"
+                       placeholder="请输入,5个字符内">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_name1"
+                     class="col-sm-4 control-label">乌兹别克语铭牌名称:</label>
+              <div class="col-sm-6">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name1"
+                       id="uz_name1"
+                       placeholder="请输入,5个字符内">
+              </div>
             </div>
             <div class="form-group">
               <label class="col-sm-4 control-label">用户自定义文案:</label>
@@ -267,6 +303,36 @@
                          id="ptFixedWord">
                 </div>
               </div>
+              <div class="form-group">
+                <label for="ruFixedWord"
+                       class="col-sm-4 control-label">俄语固定文案:</label>
+                <div class="col-sm-6">
+                  <input type="text"
+                         class="form-control"
+                         name="ruFixedWord"
+                         id="ruFixedWord">
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="esFixedWord"
+                       class="col-sm-4 control-label">西班牙语固定文案:</label>
+                <div class="col-sm-6">
+                  <input type="text"
+                         class="form-control"
+                         name="esFixedWord"
+                         id="esFixedWord">
+                </div>
+              </div>
+              <div class="form-group">
+                <label for="uzFixedWord"
+                       class="col-sm-4 control-label">乌兹别克语固定文案:</label>
+                <div class="col-sm-6">
+                  <input type="text"
+                         class="form-control"
+                         name="uzFixedWord"
+                         id="uzFixedWord">
+                </div>
+              </div>
             </div>
             <div class="form-group">
               <label for="days"
@@ -440,6 +506,9 @@ export default {
             { field: 'name.en', title: '英语铭牌名称', align: 'middle', width: '5%' },
             { field: 'name.tr', title: '土耳其名称', align: 'middle', width: '5%' },
             { field: 'name.pt', title: '葡萄牙语名称', align: 'middle', width: '5%' },
+            { field: 'name.ru', title: '俄语名称', align: 'middle', width: '5%' },
+            { field: 'name.es', title: '西班牙语名称', align: 'middle', width: '5%' },
+            { field: 'name.uz', title: '乌兹别克语名称', align: 'middle', width: '5%' },
             {
               field: 'partitionFlag',
               title: '地区',
@@ -462,6 +531,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -545,6 +617,45 @@ export default {
                 }
               }
             },
+            {
+              field: 'fixedWord.ru',
+              title: '俄语固定文案',
+              align: 'middle',
+              width: '5%',
+              formatter: function (val, row, index) {
+                if (isEmpty(val)) {
+                  return '/';
+                } else {
+                  return val;
+                }
+              }
+            },
+            {
+              field: 'fixedWord.es',
+              title: '西班牙语固定文案',
+              align: 'middle',
+              width: '5%',
+              formatter: function (val, row, index) {
+                if (isEmpty(val)) {
+                  return '/';
+                } else {
+                  return val;
+                }
+              }
+            },
+            {
+              field: 'fixedWord.uz',
+              title: '乌兹别克语固定文案',
+              align: 'middle',
+              width: '5%',
+              formatter: function (val, row, index) {
+                if (isEmpty(val)) {
+                  return '/';
+                } else {
+                  return val;
+                }
+              }
+            },
             { field: 'days', title: '有效期(天)', align: 'middle', width: '5%' },
             { field: 'statusStr', title: '状态', align: 'middle', width: '5%' },
             { field: 'typeStr', title: '铭牌款式', align: 'middle', width: '5%' },
@@ -686,12 +797,18 @@ export default {
                   $("#en_name1").val(jsonName.en);
                   $("#tr_name1").val(jsonName.tr);
                   $("#pt_name1").val(jsonName.pt);
+                  $("#ru_name1").val(jsonName.ru);
+                  $("#es_name1").val(jsonName.es);
+                  $("#uz_name1").val(jsonName.uz);
                 } else {
                   $("#name1").val(name);
                   $("#ar_name1").val(name);
                   $("#en_name1").val(name);
                   $("#tr_name1").val(name);
                   $("#pt_name1").val(name);
+                  $("#ru_name1").val(name);
+                  $("#es_name1").val(name);
+                  $("#uz_name1").val(name);
                 }
                 let fixedWord = json.fixedWord;
                 if (fixedWord && fixedWord.startsWith('{') && fixedWord.endsWith('}')) {
@@ -701,12 +818,18 @@ export default {
                   $('#enFixedWord').val(jsonValue.en);
                   $('#trFixedWord').val(jsonValue.tr);
                   $('#ptFixedWord').val(jsonValue.pt);
+                  $('#ruFixedWord').val(jsonValue.ru);
+                  $('#esFixedWord').val(jsonValue.es);
+                  $('#uzFixedWord').val(jsonValue.uz);
                 } else {
                   $('#zhFixedWord').val(fixedWord);
                   $('#arFixedWord').val(fixedWord);
                   $('#enFixedWord').val(fixedWord);
                   $('#trFixedWord').val(fixedWord);
                   $('#ptFixedWord').val(fixedWord);
+                  $('#ruFixedWord').val(fixedWord);
+                  $('#esFixedWord').val(fixedWord);
+                  $('#uzFixedWord').val(fixedWord);
                 }
                 // $('#nameplateType1').attr("disabled", "true");
                 if (!json.isCustomWord) {
@@ -717,6 +840,9 @@ export default {
                   $('#enFixedWord').val('');
                   $('#trFixedWord').val('');
                   $('#ptFixedWord').val('');
+                  $('#ruFixedWord').val('');
+                  $('#esFixedWord').val('');
+                  $('#uzFixedWord').val('');
                 } else {
                   $('input[name="isCustomWord"]').get(1).checked = true;
                   $('#fixedWord-div').removeClass("hidden");
@@ -755,6 +881,11 @@ export default {
                 } else {
                   $("input:checkbox[name='partitionFlag']")[4].checked = false;
                 }
+                if ((partitionFlag & 32) != 0) {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = true;
+                } else {
+                  $("input:checkbox[name='partitionFlag']")[5].checked = false;
+                }
                 // 打开编辑弹窗
                 $("#addModal").modal('show');
                 $("#modalLabel").text("编辑铭牌");
@@ -805,9 +936,12 @@ export default {
           var enFixedWord = $('#enFixedWord').val();
           var trFixedWord = $('#trFixedWord').val();
           var ptFixedWord = $('#ptFixedWord').val();
+          var ruFixedWord = $('#ruFixedWord').val();
+          var esFixedWord = $('#esFixedWord').val();
+          var uzFixedWord = $('#uzFixedWord').val();
           let fixedWordValue = '';
-          if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '' && trFixedWord == "" && ptFixedWord== "")) {
+          if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '' && trFixedWord == "")) {
-            let jsonFixedWord = { 'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord, 'tr': trFixedWord ,'pt': ptFixedWord};
+            let jsonFixedWord = { 'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord, 'tr': trFixedWord , 'pt': ptFixedWord , 'ru': ruFixedWord , 'es': esFixedWord , 'uz': uzFixedWord };
             fixedWordValue = JSON.stringify(jsonFixedWord);
           }
           var isCustomWord = $('input[name="isCustomWord"]:checked').val();
@@ -816,8 +950,11 @@ export default {
           var en_name = $('#en_name1').val();
           var tr_name = $('#tr_name1').val();
           var pt_name = $('#pt_name1').val();
+          var ru_name = $('#ru_name1').val();
+          var es_name = $('#es_name1').val();
+          var uz_name = $('#uz_name1').val();
 
-          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name,'pt':pt_name }
+          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name, "pt": pt_name, "ru": ru_name, "es": es_name, "uz": uz_name }
           const nameValue = JSON.stringify(jsonName);
           var nameplateType = $('#nameplateType1').val();
           var id = $('#id').val();
@@ -859,6 +996,21 @@ export default {
             $("#tipModal").modal('show');
             return;
           }
+          if (isEmpty(ru_name)) {
+            $("#tipMsg").text("俄语铭牌名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (isEmpty(es_name)) {
+            $("#tipMsg").text("西班牙语铭牌名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
+          if (isEmpty(uz_name)) {
+            $("#tipMsg").text("乌兹别克语铭牌名字不能为空");
+            $("#tipModal").modal('show');
+            return;
+          }
           if (isEmpty(days)) {
             $("#tipMsg").text("有效期不能为空");
             $("#tipModal").modal('show');
@@ -1037,6 +1189,9 @@ function cleanNamePlateModal () {
   $('#enFixedWord').val('');
   $('#trFixedWord').val('');
   $('#ptFixedWord').val('');
+  $('#ruFixedWord').val('');
+  $('#esFixedWord').val('');
+  $('#uzFixedWord').val('');
   $('input[name="isCustomWord"]').each(function () {
     $(this).removeAttr("checked");
   });
@@ -1045,6 +1200,9 @@ function cleanNamePlateModal () {
   $('#en_name1').val('');
   $('#tr_name1').val('');
   $('#pt_name1').val('');
+  $('#ru_name1').val('');
+  $('#es_name1').val('');
+  $('#uz_name1').val('');
   $('#nameplateType1').val('');
   $('#name1').removeAttr("readonly");
   $('#nameplateType1').removeAttr("disabled");

src/views/nobleman/GoldWater.vue

@@ -7,7 +7,7 @@
         <el-date-picker v-model="inquire.time[0]"
                         type="date"
                         placeholder="开始时间"
-                        format="YYYY-MM-DD">
+                        format="YYYY-MM-DD 00:00:00">
         </el-date-picker>
       </div>
     </div>
@@ -17,15 +17,10 @@
         <el-date-picker v-model="inquire.time[1]"
                         type="date"
                         placeholder="结束时间"
-                        format="YYYY-MM-DD">
+                        format="YYYY-MM-DD 23:59:59">
         </el-date-picker>
       </div>
     </div>
-    <div class="inquire">
-      <span>分区</span>
-      <partition-select v-model:partition-id="inquire.partitionId"
-                        @update:partitionId="getlistByPartition" />
-    </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">国家</span>
@@ -86,6 +81,12 @@
       <el-table-column prop="goldIncome"
                        align="center"
                        label="月金币收入(流水)" />
+      <el-table-column prop="hasGoldIncomeMemberNum"
+                       align="center"
+                       label="有流水成员数" />
+      <el-table-column prop="sendGiftUserNum"
+                       align="center"
+                       label="送礼人数" />
       <el-table-column align="center"
                        label="操作">
         <template v-slot="scope">
@@ -123,6 +124,9 @@
         <el-table-column prop="goldIncome"
                          align="center"
                          label="金币收入（流水）" />
+        <el-table-column prop="sendGiftUserNum"
+                         align="center"
+                         label="送礼人数" />
       </el-table>
       <!-- 分页 -->
       <el-pagination style="margin-top: 10px"
@@ -163,17 +167,12 @@ import {
   incomeExportFamilys,
   getlistByPartitionId
 } from "@/api/nobleman/nobleman";
-import PartitionSelect from "@/views/common/partitionSelect.vue";
-
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 export default {
   name: "GoldWater",
-   components: {
-    PartitionSelect
-  },
   data () {
     return {
       loading: false,
@@ -182,7 +181,7 @@ export default {
         time: this.calculateLastSevenDays(),
         id: "",
         nick: "",
-        partitionId: undefined,
+        partitionId: 2,
         inquireonInfos: [
           // { desc: "英语区", id: 1 },
           // { desc: "阿拉伯区", id: 2 },
@@ -207,18 +206,17 @@ export default {
     };
   },
   created () {
-    // this.getlistByPartitionId()
+    this.getData();
+    this.getlistByPartitionId()
   },
   methods: {
-     getlistByPartition (e)  {
+    getlistByPartitionId () {
-      console.log(e)
+      getlistByPartitionId({ partitionId: 1, containAll: true }).then((res) => {
-      if (e) {
-        this.inquire.partitionId = e;
-      }
-      getlistByPartitionId({ partitionId: this.inquire.partitionId, containAll: true }).then((res) => {
         if (res.code == 200) {
           this.inquire.inquireonInfos = res.data;
-          this.getData();
+          // let obj = {name:{zh:"全部"},id:0}
+          // obj.name = JSON.stringify(obj.name)
+          // this.inquire.inquireonInfos.unshift(obj)
         }
       });
     },
@@ -230,10 +228,10 @@ export default {
       let endTime = null;
       if (time.length > 0) {
         startTime = this.inquire.time[0]
-          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00")
           : null;
         endTime = this.inquire.time[1]
-          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd")
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59")
           : null;
       }
       if (!startTime || !endTime) {
@@ -275,8 +273,8 @@ export default {
       let startTime = "";
       let endTime = "";
       if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       incomeExportFamilys({
         startDate: startTime,
@@ -292,8 +290,8 @@ export default {
       let startTime = "";
       let endTime = "";
       if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       incomeExportFamily({
         familyId: val.id,
@@ -316,8 +314,8 @@ export default {
       let startDate = "";
       let endDate = "";
       if (time && time.length > 0) {
-        startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
+        endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       if (val) {
         this.detailsTitle = `公会昵称：【${val.name}】 时间：【${val.createTime}】—金币收入明细`;
@@ -341,8 +339,8 @@ export default {
       let startTime = "";
       let endTime = "";
       if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       incomeExportFamily({
         familyId: this.familyIdEx,

src/views/nobleman/GuildInfo.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="box">
-    <div class="inquire">
-      <span>分区</span>
-      <partition-select v-model:partition-id="inquire.partitionId" />
-    </div>
     <!-- 查询 -->
     <div class="inquire">
       <span>公会ID</span>
@@ -116,9 +112,6 @@
                      size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="operator"
-                       align="center"
-                       label="操作人" />
       <el-table-column align="center"
                        label="收款账户"
                        width="300">
@@ -516,12 +509,10 @@ import {
 } from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
-import PartitionSelect from "../common/partitionSelect.vue";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildInfo",
-  components: { PartitionSelect },
   data () {
     return {
       loading: false,
@@ -534,7 +525,6 @@ export default {
         referrer: "",
         time: "",
         inviteErbanNo: undefined,
-  partitionId: undefined,
       },
       //新增所需对象
       resource: {
@@ -605,7 +595,6 @@ export default {
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
-        partitionId: this.inquire.partitionId,
         // startDate: startTime,
         // endDate: endTime,
         inviteErbanNo: this.inquire.inviteErbanNo,

src/views/nobleman/WagesCount.vue

@@ -2,17 +2,6 @@
   <div class="box">
     <!-- 时间选择器 -->
     <div class="inquire">
-      <span>周期</span>
-      <el-select v-model="inquire.cycleDate"
-                 placeholder="请选择">
-        <el-option v-for="(item,index) in dateCycleArr"
-                   :key="index"
-                   :label="item.startDateStr + '~' + item.endDateStr"
-                   :value="item.dateCycle">
-        </el-option>
-      </el-select>
-    </div>
-    <!-- <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
         <el-config-provider :locale="zhCn">
@@ -21,7 +10,7 @@
                           placeholder="选择月">
           </el-date-picker></el-config-provider>
       </div>
-    </div> -->
+    </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">会长分区</span>
@@ -83,12 +72,11 @@
       <el-table-column prop="agentWage"
                        align="center"
                        label="代理工资" />
-      <el-table-column prop="diamondWage"
-                       align="center"
-                       label="钻石工资" />
       <el-table-column prop="diamondRemain"
                        align="center"
-                       label="当前钻石余额" />
+                       label="当前钻石余额">
+        <template v-slot="scope">{{ scope.row.diamondRemain }}</template>
+      </el-table-column>
       <el-table-column align="center"
                        label="操作"
                        width="260">
@@ -143,12 +131,18 @@
         <el-table-column prop="agentWage"
                          align="center"
                          label="代理工资" />
-        <el-table-column prop="diamondWage"
-                         align="center"
-                         label="钻石工资" />
         <el-table-column prop="diamondRemain"
                          align="center"
                          label="当前钻石余额" />
+        <el-table-column align="center"
+                         label="操作">
+          <template v-slot="scope">
+            <el-button @click="detailsClick(scope.row)"
+                       class="primary"
+                       type="primary"
+                       size="default">查看详情</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <template #footer>
         <div class="dialog-footer">
@@ -159,6 +153,59 @@
       </template>
     </el-dialog>
 
+    <!-- 内嵌单个成员明细 -->
+    <el-dialog :title="detailsTitle2"
+               v-model="detailsDialog2">
+      <el-table v-loading="loading"
+                :data="tableDataDetails2"
+                border
+                style="width: 100%; margin-top: 25px">
+        <el-table-column prop="date"
+                         align="center"
+                         label="日期" />
+        <el-table-column prop="micRemainTime"
+                         align="center"
+                         label="直播时长" />
+        <el-table-column prop="micVaild"
+                         align="center"
+                         label="是否有效天">
+          <template v-slot="scope">
+            {{ scope.row.micVaild ? "是" : "否" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="goldIncome"
+                         align="center"
+                         label="当日金币收入" />
+        <el-table-column prop="savedGoldIncome"
+                         align="center"
+                         label="月累计金币收入" />
+        <el-table-column prop="saveedGoldWage"
+                         align="center"
+                         label="月金币工资" />
+        <el-table-column prop="diamondRemain"
+                         align="center"
+                         label="当日钻石余额" />
+        <!-- <el-table-column align="center" label="操作">
+          <template v-slot="scope">
+            <el-button
+              @click="detailsClick2(scope)"
+              class="primary"
+              type="text"
+              size="default"
+              :disabled="!scope.row.enable"
+              >查看详情</el-button
+            >
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailsDialog2 = false">关闭</el-button>
+          <el-button type="primary"
+                     @click="detailsClickOut2()">导出</el-button>
+        </div>
+      </template>
+    </el-dialog>
     <!-- 分页 -->
     <el-pagination style="margin-top: 10px"
                    class="paginationClass"
@@ -177,9 +224,12 @@ import {
   statPageFamily,
   listFamilyMember,
   statExportFamilyMember,
+  listFamilyMemberDaily,
+  exportFamilyMemberDaily,
   statExportFamily,
 } from "@/api/nobleman/nobleman";
-import { getWageStatListDateCycle } from "@/api/relAgency/relAgency.js";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 export default {
@@ -190,14 +240,14 @@ export default {
       loading: false,
       //查询所需条件对象
       inquire: {
+        time: "",
         nick: "",
-        partitionId: 1,
+        partitionId: 2,
         inquireonInfos: [
           { desc: "英语区", id: 1 },
           { desc: "阿拉伯区", id: 2 },
-          { desc: "土耳其区", id: 8 },
+          { desc: "华语区", id: 4 },
         ],
-        cycleDate: '',
       },
       // 表格
       tableData: [],
@@ -215,40 +265,23 @@ export default {
       detailsTitle2: "工会昵称 用户昵称（ID：0） 时间段 结算明细",
       tableDataDetails2: [],
       detailsClickOutObj2: {},
-      dateCycleArr: [],
     };
   },
   created () {
-    getWageStatListDateCycle({ month: 4 }).then((res) => {
+    // this.getData();
-      if (res.code == 200) {
-        this.dateCycleArr = res.data || [];
-        this.inquire.cycleDate = this.dateCycleArr[0].dateCycle;
-    this.getData();
-      } else {
-        ElMessage({
-          showClose: true,
-          message: res.message,
-          type: "error",
-        });
-      }
-    });
   },
   methods: {
     // 查询接口
     getData () {
       // this.loading = true;
-      // let time = this.inquire.time;
+      let time = this.inquire.time;
-      // if (time) {
+      if (time) {
-      //   time = dateFormat(this.inquire.time, "yyyy-MM");
+        time = dateFormat(this.inquire.time, "yyyy-MM");
-      // }
-      if (this.inquire.cycleDate == "") {
-        ElMessage.error("请选择周期");
-        return;
       }
       statPageFamily({
         erbanNo: this.inquire.nick,
         partitionId: this.inquire.partitionId,
-        cycleDate: this.inquire.cycleDate,
+        month: time,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
       }).then((res) => {
@@ -259,9 +292,13 @@ export default {
     },
     // 导出总外列表
     deriveFun (val) {
+      let time = this.inquire.time;
+      if (time) {
+        time = dateFormat(this.inquire.time, "yyyy-MM");
+      }
       statExportFamily({
         erbanNo: this.inquire.nick,
-        cycleDate: this.inquire.cycleDate,
+        month: time,
         partitionId: this.inquire.partitionId,
       }).then((res) => { });
     },
@@ -269,7 +306,7 @@ export default {
     deriveFun2 (val) {
       statExportFamilyMember({
         familyId: val.id,
-        cycleDate: this.inquire.cycleDate,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
       });
       this.detailsDialog = false;
     },
@@ -278,10 +315,13 @@ export default {
       console.log(val);
       var than = this;
       this.detailsClickOutObj = val;
-      than.detailsTitle = `[${val.name}] [${this.inquire.cycleDate}]结算明细`;
+      than.detailsTitle = `[${val.name}] [${dateFormat(
+        than.inquire.time,
+        "yyyy-MM"
+      )}]结算明细`;
       listFamilyMember({
         familyId: val.id,
-        cycleDate: this.inquire.cycleDate,
+        month: dateFormat(than.inquire.time, "yyyy-MM"),
       }).then((res) => {
         this.tableDataDetails = res.data;
         this.detailsDialog = true;
@@ -291,10 +331,37 @@ export default {
     detailsClickOut () {
       statExportFamilyMember({
         familyId: this.detailsClickOutObj.id,
-        cycleDate: this.inquire.cycleDate,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
       });
       this.detailsDialog = false;
     },
+    // 嵌套详情按钮
+    detailsClick (val) {
+      var than = this;
+      this.detailsClickOutObj2 = val;
+      than.detailsTitle2 = `公会名称：${val.familyName} 成员名称：${val.nick
+        }（ID：${val.erbanNo}） ${dateFormat(
+          than.inquire.time,
+          "yyyy-MM"
+        )} 结算明细`;
+      listFamilyMemberDaily({
+        familyId: val.familyId,
+        month: dateFormat(than.inquire.time, "yyyy-MM"),
+        uid: val.uid,
+      }).then((res) => {
+        than.tableDataDetails2 = res.data;
+        than.detailsDialog2 = true;
+      });
+    },
+    // 导出每日成员数据
+    detailsClickOut2 () {
+      exportFamilyMemberDaily({
+        familyId: this.detailsClickOutObj2.id,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
+        uid: this.detailsClickOutObj2.uid,
+      });
+      this.detailsDialog2 = false;
+    },
     // 分页导航
     handleSizeChange () {
       this.getData();

src/views/privilege/personalHomepageResourceManagement.vue

@@ -97,6 +97,24 @@
           {{ jsonFun(scope.row.name).pt }}
         </template>
       </el-table-column>
+      <el-table-column prop=""
+                       align="center"
+                       label="俄语名称"><template v-slot="scope">
+          {{ jsonFun(scope.row.name).ru }}
+        </template>
+      </el-table-column>
+      <el-table-column prop=""
+                       align="center"
+                       label="西班牙语名称"><template v-slot="scope">
+          {{ jsonFun(scope.row.name).es }}
+        </template>
+      </el-table-column>
+      <el-table-column prop=""
+                       align="center"
+                       label="乌兹别克语名称"><template v-slot="scope">
+          {{ jsonFun(scope.row.name).uz }}
+        </template>
+      </el-table-column>
       <el-table-column prop=""
                        align="center"
                        label="图片">
@@ -267,6 +285,24 @@
                   style="width: 200px"
                   class="input"></el-input>
       </div>
+      <div class="operation">
+        <span style="margin-right: 20px">俄语名称</span>
+        <el-input v-model="operationValue.nameRu"
+                  style="width: 200px"
+                  class="input"></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">西班牙语名称</span>
+        <el-input v-model="operationValue.nameEs"
+                  style="width: 200px"
+                  class="input"></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">乌兹别克语名称</span>
+        <el-input v-model="operationValue.nameUz"
+                  style="width: 200px"
+                  class="input"></el-input>
+      </div>
       <!-- <div class="operation">
         <span style="margin-right: 20px">价格</span>
         <el-input
@@ -463,6 +499,9 @@ export default {
       nameAr: "",
       nameTr: "",
       namePt: "",
+      nameRu: "",
+      nameEs: "",
+      nameUz: "",
       price: "",
       day: "",
       imageUrl: "",
@@ -528,6 +567,9 @@ export default {
           en: operationValue.nameEn,
           tr: operationValue.nameTr,
           pt: operationValue.namePt,
+          ru: operationValue.nameRu,
+          es: operationValue.nameEs,
+          uz: operationValue.nameUz,
         }),
         pic: operationValue.imageUrl,
         effectType: operationValue.effectType,

src/views/record/OfficialGoldBusTypeView.vue

@@ -20,8 +20,6 @@
                                 <option value="17">活动奖励钻石</option>
                                 <option value="20">公款充值钻石</option>
                                 <option value="51">官方钻石消除</option>
-                                <option value="65">官方消除游戏薪资</option>
-                                    <option value="66">官方赠送游戏薪资</option>
                                 <option value="63">官方消除薪资</option>
                                 <option value="64">官方赠送薪资</option>
                             </select>
@@ -69,8 +67,6 @@
                                     <option value="17">活动奖励钻石</option>
                                     <option value="20">公款充值钻石</option>
                                     <option value="51">官方钻石消除</option>
-                                    <option value="65">官方消除游戏薪资</option>
-                                    <option value="66">官方赠送游戏薪资</option>
                                     <option value="63">官方消除薪资</option>
                                 <option value="64">官方赠送薪资</option>
                                 </select>
@@ -138,8 +134,6 @@ export default {
                                 if (val == 17) { return "活动奖励钻石" }
                                 if (val == 20) { return "公款充值钻石" }
                                 if (val == 51) { return "官方钻石消除" }
-                                if (val == 65) { return "官方消除游戏薪资" }
-                                if (val == 66) { return "官方赠送游戏薪资" }
                                 if (val == 63) { return "官方消除薪资" }
                                 if (val == 64) { return "官方赠送薪资" }
                                 return val;

src/views/record/OfficicalGoldView.vue

@@ -220,7 +220,7 @@ export default {
         $('#num').on('input', function() {
           var numValue = $(this).val();
           if (numValue && !isNaN(numValue)) {
-            var transferValue = (parseInt(numValue) / 30000).toFixed(2);
+            var transferValue = (parseInt(numValue) / 7000).toFixed(2);
             $('#numTransfer').val(transferValue);
           } else {
             $('#numTransfer').val('');
@@ -285,7 +285,7 @@ export default {
               $("#tipModal").modal('show');
               return;
             }
-            if (actualGold != parseInt(actualAmount * 30000)) {
+            if (actualGold != parseInt(actualAmount * 7000)) {
               $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
               $("#tipModal").modal('show');
               return;
@@ -371,7 +371,7 @@ export default {
               return;
             }
             const actualGold = parseInt(num);
-            if (actualGold != parseInt(actualAmount * 30000)) {
+            if (actualGold != parseInt(actualAmount * 7000)) {
               $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
               $("#tipModal").modal('show');
               return;
@@ -420,8 +420,8 @@ function initUserInfoTable () {
       { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' },
       { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' },
       { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' },
-      { field: 'gameUsdNum', title: '游戏薪资', align: 'center', width: '5%', valign: 'middle' },
+      { field: 'guildUsdNum', title: '公会薪资', align: 'center', width: '5%', valign: 'middle' },
-      { field: 'guildUsdNum', title: '薪资', align: 'center', width: '5%', valign: 'middle' }
+      { field: 'guildCrystalNum', title: '公会紫晶', align: 'center', width: '5%', valign: 'middle' }
     ],
     cache: false,
     striped: true,
@@ -483,8 +483,7 @@ function initGoldRecordTable () {
         formatter: function (val, row, index) {
           // 根据条件判断显示哪个字段
           // 示例：根据typeCn字段的值来决定显示什么
-          if (row.currencyType == 0 || row.currencyType == 4 || row.currencyType == 5) {
+          if (row.currencyType == 0 || row.currencyType == 4) {
-
             if(row.currencyType == 0 && row.diamondNum  == null){
             return row.goldNum 
             }else{

src/views/refund/goldDiamondOperationRecord.vue

@@ -97,14 +97,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="partitionDesc" align="center" label="区域" />
-      <el-table-column prop="operationNum" align="center" label="操作数量" />
-      <el-table-column prop="actualAmount" align="center" label="打款金额" />
-      <el-table-column prop="typeDesc" align="center" label="赠送类型" />
-      <el-table-column prop="currencyTypeDesc" align="center" label="赠送分类" />
-      <el-table-column prop="remark" align="center" label="备注" />
       <el-table-column prop="operatorName" align="center" label="操作人" />
     </el-table>
     <!-- 分页 -->
@@ -155,8 +147,6 @@ export default {
           { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" },
           { desc: "官方赠送钻石", id: "OFFICAL_GOLD" },
           { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" },
-          { desc: "官方消除游戏薪资", id: "OFFICAL_MINUS_GAME_USD" },
-          { desc: "官方赠送游戏薪资", id: "OFFICAL_PLUS_GAME_USD" },
           { desc: "官方消除薪资", id: "OFFICAL_MINUS_GUILD_USD" },
           { desc: "官方赠送薪资", id: "OFFICAL_PLUS_GUILD_USD" },
         ],

src/views/resource/GamePlayView.vue

@@ -14,18 +14,7 @@
         </el-option>
       </el-select>
     </div>
-    <div class="inquire"
+            <div class="inquire"
-         style="display: inline-block; margin-right: 20px">
-      <span class="demonstration">游戏类型:</span>
-       <el-select v-model="searchValues.panelType"
-                   style="width: 75%"
-                   placeholder="请选择">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="休闲游戏" :value="1"></el-option>
-          <el-option label="娱乐游戏" :value="2"></el-option>
-      </el-select>
-    </div>
-        <div class="inquire"
          style="display: inline-block; margin-right: 20px">
       <span class="demonstration">游戏第三方:</span>
        <el-select v-model="searchValues.code"
@@ -83,6 +72,21 @@
                        label="入口名称-葡萄牙语区">
         <template v-slot="scope">{{ getJsonField(scope.row.name, 'pt') }}</template>
       </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="入口名称-俄语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'ru') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="入口名称-西班牙语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'es') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="入口名称-乌兹别克语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'uz') }}</template>
+      </el-table-column>
       <el-table-column align="center"
                        prop="partitionId"
                        label="地区">
@@ -159,10 +163,13 @@
                        label="可见用户"
                        :formatter="ruleJsonFormatter" />
                        <el-table-column align="center"
-                       prop="panelType"
+                       prop="USER_LEVEL"
-                       label="游戏分类" >
+                       label="用户等级"
-                       <template v-slot="scope">{{ scope.row.panelType==1?'休闲游戏':'娱乐游戏' }}</template>
+                       :formatter="ruleJsonFormatter" />
-                       </el-table-column>
+                       <el-table-column align="center"
+                       prop="USER_LEVEL_LIMIT_ROLE"
+                       label="财富等级限制生效范围"
+                       :formatter="ruleJsonFormatter" />
                        <el-table-column align="center"
                        prop="panelType"
                        label="游戏第三方" >
@@ -247,6 +254,33 @@
                   placeholder="请输入入口名称"
                   :disabled="resource.skipType == 1"></el-input>
       </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">入口名称-俄语</span>
+        <el-input v-model="resource.seriesNameRu"
+                  style="width: 75%"
+                  class="input"
+                  placeholder="请输入入口名称"
+                  :disabled="resource.skipType == 1"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">入口名称-西班牙语</span>
+        <el-input v-model="resource.seriesNameEs"
+                  style="width: 75%"
+                  class="input"
+                  placeholder="请输入入口名称"
+                  :disabled="resource.skipType == 1"></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">入口名称-乌兹别克语</span>
+        <el-input v-model="resource.seriesNameUz"
+                  style="width: 75%"
+                  class="input"
+                  placeholder="请输入入口名称"
+                  :disabled="resource.skipType == 1"></el-input>
+      </div>
 
       <div style="margin-bottom: 25px;margin-top: 70px;">
         <span style="display: inline-block; margin-right: 20px"
@@ -367,7 +401,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="请选择"
@@ -388,15 +422,14 @@
                      :label="value"
                      :value="value"></el-option>
         </el-select>
-      </div>
+        <el-select v-model="resource.ruleValue[rule.ruleCode]"
-      <div style="margin-bottom: 25px">
-        <span style="display: inline-block; margin-right: 20px"
-              class="col-sm-2 control-label">游戏分类</span>
-        <el-select v-model="resource.panelType"
                    style="width: 75%"
-                   placeholder="请选择">
+                   placeholder="请选择"
-          <el-option label="休闲游戏" :value="1"></el-option>
+                   v-if="rule.ruleKind == 'EQ'">
-          <el-option label="娱乐游戏" :value="2"></el-option>
+          <el-option v-for="value in rule.ruleValue.split(',')"
+                     :key="value"
+                     :label="value == 1?'全部用户' : '非公会成员'"
+                     :value="value"></el-option>
         </el-select>
       </div>
       <template #footer>
@@ -481,20 +514,23 @@ export default {
         startTime: null,
         endTime: null,
         seqNo: 0,
-        ruleValue: {},
+        ruleValue: {
+          USER_LEVEL_LIMIT_ROLE:"1"
+        },
         partitionId: null,
         seriesNameZh: '',
         seriesNameEn: '',
         seriesNameAr: '',
         seriesNameTr: '',
         seriesNamePt: '',
-        panelType:''
+        seriesNameRu: '',
+        seriesNameEs: '',
+        seriesNameUz: '',
       },
       imageUrl: '',
       partitionInfos: [],
       searchValues: {
         partitionId: null,
-        panelType:'',
         code:''
       },
     };
@@ -557,6 +593,8 @@ export default {
       if (!value) {
         if (key == 'NOT_CHANNELS' || key == 'NOT_UIDS') {
           value = '-';
+        } else if (key == 'USER_LEVEL_LIMIT_ROLE') {
+          value = '全部用户';
         } else {
           value = '全部';
         }
@@ -566,6 +604,9 @@ export default {
       } else if (key == 'ANDROID') {
         value = ruleObj['ANDROID_LOW_VERSION'] + '~' + ruleObj['ANDROID_HIGH_VERSION'];
       }
+      if (key == 'USER_LEVEL_LIMIT_ROLE') {
+          value = ruleObj['USER_LEVEL_LIMIT_ROLE']?ruleObj['USER_LEVEL_LIMIT_ROLE'] == 1?'全部用户':'非公会成员':'全部用户';
+        } 
       return value;
     },
     getData () {
@@ -574,7 +615,6 @@ export default {
         partitionId: this.searchValues.partitionId,
         page: this.currentPage,
         pageSize: this.pageSize,
-        panelType: this.searchValues.panelType,
         code: this.searchValues.code,
       }).then(res => {
         let data = res.data;
@@ -619,11 +659,14 @@ export default {
       this.resource.seriesNameAr = '';
       this.resource.seriesNameTr = '';
       this.resource.seriesNamePt = '';
-      this.resource.panelType = '';
+      this.resource.seriesNameRu = '';
+      this.resource.seriesNameEs = '';
+      this.resource.seriesNameUz = '';
       for (let i = 0, len = this.rules.length; i < len; i++) {
         let rule = this.rules[i];
         this.resource.ruleValue[rule.ruleCode] = '';
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = "1";
       this.partitionId = null;
       this.editDialog = true;
     },
@@ -639,13 +682,15 @@ export default {
       this.resource.startTime = row.startTime;
       this.resource.endTime = row.endTime;
       this.resource.seqNo = row.seqNo;
-      this.resource.panelType = row.panelType;
       if (row.name) {
         this.resource.seriesNameZh = JSON.parse(row.name).zh;
         this.resource.seriesNameEn = JSON.parse(row.name).en;
         this.resource.seriesNameAr = JSON.parse(row.name).ar;
         this.resource.seriesNameTr = JSON.parse(row.name).tr;
         this.resource.seriesNamePt = JSON.parse(row.name).pt;
+        this.resource.seriesNameRu = JSON.parse(row.name).ru;
+        this.resource.seriesNameEs = JSON.parse(row.name).es;
+        this.resource.seriesNameUz = JSON.parse(row.name).uz;
       }
       let ruleValue = row.ruleValue;
       for (let i = 0, len = this.rules.length; i < len; i++) {
@@ -657,10 +702,12 @@ export default {
         }
         this.resource.ruleValue[ruleCode] = rule;
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] ?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");
@@ -685,6 +732,9 @@ export default {
         ar: this.resource.seriesNameAr,
         tr: this.resource.seriesNameTr,
         pt: this.resource.seriesNamePt,
+        ru: this.resource.seriesNameRu,
+        es: this.resource.seriesNameEs,
+        uz: this.resource.seriesNameUz,
       });
       saveResource({
         id: this.resource.id,
@@ -701,7 +751,6 @@ export default {
         seqNo: this.resource.seqNo,
         ruleValue: JSON.stringify(this.resource.ruleValue),
         partitionId: this.resource.partitionId,
-        panelType: this.resource.panelType,
       }).then(res => {
         this.getData();
         this.editDialog = false;

src/views/resource/SplashView.vue

@@ -61,6 +61,21 @@
                        label="活动名称-葡萄牙语区">
         <template v-slot="scope">{{ getJsonField(scope.row.name, 'pt') }}</template>
       </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-俄语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'ru') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-西班牙语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'es') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-乌兹别克语">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'uz') }}</template>
+      </el-table-column>
       <el-table-column align="center" prop="partitionId" label="地区">
         <template v-slot="scope">
           <span>{{ getPartitionInfo(scope.row.partitionId) }}</span>
@@ -230,6 +245,30 @@
                   placeholder=""
                   class="input"></el-input>
       </div>
+      <!-- 活动名称-俄语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-俄语</span>
+        <el-input v-model="resource.nickRu"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <!-- 活动名称-西班牙语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-西班牙语</span>
+        <el-input v-model="resource.nickEs"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <!-- 活动名称-乌兹别克语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-乌兹别克语</span>
+        <el-input v-model="resource.nickUz"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
       <div style="margin-bottom: 25px">
         <span
           style="display: inline-block; margin-right: 20px"
@@ -475,6 +514,9 @@ export default {
         nickAr: "",
         nickTr: "",
         nickPt: "",
+        nickRu: "",
+        nickEs: "",
+        nickUz: "",
       },
       imageUrl: "",
       partitionInfos: [],
@@ -583,6 +625,9 @@ export default {
       this.resource.nickAr = "";
       this.resource.nickTr = "";
       this.resource.nickPt = "";
+      this.resource.nickRu = "";
+      this.resource.nickEs = "";
+      this.resource.nickUz = "";
 
       for (let i = 0, len = this.rules.length; i < len; i++) {
         let rule = this.rules[i];
@@ -607,6 +652,9 @@ export default {
       this.resource.nickAr = JSON.parse(row.name).ar;
       this.resource.nickTr = JSON.parse(row.name).tr;
       this.resource.nickPt = JSON.parse(row.name).pt;
+      this.resource.nickRu = JSON.parse(row.name).ru;
+      this.resource.nickEs = JSON.parse(row.name).es;
+      this.resource.nickUz = JSON.parse(row.name).uz;
 
       let ruleValue = row.ruleValue;
       for (let i = 0, len = this.rules.length; i < len; i++) {
@@ -653,6 +701,9 @@ export default {
           ar: this.resource.nickAr,
           tr: this.resource.nickTr,
           pt: this.resource.nickPt,
+          ru: this.resource.nickRu,
+          es: this.resource.nickEs,
+          uz: this.resource.nickUz,
         });
       saveResource({
         id: this.resource.id,

src/views/room/GameAdmin.vue

@@ -131,6 +131,7 @@
           <el-checkbox label="阿拉伯语区">2</el-checkbox>
           <el-checkbox label="土耳其区">8</el-checkbox>
           <el-checkbox label="英语2区">16</el-checkbox>
+          <el-checkbox label="独联体">32</el-checkbox>
         </el-checkbox-group>
       </div>
       <!-- 是否展示 -->
@@ -231,6 +232,10 @@ export default {
           partitionFlag: 16,
           label: "英语2区",
         },
+        {
+          partitionFlag: 32,
+          label: "独联体",
+        },
         {
           partitionFlag: "",
           label: "全部",
@@ -389,7 +394,8 @@ export default {
           英语区: 1,
           阿拉伯语区: 2,
           土耳其区: 8,
-          英语2区: 16
+          英语2区: 16,
+          独联体: 32,
         };
         this.ediObj.checkList.forEach((res, i) => {
           num += district[res];
@@ -423,6 +429,9 @@ export default {
       if ((val & 16) != 0) {
         value += '英语2区  ';
       }
+      if ((val & 32) != 0) {
+        value += '独联体  ';
+      }
       return value;
     },
     // 编辑回显分区
@@ -443,6 +452,9 @@ export default {
       if ((val & 16) != 0) {
         arr.push('英语2区');
       }
+      if ((val & 32) != 0) {
+        arr.push('独联体');
+      }
       return arr;
     },
     // 分页导航

src/views/room/RoomTabView.vue

@@ -125,6 +125,36 @@
                        id="pt_modal_name" />
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru_modal_name"
+                     class="col-sm-3 control-label">俄语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="ru_modal_name" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_modal_name"
+                     class="col-sm-3 control-label">西班牙语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="es_modal_name" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_modal_name"
+                     class="col-sm-3 control-label">乌兹别克语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="uz_modal_name" />
+              </div>
+            </div>
             <div class="form-group">
               <label for="status"
                      class="col-sm-3 control-label">显示状态<font color="red">*</font>：</label>
@@ -243,6 +273,24 @@ export default {
               align: "center",
               width: "10%",
             },
+            {
+              field: "name.ru",
+              title: "俄语Tab名称",
+              align: "center",
+              width: "10%",
+            },
+            {
+              field: "name.es",
+              title: "西班牙语Tab名称",
+              align: "center",
+              width: "10%",
+            },
+            {
+              field: "name.uz",
+              title: "乌兹别克语Tab名称",
+              align: "center",
+              width: "10%",
+            },
             {
               field: "status",
               title: "显示状态",
@@ -383,6 +431,9 @@ export default {
           $("#en_modal_name").val("");
           $("#tr_modal_name").val("");
           $("#pt_modal_name").val("");
+          $("#ru_modal_name").val("");
+          $("#es_modal_name").val("");
+          $("#uz_modal_name").val("");
           $("#modal_seq").val("");
           $("#modal_status").val("");
           $("#modal_room_tab_show").val("");
@@ -404,8 +455,11 @@ export default {
           var en_name = $("#en_modal_name").val();
           var tr_name = $("#tr_modal_name").val();
           var pt_name = $("#pt_modal_name").val();
+          var ru_name = $("#ru_modal_name").val();
+          var es_name = $("#es_modal_name").val();
+          var uz_name = $("#uz_modal_name").val();
           // 国际化字段
-          var jsonName = { zh: name, ar: ar_name, en: en_name, tr: tr_name, pt: pt_name };
+          var jsonName = { zh: name, ar: ar_name, en: en_name, tr: tr_name, pt: pt_name , ru: ru_name, es: es_name, uz: uz_name};
           const nameValue = JSON.stringify(jsonName);
           var seq = $("#modal_seq").val();
           var status = $("#modal_status").val();
@@ -469,6 +523,9 @@ export default {
                   // 土耳其名称
                   $("#tr_modal_name").val(jsonName.tr);
                   $("#pt_modal_name").val(jsonName.pt);
+                  $("#ru_modal_name").val(jsonName.ru);
+                  $("#es_modal_name").val(jsonName.es);
+                  $("#uz_modal_name").val(jsonName.uz);
                 } else {
                   $("#modal_name").val(name);
                   // 阿语名称
@@ -478,6 +535,9 @@ export default {
                   // 土耳其名称
                   $("#tr_modal_name").val(name);
                   $("#pt_modal_name").val(name);
+                  $("#ru_modal_name").val(name);
+                  $("#es_modal_name").val(name);
+                  $("#uz_modal_name").val(name);
                 }
                 $("#modal_seq").val(json.seq);
                 if (json.status == 1) {

src/views/room/RoomtagAdminView.vue

@@ -171,6 +171,36 @@
                        id="pt_modal_name">
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru_modal_name"
+                     class="col-sm-3 control-label">俄语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="ru_modal_name">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es_modal_name"
+                     class="col-sm-3 control-label">西班牙语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="es_modal_name">
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz_modal_name"
+                     class="col-sm-3 control-label">乌兹别克语名称<font color="red">*</font>:</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       class="form-control validate[required]"
+                       name="name"
+                       id="uz_modal_name">
+              </div>
+            </div>
             <!-- 上传act图片 -->
             <div class="form-group">
               <label class="col-sm-3 control-label">图片:</label>
@@ -317,6 +347,9 @@ export default {
             { field: 'name.en', title: '英语名称', align: 'center', width: '10%' },
             { field: 'name.tr', title: '土耳其名称', align: 'center', width: '10%' },
             { field: 'name.pt', title: '葡萄牙语名称', align: 'center', width: '10%' },
+            { field: 'name.ru', title: '俄语名称', align: 'center', width: '10%' },
+            { field: 'name.es', title: '西班牙语名称', align: 'center', width: '10%' },
+            { field: 'name.uz', title: '乌兹别克语名称', align: 'center', width: '10%' },
             {
               field: 'pict', title: '图片', align: 'center', width: '10%', valign: 'center',
               formatter: function (val, row, index) {
@@ -498,6 +531,9 @@ export default {
           $("#en_modal_name").val("");
           $("#tr_modal_name").val("");
           $("#pt_modal_name").val("");
+          $("#ru_modal_name").val("");
+          $("#es_modal_name").val("");
+          $("#uz_modal_name").val("");
           $("#modal_seq").val("");
           $("#modal_status").val("");
           $("#modal_type").val("");
@@ -520,8 +556,11 @@ export default {
           // 土耳其名称
           var tr_name = $("#tr_modal_name").val();
           var pt_name = $("#pt_modal_name").val();
+          var ru_name = $("#ru_modal_name").val();
+          var es_name = $("#es_modal_name").val();
+          var uz_name = $("#uz_modal_name").val();
           // 国际化字段
-          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name }
+          var jsonName = { "zh": name, "ar": ar_name, "en": en_name, "tr": tr_name ,"pt": pt_name ,"ru": ru_name ,"es": es_name,"uz": uz_name  }
           const nameValue = JSON.stringify(jsonName);
           var seq = $("#modal_seq").val();
           var status = $("#modal_status").val();
@@ -597,6 +636,9 @@ export default {
                   // 土耳其名称
                   $("#tr_modal_name").val(jsonName.tr);
                   $("#pt_modal_name").val(jsonName.pt);
+                  $("#ru_modal_name").val(jsonName.ru);
+                  $("#es_modal_name").val(jsonName.es);
+                  $("#uz_modal_name").val(jsonName.uz);
                 } else {
                   $("#modal_name").val(name);
                   // 阿语名称
@@ -606,6 +648,9 @@ export default {
                   // 土耳其名称
                   $("#tr_modal_name").val(name);
                   $("#pt_modal_name").val(name);
+                  $("#ru_modal_name").val(name);
+                  $("#es_modal_name").val(name);
+                  $("#uz_modal_name").val(name);
                 }
 
                 $("#modal_seq").val(json.seq);

src/views/superCenter/DynamicVerifyViewSuper.vue

@@ -1,623 +0,0 @@
-<template>
-  <section class="content">
-    <div class="box box-primary">
-      <div class="box-body">
-        <!-- Content Header (Page header) -->
-        <section class="content-header">
-          <h1 id="itemTitle"></h1>
-        </section>
-        <!-- .content -->
-        <div id="table"></div>
-        <div id="toolbar" style="height: auto">
-          <form
-            id="searchForm"
-            class="col-sm-pull-12"
-            action="/admin/dynamic/verify/export"
-            method="post"
-            target="_blank"
-          >
-          </form>
-        </div>
-      </div>
-    </div>
-  </section>
-
-  <div
-    class="modal fade"
-    id="showModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabel"
-  >
-    <div class="modal-dialog" role="document">
-      <div class="modal-content" style="width: 500px">
-        <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">
-          <input type="hidden" name="id" id="dynamicId" />
-          <div class="show" style="margin-left: 60px"></div>
-        </div>
-        <div id="imgMask"><img src="" alt="" /></div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">
-            关闭
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="modal fade"
-    id="notPassModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabe2"
-  >
-    <div class="modal-dialog" role="document">
-      <div class="modal-content" style="width: 600px">
-        <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="modalLabe2">请选择原因</h4>
-        </div>
-        <div class="modal-body">
-          <form class="form-horizontal" id="notPassForm">
-            <input type="hidden" name="id" id="dynamicId1" />
-            <input type="hidden" name="status" id="status1" />
-            <div class="form-group">
-              <div class="col-sm-10">
-                <select
-                  id="quick_reason"
-                  class="form-control"
-                  data-btn-class="btn-warning"
-                  onchange="setReason()"
-                >
-                  <option value="0">
-                    動態可能包含抽煙、喝酒、辱罵、攻擊他人等不文明內容
-                  </option>
-                  <option value="1">動態涉及色情、暴力、病毒等違規內容</option>
-                  <option value="2">動態包含政治敏感信息</option>
-                  <option value="3">動態包含廣告、營銷內容</option>
-                  <option value="4">
-                    動態可能包含個人隱私信息或涉及他人營私信息
-                  </option>
-                  <option value="5">動態可能涉及線下交易</option>
-                  <option value="6">動態內容無意義</option>
-                  <option value="7">動態內容與世界主題無關</option>
-                  <option value="8">動態可能涉嫌侵犯他人版權</option>
-                  <option value="9">其他</option>
-                </select>
-              </div>
-            </div>
-
-            <div class="form-group">
-              <div class="col-sm-10">
-                <textarea
-                  name="reason"
-                  id="reason"
-                  class="form-control"
-                  rows="3"
-                ></textarea>
-              </div>
-            </div>
-          </form>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">
-            关闭
-          </button>
-          <button type="button" class="btn btn-primary" id="not-pass-save">
-            保存
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="modal fade"
-    id="showContentModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabe3"
-  >
-    <div class="modal-dialog" role="document">
-      <div class="modal-content" style="width: 500px">
-        <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="modalLabe3">查看动态内容详情</h4>
-        </div>
-        <div class="modal-body">
-          <span id="dynamic-content"></span>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">
-            关闭
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import TableHelper from "@/utils/bootstrap-table-helper";
-import { showLoading, hideLoading } from "@/utils/maintainer";
-
-var picker1 = $("#beginDate").datetimepicker({
-  format: "yyyy-mm-dd hh:ii:00",
-  autoclose: true,
-  todayBtn: true,
-});
-var picker2 = $("#endDate").datetimepicker({
-  format: "yyyy-mm-dd hh:ii:00",
-  autoclose: true,
-  todayBtn: true,
-});
-picker1.on("changeDate", function () {
-  var date = $("#beginDate").datetimepicker("getDate");
-  picker2.datetimepicker("setStartDate", date);
-});
-picker2.on("changeDate", function () {
-  var date = $("#endDate").datetimepicker("getDate");
-  picker1.datetimepicker("setEndDate", date);
-});
-export default {
-  name: "DynamicVerifyViewSuper",
-  setup() {
-    function setReason() {
-      if ($("#quick_reason option:selected").val() != 9) {
-        $("#reason").val($("#quick_reason option:selected").text());
-      } else {
-        $("#reason").val("");
-      }
-    }
-
-    function showContent(note) {
-      var content = $(note).parent().find("input").val();
-      $("#dynamic-content").text(content);
-      $("#showContentModal").modal("show");
-    }
-
-    function showPic(resUrl, id) {
-      var html = '<div style="width: 320px;">';
-      console.log(resUrl);
-      if (resUrl != null && resUrl != "" && resUrl != undefined) {
-        var resUrls = resUrl.split(",");
-        for (var i = 0; i < resUrls.length; i++) {
-          if (
-            resUrls[i] != null &&
-            resUrls[i] != undefined &&
-            resUrls[i] != ""
-          ) {
-            html +=
-              '<img id="imgs" src="' +
-              resUrls[i] +
-              '" style="width: 100px;height: 100px;">';
-          }
-        }
-      }
-      html += "</div>";
-      // 打开编辑弹窗
-      $("#showModal").modal("show");
-      $("#dynamicId").val(id);
-      $(".show").html(html);
-    }
-
-    function showVideo(resUrl, id) {
-      var html =
-        '<video width="320" height="240" controls autoplay><source src="' +
-        resUrl +
-        '" type="video/mp4"></video>';
-      // 打开编辑弹窗
-      $("#showModal").modal("show");
-      $("#dynamicId").val(id);
-      $(".show").html(html);
-    }
-    window.setReason = setReason;
-    window.showContent = showContent;
-    window.showPic = showPic;
-    window.showVideo = showVideo;
-    return {
-      setReason,
-      showContent,
-      showPic,
-      showVideo,
-    };
-  },
-  created() {
-    this.$nextTick(function () {
-      this.initData();
-    });
-  },
-  methods: {
-    initData() {
-      $(function () {
-        $("#table").bootstrapTable("destroy");
-        $("#table").bootstrapTable({
-          columns: [
-            //{field: 'id', title: 'id', align: 'center', width: '5%'},
-            { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
-            { field: "nick", title: "昵称", align: "center", width: "5%" },
-            { field: "gender", title: "性别", align: "center", width: "5%" },
-            { field: "worldName", title: "话题", align: "center", width: "5%" },
-            {
-              field: "content",
-              title: "动态内容",
-              align: "center",
-              width: "5%",
-              formatter: function (val, row, index) {
-                if (isEmpty(val)) {
-                  return "-";
-                } else {
-                  if (val.length > 50) {
-                    var content =
-                      "<input type='hidden' id='input-content' value='" +
-                      val +
-                      "'>";
-                    return (
-                      val.substring(0, 50) +
-                      "..." +
-                      content +
-                      "<button href='#' class='btn btn-sm' style='color: #00acd6;background:none' onclick=showContent(this) style='margin-left: 10px;'>查看更多</a>"
-                    );
-                  } else {
-                    return val;
-                  }
-                }
-              },
-            },
-            {
-              field: "resUrl",
-              title: "图片/视频/语音",
-              align: "center",
-              width: "5%",
-              formatter: function (val, row, index) {
-                if (row.type == 1) {
-                  return (
-                    '<audio controls="controls"><source src="' +
-                    val +
-                    '" type="audio/mpeg"></audio>'
-                  );
-                } else if (row.type == 2) {
-                  return (
-                    "<button href='#' class='btn btn-sm' style='color: #00acd6;background:none' onclick=showPic('" +
-                    row.resUrl +
-                    "'," +
-                    row.id +
-                    ")>查看图片</button>"
-                  );
-                } else if (row.type == 3) {
-                  return (
-                    "<button href='#' class='btn btn-sm' style='color: #00acd6;background:none' onclick=showVideo('" +
-                    row.resUrl +
-                    "'," +
-                    row.id +
-                    ")>查看视频</button>"
-                  );
-                }
-              },
-            },
-            {
-              field: "createTime",
-              title: "发布时间",
-              align: "center",
-              width: "5%",
-              valign: "middle",
-              formatter: function (val, row, index) {
-                if (val) {
-                  var date = new Date(val);
-                  return date.format("yyyy-MM-dd hh:mm:00");
-                } else {
-                  return "-";
-                }
-              },
-            },
-            { field: "statusStr", title: "状态", align: "center", width: "5%" },
-            {
-              field: "updateBy",
-              title: "操作人",
-              align: "center",
-              width: "5%",
-            },
-            {
-              field: "updateTime",
-              title: "操作时间",
-              align: "center",
-              width: "5%",
-              valign: "middle",
-              formatter: function (val, row, index) {
-                if (val) {
-                  var date = new Date(val);
-                  return date.format("yyyy-MM-dd hh:mm:00");
-                } else {
-                  return "-";
-                }
-              },
-            },
-            {
-              field: "id",
-              title: "操作",
-              align: "center",
-              width: "5%",
-              formatter: function (val, row, index) {
-                var pass =
-                  '<button class="btn btn-sm btn-primary opt-pass" data-id=' +
-                  val +
-                  " data-status=1>通&#12288;过</button>";
-                var noPass =
-                  '<button class="btn btn-sm btn-danger opt-not-pass" data-id=' +
-                  val +
-                  " data-status=2>不通过</button>";
-                var shelve =
-                  '<button class="btn btn-sm btn-primary opt-pass" data-id=' +
-                  val +
-                  " data-status=4>上&#12288;架</button>";
-                var unshelve =
-                  '<button class="btn btn-sm btn-danger opt-not-pass" data-id=' +
-                  val +
-                  " data-status=5>下&#12288;架</button>";
-                if (row.status == 0) {
-                  return pass + "</br>" + noPass;
-                } else if (
-                  row.status == 1 ||
-                  row.status == 6 ||
-                  row.status == 4
-                ) {
-                  return unshelve;
-                } else if (
-                  row.status == 2 ||
-                  row.status == 5 ||
-                  row.status == 7
-                ) {
-                  return shelve;
-                }
-              },
-            },
-          ],
-          cache: false,
-          striped: true,
-          showRefresh: false,
-          pageSize: 10,
-          pagination: true,
-          pageList: [10, 20, 50, 100],
-          search: false,
-          sidePagination: "server", //表示服务端请求
-          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-          //设置为limit可以获取limit, offset, search, sort, order
-          queryParamsType: "-",
-          queryParams: function queryParams(params) {
-            //设置查询参数
-            var param = {
-              pageNumber: params.pageNumber,
-              pageSize: params.pageSize,
-              erbanNo: $("#erbanNo").val(),
-              nick: $("#nick").val(),
-              status: $("#status").val(),
-              beginDate: $("#beginDate").val(),
-              endDate: $("#endDate").val(),
-              wolrdId: $("#wolrdId").val(),
-              partitionId: $("#partitionId").val(),
-            };
-            return param;
-          },
-          toolbar: "#toolbar",
-          url: "/admin/superCenter/dynamicList",
-          onLoadSuccess: function () {
-            //加载成功时执行
-            console.log("load success");
-          },
-          onLoadError: function () {
-            //加载失败时执行
-            console.log("load fail");
-          },
-        });
-
-        // 查询刷新
-        $("#btnSearch").on("click", function () {
-          TableHelper.doRefresh("#table");
-        });
-
-        //重置
-        $("#btnReset").on("click", function () {
-          $("#erbanNo").val("");
-          $("#nick").val("");
-          $("#status").val("");
-          $("#beginDate").val("");
-          $("#endDate").val("");
-          $("#wolrdId").val("");
-        });
-
-        //审核不通过/下架弹框
-        $("#table").on("click", ".opt-not-pass", function () {
-          var id = $(this).attr("data-id");
-          var status = $(this).attr("data-status");
-          if (id == "undefined") {
-            $("#tipMsg").text("id参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          if (status == "undefined") {
-            $("#tipMsg").text("状态参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          $("#dynamicId1").val(id);
-          $("#status1").val(status);
-          // 打开编辑弹窗
-          $("#notPassModal").modal("show");
-          $("#modalLabe2").text("请选择不通过的原因");
-          status = 5;
-          if (status) {
-            $("#modalLabe2").text("请选择下架的原因");
-          }
-          window.setReason();
-        });
-        //审核不通过/下架弹窗
-        $("#not-pass-save").click(function () {
-          var id = $("#dynamicId1").val();
-          if (id == "undefined") {
-            $("#tipMsg").text("id参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          var status = $("#status1").val();
-          if (status == "undefined") {
-            $("#tipMsg").text("状态参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          var reason = $("#reason").val();
-          if (reason.length <= 0) {
-            alert("请输入原因！");
-            return;
-          }
-          var text = "不通过";
-          if (status == 5) {
-            text = "下架";
-          }
-          verify(text, id, status, reason);
-        });
-
-        $("#table").on("click", ".opt-pass", function () {
-          var id = $(this).attr("data-id");
-          var status = $(this).attr("data-status");
-          if (id == "undefined") {
-            $("#tipMsg").text("id参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          if (status == "undefined") {
-            $("#tipMsg").text("状态参数有误");
-            $("#tipModal").modal("show");
-            return;
-          }
-          var text = "通过";
-          if (status == 4) {
-            text = "上架";
-          }
-          verify(text, id, status, "");
-        });
-        //导出
-        $("#btnExport").on("click", function () {
-          var erbanNo = $("#erbanNo").val();
-          var nick = $("#nick").val();
-          var status = $("#status").val();
-          var beginDate = $("#beginDate").val();
-          var endDate = $("#endDate").val();
-          var wolrdId = $("#wolrdId").val();
-          if (
-            isEmpty(erbanNo) &&
-            isEmpty(nick) &&
-            isEmpty(status) &&
-            isEmpty(beginDate) &&
-            isEmpty(endDate) &&
-            isEmpty(wolrdId)
-          ) {
-            $("#tipMsg").text("请输入导出条件!");
-            $("#tipModal").modal("show");
-            return;
-          }
-          $("#searchForm").submit();
-        });
-        //图片放大
-        $("#showModal").on("mouseenter", "#imgs", function (e) {
-          var src = $(this).attr("src");
-          $("#imgMask img").attr("src", src);
-          $("#imgMask").show();
-          $("#imgMask").css({
-            top: e.clientY + 20,
-          });
-        });
-        $("#showModal").on("mouseleave", "#imgs", function (e) {
-          console.log("移出");
-          $("#imgMask").hide();
-        });
-      });
-    },
-  },
-};
-
-//判断空值
-function isEmpty(data) {
-  if (data == null || data == undefined || data == "") {
-    return true;
-  }
-  return false;
-}
-//审核
-function verify(text, id, status, reason) {
-  //if (confirm("你确认【"+ text + "】该动态吗?")) {
-  showLoading();
-  $.ajax({
-    type: "post",
-    url: "/admin/superCenter/dynamicChangeStatus",
-    data: {
-      dynamicId: id,
-      status: status,
-      reason: reason,
-    },
-    dataType: "json",
-    success: function (json) {
-      hideLoading();
-      if (status == 2 || status == 5) {
-        $("#notPassModal").modal("hide");
-      }
-      if (json.success == "true") {
-        $("#tipMsg").text("操作成功");
-        $("#tipModal").modal("show");
-        TableHelper.doRefresh("#table");
-      } else {
-        $("#tipMsg").text("操作失败");
-        $("#tipModal").modal("show");
-      }
-    },
-  });
-  //}
-}
-
-</script>
-
-<style scoped>
-#imgMask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  min-width: 150px;
-  padding: 4px;
-  background: #fff;
-  z-index: 999;
-  display: none;
-}
-
-#imgMask img {
-  max-height: 600px;
-  max-width: 600px;
-  vertical-align: top;
-}
-
-.fixed-table-body {
-  height: auto !important;
-}
-</style>

src/views/superCenter/GoldWaterSuper.vue

@@ -4,124 +4,133 @@
     <div class="inquire">
       <div class="block">
         <span class="demonstration">开始时间</span>
-        <el-date-picker v-model="inquire.time[0]"
+        <el-date-picker
-                        type="date"
+          v-model="inquire.time[0]"
-                        placeholder="开始时间"
+          type="date"
-                        format="YYYY-MM-DD 00:00:00">
+          placeholder="开始时间"
+          format="YYYY-MM-DD 00:00:00"
+        >
         </el-date-picker>
       </div>
     </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">结束时间</span>
-        <el-date-picker v-model="inquire.time[1]"
+        <el-date-picker
-                        type="date"
+          v-model="inquire.time[1]"
-                        placeholder="结束时间"
+          type="date"
-                        format="YYYY-MM-DD 23:59:59">
+          placeholder="结束时间"
+          format="YYYY-MM-DD 23:59:59"
+        >
         </el-date-picker>
       </div>
     </div>
     <!-- 公会ID -->
     <div class="inquire">
       <span>会长ID</span>
-      <el-input v-model="inquire.id"
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
-                placeholder=""
-                class="input"></el-input>
     </div>
     <!-- 公会 -->
     <!-- 查询按钮 -->
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="getData()"
-               type="primary"
+      >查询</el-button
-               @click="getData()">查询</el-button>
+    >
 
     <!-- 表格 -->
-    <el-table v-loading="loading"
+    <el-table
-              :data="tableData"
+      v-loading="loading"
-              border
+      :data="tableData"
-              style="width: 100%; margin-top: 25px">
+      border
-      <el-table-column prop="ownerErbanNo"
+      style="width: 100%; margin-top: 25px"
-                       align="center"
+    >
-                       label="会长ID" />
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="name"
+      <el-table-column prop="name" align="center" label="公会名称" />
-                       align="center"
+      <el-table-column prop="zoneName" align="center" label="公会长所属国家" />
-                       label="公会名称" />
+      <el-table-column
-      <el-table-column prop="zoneName"
+        prop="ownerPartitionName"
-                       align="center"
+        align="center"
-                       label="公会长所属国家" />
+        label="会长分区"
-      <el-table-column prop="ownerPartitionName"
+      />
-                       align="center"
+      <el-table-column prop="memberNum" align="center" label="成员数" />
-                       label="会长分区" />
+      <el-table-column
-      <el-table-column prop="memberNum"
+        prop="goldIncome"
-                       align="center"
+        align="center"
-                       label="成员数" />
+        label="月金币收入(流水)"
-      <el-table-column prop="goldIncome"
+      />
-                       align="center"
+      <el-table-column
-                       label="月金币收入(流水)" />
+        prop="hasGoldIncomeMemberNum"
-      <el-table-column align="center"
+        align="center"
-                       label="操作">
+        label="有流水成员数"
+      />
+      <el-table-column prop="sendGiftUserNum" align="center" label="送礼人数" />
+      <el-table-column align="center" label="操作">
         <template v-slot="scope">
-          <el-button @click="ediClick(scope.row)"
+          <el-button @click="ediClick(scope.row)" type="text" size="default"
-                     type="text"
+            >查看详情</el-button
-                     size="default">查看详情</el-button>
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 内嵌单个工会详情 -->
-    <el-dialog :title="detailsTitle"
+    <el-dialog :title="detailsTitle" v-model="detailsDialog">
-               v-model="detailsDialog">
+      <el-table
-      <el-table v-loading="loading"
+        v-loading="loading"
-                :data="tableDataDetails"
+        :data="tableDataDetails"
-                border
+        border
-                style="width: 100%; margin-top: 25px">
+        style="width: 100%; margin-top: 25px"
-        <el-table-column prop="erbanNo"
+      >
-                         align="center"
+        <el-table-column prop="erbanNo" align="center" label="用户平台ID"
-                         label="用户平台ID"><template v-slot="scope">
+          ><template v-slot="scope">
             {{
               scope.row.enable ? scope.row.erbanNo : scope.row.erbanNo + "离开"
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick"
+        <el-table-column prop="nick" align="center" label="用户昵称" />
-                         align="center"
+        <el-table-column prop="micRemainTime" align="center" label="直播时长" />
-                         label="用户昵称" />
+        <el-table-column
-        <el-table-column prop="micRemainTime"
+          prop="goldIncome"
-                         align="center"
+          align="center"
-                         label="直播时长" />
+          label="金币收入（流水）"
-        <el-table-column prop="goldIncome"
+        />
-                         align="center"
+        <el-table-column
-                         label="金币收入（流水）" />
+          prop="sendGiftUserNum"
-        <el-table-column prop="sendGiftUserNum"
+          align="center"
-                         align="center"
+          label="送礼人数"
-                         label="送礼人数" />
+        />
       </el-table>
       <!-- 分页 -->
-      <el-pagination style="margin-top: 10px"
+    <el-pagination
-                     class="paginationClass"
+      style="margin-top: 10px"
-                     v-model:current-page="detailspageNum"
+      class="paginationClass"
-                     v-model:page-size="detailspageSize"
+      v-model:current-page="detailspageNum"
-                     :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      v-model:page-size="detailspageSize"
-                     layout="sizes, prev, pager, next"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-                     :total="detailstotal"
+      layout="sizes, prev, pager, next"
-                     @size-change="detailshandleSizeChange"
+      :total="detailstotal"
-                     @current-change="detailshandleCurrentChange" />
+      @size-change="detailshandleSizeChange"
+      @current-change="detailshandleCurrentChange"
+    />
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="detailsDialog = false">关闭</el-button>
-        </div>
+        </div></template
-      </template>
+      >
     </el-dialog>
 
     <!-- 分页 -->
-    <el-pagination style="margin-top: 10px"
+    <el-pagination
-                   class="paginationClass"
+      style="margin-top: 10px"
-                   v-model:current-page="currentPage"
+      class="paginationClass"
-                   v-model:page-size="pageSize"
+      v-model:current-page="currentPage"
-                   :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      v-model:page-size="pageSize"
-                   layout="sizes, prev, pager, next"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-                   :total="total"
+      layout="sizes, prev, pager, next"
-                   @size-change="handleSizeChange"
+      :total="total"
-                   @current-change="handleCurrentChange" />
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
   </div>
 </template>
 <script>
@@ -137,7 +146,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "GoldWaterSuper",
-  data () {
+  data() {
     return {
       loading: false,
       //查询所需条件对象
@@ -156,24 +165,24 @@ export default {
       detailsTitle: "",
       tableDataDetails: [],
       familyIdEx: "",
-      detailspageSize: 10,
+      detailspageSize:10,
-      detailspageNum: 1,
+      detailspageNum :1,
-      detailstotal: 0
+      detailstotal:0
     };
   },
-  created () {
+  created() {
     // this.getData();
   },
   methods: {
-    // 默认七天
+     // 默认七天
-    calculateLastSevenDays () {
+     calculateLastSevenDays() {
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
       return [start, end];
     },
     // 查询接口
-    getData () {
+    getData() {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = null;
@@ -217,8 +226,8 @@ export default {
       });
     },
     // 查看详情按钮
-    ediClick (val) {
+    ediClick(val) {
-
+      
       let time = this.inquire.time;
       let startDate = "";
       let endDate = "";
@@ -226,16 +235,16 @@ export default {
         startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
         endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
-      if (val) {
+      if(val){
         this.detailsTitle = `公会昵称：【${val.name}】 时间：【${val.createTime}】—金币收入明细`;
-        this.familyIdEx = val.id;
+      this.familyIdEx = val.id;
       }
       incomeListFamilyMember({
         endDate,
         startDate,
-        familyId: this.familyIdEx,
+        familyId:  this.familyIdEx,
-        pageNum: this.detailspageNum,
+        pageNum:this.detailspageNum,
-        pageSize: this.detailspageSize
+        pageSize:this.detailspageSize
       }).then((res) => {
         this.tableDataDetails = res.data.records;
         this.detailsDialog = true;
@@ -243,16 +252,16 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange () {
+    handleSizeChange() {
       this.getData();
     },
-    handleCurrentChange () {
+    handleCurrentChange() {
       this.getData();
     },
-    detailshandleSizeChange () {
+    detailshandleSizeChange(){
       this.ediClick()
     },
-    detailshandleCurrentChange () {
+    detailshandleCurrentChange(){
       this.ediClick()
     }
   },

src/views/superCenter/GuildInfoSuper.vue

@@ -1,18 +1,5 @@
 <template>
   <div class="box">
-    <div class="inquire">
-      <span>公会ID</span>
-      <el-input v-model="inquire.familyId"
-                placeholder=""
-                class="input"
-                type="number"></el-input>
-    </div>
-    <div class="inquire">
-      <span>会长ID</span>
-      <el-input v-model="inquire.userId"
-                placeholder=""
-                class="input"></el-input>
-    </div>
     <!-- 查询按钮 -->
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
@@ -71,11 +58,41 @@
            {{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column align="center" label="收款账户" width="300">
-        prop="operator"
+        <template v-slot="scope">
-        align="center"
+          <el-button
-        label="操作人"
+            @click="payAccountDialogFun(scope.row)"
-      />
+            type="text"
+            size="medium "
+          >
+            payoneer:{{
+              scope.row.payAccount.payoneer
+                ? scope.row.payAccount.payoneer
+                : "未添加"
+            }} </el-button
+          ><br />
+          <el-button
+            @click="payAccountDialogFun(scope.row)"
+            type="text"
+            size="medium "
+          >
+            USDT-ERC20:{{
+              scope.row.payAccount.usdt ? scope.row.payAccount.usdt : "未添加"
+            }} </el-button
+          ><br />
+          <el-button
+            @click="payAccountDialogFun(scope.row)"
+            type="text"
+            size="medium "
+          >
+            PayPal:{{
+              scope.row.payAccount.payPal
+                ? scope.row.payAccount.payPal
+                : "未添加"
+            }} </el-button
+          ><br />
+        </template>
+      </el-table-column>
        <el-table-column
         prop="guildContact"
         align="center"
@@ -186,8 +203,10 @@ export default {
       delDialogData: null,
       //查询所需条件对象
       inquire: {
-        familyId:'',
+        familyId: undefined,
-        userId:'',
+        userId: "",
+        referrer: "",
+        time: "",
       },
       //新增所需对象
       resource: {
@@ -215,8 +234,10 @@ export default {
     getData() {
       this.loading = true;
       pageFamily({
-        familyId: this.inquire.familyId,
+        // familyId: this.inquire.familyId,
-        erbanNo: this.inquire.userId,
+        // erbanNo: this.inquire.userId,
+        // referrer: this.inquire.referrer,
+        // familyName: this.inquire.nick,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
       }).then((res) => {

src/views/superCenter/HeadwearAdminViewSuper.vue

@@ -145,6 +145,9 @@ export default {
             { field: 'name.en', title: '英语头饰名称', align: 'center', width: '5%' },
             { field: 'name.tr', title: '土耳其语头饰名称', align: 'center', width: '5%' },
             { field: 'name.pt', title: '葡萄牙语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.ru', title: '俄语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.es', title: '西班牙语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.uz', title: '乌兹别克语头饰名称', align: 'center', width: '5%' },
             {
               field: 'pic',
               title: '头饰图片',
@@ -262,11 +265,6 @@ export default {
             $("#tipMsg").text("请输入体验天数");
             $("#tipModal").modal('show');
             return;
-          }
-           if ($('#sendDays').val()>30) {
-            $("#tipMsg").text("赠送天数不超过30天");
-            $("#tipModal").modal('show');
-            return;
           }
           var sendDays = $('#sendDays').val();
           var sendDesc = $('#sendDesc').val();

src/views/superCenter/NameplateInfoViewSuper.vue

@@ -113,6 +113,9 @@ export default {
             { field: 'name.en', title: '英语铭牌名称', align: 'center', width: '5%' },
             { field: 'name.tr', title: '土耳其语名称', align: 'center', width: '5%' },
             { field: 'name.pt', title: '葡萄牙语名称', align: 'center', width: '5%' },
+            { field: 'name.ru', title: '俄语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.es', title: '西班牙语头饰名称', align: 'center', width: '5%' },
+            { field: 'name.uz', title: '乌兹别克语头饰名称', align: 'center', width: '5%' },
             {
               field: 'iconPic',
               title: '铭牌图片',
@@ -254,11 +257,6 @@ export default {
             $("#tipModal").modal('show');
             return;
           }
-          if ($('#sendDays').val()>30) {
-            $("#tipMsg").text("赠送天数不超过30天");
-            $("#tipModal").modal('show');
-            return;
-          }
           var sendDays = $('#sendDays').val();
           var sendDesc = $('#sendDesc').val();
           var nameplateId = $('#sendNameplateId').val();

src/views/superCenter/VipGiveSuper.vue

@@ -125,10 +125,6 @@ export default {
           {
             vipLevel:3, 
             vipName: "VIP3"
-          },
-          {
-            vipLevel:4, 
-            vipName: "VIP4"
           }
         ],
         value2: "",

src/views/system/I18nMessageAdminView.vue

@@ -111,6 +111,39 @@
                           v-model="i18nMessage.pt" />
               </div>
             </div>
+            <div class="form-group">
+              <label for="ru"
+                     class="col-sm-2 control-label">俄语</label>
+              <div class="col-sm-9">
+                <textarea class="form-control validate[required]"
+                          name="ru"
+                          id="ru"
+                          rows="3"
+                          v-model="i18nMessage.ru" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="es"
+                     class="col-sm-2 control-label">西班牙语</label>
+              <div class="col-sm-9">
+                <textarea class="form-control validate[required]"
+                          name="es"
+                          id="es"
+                          rows="3"
+                          v-model="i18nMessage.es" />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="uz"
+                     class="col-sm-2 control-label">乌兹别克语</label>
+              <div class="col-sm-9">
+                <textarea class="form-control validate[required]"
+                          name="uz"
+                          id="uz"
+                          rows="3"
+                          v-model="i18nMessage.uz" />
+              </div>
+            </div>
           </form>
         </div>
         <div class="modal-footer">
@@ -141,6 +174,9 @@ export default {
         { field: 'ar', title: '阿语', align: 'center', width: '17%' },
         { field: 'tr', title: '土耳其', align: 'center', width: '17%' },
         { field: 'pt', title: '葡萄牙语', align: 'center', width: '17%' },
+        { field: 'ru', title: '俄语', align: 'center', width: '17%' },
+        { field: 'es', title: '西班牙语', align: 'center', width: '17%' },
+        { field: 'uz', title: '乌兹别克语', align: 'center', width: '17%' },
         {
           field: 'key',
           title: '操作',
@@ -158,6 +194,9 @@ export default {
         en: '',
         ar: '',
         pt: '',
+        ru: '',
+        es: '',
+        uz: '',
       },
     };
   },
@@ -211,6 +250,9 @@ export default {
       this.i18nMessage.ar = '';
       this.i18nMessage.tr = '';
       this.i18nMessage.pt = '';
+      this.i18nMessage.ru = '';
+      this.i18nMessage.es = '';
+      this.i18nMessage.uz = '';
       $('#editModal').modal('show');
     },
     edit (obj) {
@@ -222,6 +264,9 @@ export default {
       this.i18nMessage.ar = record.ar;
       this.i18nMessage.tr = record.tr;
       this.i18nMessage.pt = record.pt;
+      this.i18nMessage.ru = record.ru;
+      this.i18nMessage.es = record.es;
+      this.i18nMessage.uz = record.uz;
       $('#editModal').modal('show');
     },
     save () {
@@ -234,6 +279,9 @@ export default {
         ar: $this.trimTextArea(form.ar),
         tr: $this.trimTextArea(form.tr),
         pt: $this.trimTextArea(form.pt),
+        ru: $this.trimTextArea(form.ru),
+        es: $this.trimTextArea(form.es),
+        uz: $this.trimTextArea(form.uz),
       };
 
       saveI18nMessage(params).then(res => {

src/views/users/ChargeRecordSovietPartitionStatisticsView.vue

@@ -0,0 +1,294 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span class="demonstration">日期</span>
+      <el-date-picker
+        v-model="dataTime"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
+      </el-date-picker>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-button class="primary" type="primary" @click="confirmExportExcel()"
+      >导出</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="date" align="center" label="日期" />
+      <el-table-column
+        prop="v5payUsd"
+        align="center"
+        label="
+    V5play充值美元"
+      >
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'v5pay')"
+            type="text"
+            size="medium "
+            >{{ scope.row.v5payUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="googleUsd" align="center" label="google充值美元">
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'google_play_billing')"
+            type="text"
+            size="medium "
+            >{{ scope.row.googleUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="razerUsd" align="center" label="razer充值">
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'razer')"
+            type="text"
+            size="medium "
+            >{{ scope.row.razerUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="payermaxUsd"
+        align="center"
+        label="payermax充值美元"
+      >
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'payermax')"
+            type="text"
+            size="medium "
+            >{{ scope.row.payermaxUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元">
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'MyCard')"
+            type="text"
+            size="medium "
+            >{{ scope.row.myCardUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="startPayUsd"
+        align="center"
+        label="startPay充值美元"
+      >
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'start_pay')"
+            type="text"
+            size="medium "
+            >{{ scope.row.startPayUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="iosUsd" align="center" label="ios充值美元">
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'ios_pay')"
+            type="text"
+            size="medium "
+            >{{ scope.row.iosUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="companyUsd" align="center" label="对公打款美元">
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, 'company')"
+            type="text"
+            size="medium "
+            >{{ scope.row.companyUsd }}</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column prop="totalUsd" align="center" label="总充值美元" >
+        <template v-slot="scope">
+          <el-button
+            @click="detailDialogFun(scope.row.date, '')"
+            type="text"
+            size="medium "
+            >{{ scope.row.totalUsd }}</el-button
+          >
+        </template>
+        </el-table-column>
+    </el-table>
+    <!--国家明细弹窗 -->
+      <el-dialog v-model="detailDialog" title="国家明细" width="25%" center>
+           <!-- 表格数据 -->
+    <el-table
+      v-loading="detailData.loading"
+      :data="detailData.data"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="regionName" align="center" label="国家" />
+      <el-table-column prop="usd" align="center" label="充值美元" />
+      </el-table>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ChargeRecordSovietPartitionStatisticsView",
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { dateFormat } from "@/utils/system-helper";
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
+import { formatDate } from "@/utils/relDate";
+
+const dataTime = ref([]);
+const formData = reactive({
+  beginDate: "",
+  endDate: "",
+  partitionId: 32,
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  if (dataTime.value && dataTime.value.length > 0) {
+    formData.beginDate = dateFormat(dataTime.value[0], "yyyy-MM-dd");
+    formData.endDate = dateFormat(dataTime.value[1], "yyyy-MM-dd");
+  } else {
+    formData.beginDate = dataTime.value;
+    formData.endDate = dataTime.value;
+  }
+  getChargeRecordPartitionDetail(formData).then((res) => {
+    tableData.data = res;
+    tableData.loading = false;
+  });
+};
+// 导出
+const confirmExportExcel = async () => {
+  // Object.assign(formData, { pageSize: 10000, pageNo: 1 });
+  try {
+    const res = await exportPartitionDetail(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",
+    });
+  }
+};
+
+// 设置默认日期范围（今天到7天前）
+const setDefaultDateRange = () => {
+  const today = new Date();
+  const sevenDaysAgo = new Date();
+  sevenDaysAgo.setDate(today.getDate() - 7);
+
+  dataTime.value = [
+    dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
+    dateFormat(today, "yyyy-MM-dd"),
+  ];
+};
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 32,
+  }).then((res) => {
+    if (res.code == 200) {
+      detailData.data = res.data;
+          detailData.loading = false;
+          detailDialog.value = true;
+    } else {
+      detailData.loading = false;
+      ElMessage({
+        message: res.message,
+        type: "error",
+      });
+    }
+  });
+};
+onMounted(() => {
+  setDefaultDateRange();
+  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;
+}
+</style>

src/views/users/GiftManageView.vue

@@ -160,6 +160,7 @@
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
                                 <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                                 <input type="checkbox" name="partitionFlag" value="16"/>英语2区<br>
+                                <input type="checkbox" name="partitionFlag" value="32"/>独联体<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -204,6 +205,24 @@
                                 <input type="text" class="form-control validate[required]" name="giftName" id="giftPtName">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="giftRuName" class="col-sm-2 control-label">俄语礼物名称</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control validate[required]" name="giftName" id="giftRuName">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="giftEsName" class="col-sm-2 control-label">西班牙语礼物名称</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control validate[required]" name="giftName" id="giftEsName">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="giftUzName" class="col-sm-2 control-label">乌兹别克语礼物名称</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control validate[required]" name="giftName" id="giftUzName">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="goldPrice" class="col-sm-2 control-label">礼物价格</label>
                             <div class="col-sm-10">
@@ -690,6 +709,9 @@ export default {
                         {field: 'giftName.en', title: '英语礼物名称', align: 'center', width: '10%'},
                         {field: 'giftName.tr', title: '土耳其语礼物名称', align: 'center', width: '10%'},
                         {field: 'giftName.pt', title: '葡萄牙语礼物名称', align: 'center', width: '10%'},
+                        {field: 'giftName.ru', title: '俄语礼物名称', align: 'center', width: '10%'},
+                        {field: 'giftName.es', title: '西班牙语礼物名称', align: 'center', width: '10%'},
+                        {field: 'giftName.uz', title: '乌兹别克语礼物名称', align: 'center', width: '10%'},
                         {
                             field: 'partitionFlag', 
                             title: '地区', 
@@ -712,6 +734,9 @@ export default {
                                 if ((val & 16) != 0) {
                                     value += '英语2区<br>';
                                 }
+                                if ((val & 32) != 0) {
+                                    value += '独联体<br>';
+                                }
                                 return value;
                             }
                         },
@@ -1332,6 +1357,9 @@ export default {
                                     // 土耳其
                                     $("#giftTrName").val(jsonName.tr);
                                     $("#giftPtName").val(jsonName.pt);
+                                    $("#giftRuName").val(jsonName.ru);
+                                    $("#giftEsName").val(jsonName.es);
+                                    $("#giftUzName").val(jsonName.uz);
                                 } else {
                                     $("#giftName").val(giftName);
                                     // 阿语名称
@@ -1341,6 +1369,9 @@ export default {
                                     // 土耳其名称
                                     $("#giftTrName").val(giftName);
                                     $("#giftPtName").val(giftName);
+                                    $("#giftRuName").val(giftName);
+                                    $("#giftEsName").val(giftName);
+                                    $("#giftUzName").val(giftName);
                                 }
                                 $("#goldPrice").val(json.entity.goldPrice);
 
@@ -1471,6 +1502,11 @@ export default {
                                 } else {
                                     $("input:checkbox[name='partitionFlag']")[4].checked = false; 
                                 }
+                                if ((partitionFlag & 32) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[5].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[5].checked = false; 
+                                }
                                 // 打开编辑弹窗
                                 $("#giftModal").modal('show');
                             } else {
@@ -1498,8 +1534,11 @@ export default {
                         // 土耳其名称
                         var tr_name = $("#giftTrName").val();
                         var pt_name = $("#giftPtName").val();
+                        var ru_name = $("#giftRuName").val();
+                        var es_name = $("#giftEsName").val();
+                        var uz_name = $("#giftUzName").val();
                         // 国际化字段
-                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name,'tr':tr_name, 'pt':pt_name}
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name,'tr':tr_name, 'pt':pt_name, 'ru':ru_name, 'es':es_name, 'uz':uz_name}
                         const nameValue = JSON.stringify(jsonName);
                         // 修改属性值
                         formData.giftName = nameValue; // 将giftName修改为"newGiftName"

src/views/users/MessageAdminView.vue

@@ -341,6 +341,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               },
             },

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>

src/views/users/UserCheckAdminBaseView.vue

@@ -250,7 +250,7 @@ export default {
           },
           uniqueId: 'code',
           toolbar: '#toolbar',
-          url: '/admin/userCheckAdmin/getlist',
+          url: '/admin/userCheckAdmin/list',
           onLoadSuccess: function () {  //加载成功时执行
             console.log("load success");
           },

src/views/users/UserPurseAdminView.vue

@@ -68,8 +68,10 @@ export default {
                         { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '8%' },
                         { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'diamonds', title: '金币', align: 'center', valign: 'middle', width: '8%' },
-                        { field: 'crystals', title: '水晶', align: 'center', valign: 'middle', width: '8%' },
+                        //{ field: 'crystals', title: '水晶', align: 'center', valign: 'middle', width: '8%' },
                         { field: 'golds', title: '钻石', align: 'center', valign: 'middle', width: '8%' },
+                        { field: 'guildUsd', title: '公会薪资', align: 'center', valign: 'middle', width: '8%' },
+                        { field: 'guildCrystal', title: '公会紫晶', align: 'center', valign: 'middle', width: '8%' },
                         {
                             field: 'firstCharge', title: '首充资格', align: 'center', valign: 'middle', width: '2%', formatter: function (val, row, index) {
                                 if (val) {

vue.config.js

@@ -19,7 +19,7 @@ module.exports = defineConfig({
     config
       .plugin('html') // 配置 html-webpack-plugin 插件
       .tap(args => {
-        args[0].title = 'E-Party管理后台' // 设置网页标题
+        args[0].title = 'MOLISTAR管理后台' // 设置网页标题
         return args
       })
   },