新增 - 休闲游戏时长统计

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

@@ -50,3 +50,20 @@ export const exportClearDiamond = 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/VipGive/VipGive.js

@@ -32,3 +32,11 @@ export const vipSendSend = query => {
         params: query
     });
 };
+// 赠送VIP接口 - 客服
+export const vipSendSendCustomerSend = query => {
+    return request({
+        url: '/vipSend/customerSend',
+        method: 'post',
+        params: query
+    });
+};

src/api/luckGift/luckGift.js

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

src/api/noblemanNew/noblemanNew.js

@@ -30,7 +30,7 @@ export const create = query => {
     return request({
         url: '/admin/guild/manage/create',
         method: 'post',
-        params: query
+         data: query
     });
 };
 // 删除公会信息
@@ -51,7 +51,7 @@ export const update = query => {
     return request({
         url: '/admin/guild/manage/update',
         method: 'post',
-        params: query
+       data: query
     });
 };
 // 导出-公会信息

src/api/relAgency/relAgency.js

@@ -272,3 +272,63 @@ export const exportRoomHourDiamondList = query => {
         responseType: 'blob'
     });
 };
+
+// CIS公会钻石 - 列表
+export const getSovietList = query => {
+    return request({
+        url: '/admin/soviet/list',
+        method: 'get',
+        params: query
+    });
+};
+// CIS公会钻石 - 导出
+export const exportSovietList = query => {
+    return request({
+        url: '/admin/soviet/export',
+        method: 'post',
+        params: query,
+        responseType: 'blob'
+    });
+};
+// CIS公会成员钻石 - 列表
+export const getSovietMemberList = query => {
+    return request({
+        url: '/admin/soviet/memberList',
+        method: 'get',
+        params: query
+    });
+};
+// CIS公会成员钻石 - 导出
+export const exportSovietMemberList = query => {
+    return request({
+        url: '/admin/soviet/memberExport',
+        method: 'post',
+        params: query,
+        responseType: 'blob'
+    });
+};
+// CIS房主钻石 - 列表
+export const getSovietRoomList = query => {
+    return request({
+        url: '/admin/soviet/roomList',
+        method: 'get',
+        params: query
+    });
+};
+// CIS房主钻石 - 导出
+export const exportSovietRoomList = query => {
+    return request({
+        url: '/admin/soviet/roomExport',
+        method: 'post',
+        params: query,
+        responseType: 'blob'
+    });
+};
+// CIS房主钻石 - CIS房主钻石-周期
+export const getRoomCycleDateList = query => {
+    return request({
+        url: '/admin/soviet/roomCycleDateList',
+        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/ChargeRecordPartitionStatisticsView.js

@@ -65,3 +65,11 @@ export const exportChargeRecordTotalExport = query => {
          responseType: 'blob'
     });
 };
+// 充值明细
+export const getChargeRecordPartitionRegionDetail = query => {
+    return request({
+        url: '/admin/chargeRecord/partitionRegionDetail',
+        method: 'get',
+        params: query
+    });
+};

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/UserInformationCustomer.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+
+// 获取用户充值等级列表
+export const getUserCheckAdmin = query => {
+  return request({
+      url: '/admin/userCheckAdmin/getUser',
+      method: 'get',
+      params: query
+  });
+};
+// 修改用户等级
+export const changeUserExpChange = query => {
+  return request({
+      url: '/userExpChange/change',
+      method: 'post',
+      params: query
+  });
+};

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,27 @@ 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: "座驾样式",
+              align: "center",
+              width: "5%",
+              formatter: function (val, row, index) {
+                if (val) {
+                  return (
+                    "<img style='max-width: 50px;max-height: 50px' src='" +
+                    val +
+                    "'>"
+                  );
+                } else {
+                  return "-";
+                }
+              },
+            },
             {
               field: 'partitionFlag',
               title: '地区',
@@ -709,6 +763,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -737,27 +794,9 @@ export default {
                 }
               }
             },
-            {
-              field: 'radishSale',
-              title: '萝卜购买',
-              align: 'center',
-              width: '5%',
-              formatter: function (val, row, index) {
-                if (val == true) {
-                  return "是";
-                } else if (val == false) {
-                  return "否";
-                } else {
-                  return "-";
-                }
-              }
-            },
             { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
             { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
             { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
-            { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
-            { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
-            { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
             {
               field: 'enable', title: '启用状态', align: 'center', width: '15%', formatter: function (val, row, index) {
                 if (val == 1) {
@@ -922,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('');
@@ -1127,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);
@@ -1271,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');
@@ -1354,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/dailyCoinStatistics/dailyCoinStatistics.vue

@@ -5,8 +5,9 @@
       <div class="block">
         <span class="demonstration">开始时间</span>
         <el-date-picker v-model="inquire.time[0]"
-                        type="dates"
-                        placeholder="开始时间">
+                        type="date"
+                        placeholder="开始时间"
+                        format="YYYY-MM-DD">
         </el-date-picker>
       </div>
     </div>
@@ -14,8 +15,9 @@
       <div class="block">
         <span class="demonstration">结束时间</span>
         <el-date-picker v-model="inquire.time[1]"
-                        type="dates"
-                        placeholder="结束时间">
+                        type="date"
+                        placeholder="结束时间"
+                        format="YYYY-MM-DD">
         </el-date-picker>
       </div>
     </div>
@@ -237,7 +239,7 @@ export default {
       loading: false,
       // 查询条件
       inquire: {
-        time: [],
+        time: this.calculateLastSevenDays(),
       },
       // 表格
       tableData: [{ x: "x" }],
@@ -252,7 +254,7 @@ export default {
     };
   },
   created () {
-    // this.getData();
+    this.getData();
   },
   computed: {
     // 千分位
@@ -265,6 +267,13 @@ export default {
 
   },
   methods: {
+        // 默认七天
+    calculateLastSevenDays () {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
     totalDiamonds (row) {
       const subDiamond = Number(row.subDiamond || 0);
       const addDiamond = Number(row.addDiamond || 0);

src/views/data/guildStatisticsData.vue

@@ -1,162 +1,166 @@
 <template>
   <!-- 表格 -->
-  <el-table v-loading="loading"
-            :data="tableData"
-            border
-            style="width: 100%; margin-top: 25px">
-    <el-table-column align="center"
-                     label="日期"
-                     width="220px">
+  <el-table
+    v-loading="loading"
+    :data="tableData"
+    border
+    style="width: 100%; margin-top: 25px"
+  >
+    <el-table-column align="center" label="日期" width="220px">
       <template v-slot="scope">
         {{ scope.row.date }} ~ {{ scope.row.endDate }}
       </template>
     </el-table-column>
 
-    <el-table-column prop="totalNewCount"
-                     align="center"
-                     label="全服公会总新增" />
+    <el-table-column
+      prop="totalNewCount"
+      align="center"
+      label="全服公会总新增"
+    />
 
-    <el-table-column align="center"
-                     label="阿拉伯公会总新增"
-                     width="">
+    <el-table-column align="center" label="阿拉伯公会总新增" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '阿拉伯公会总新增' + scope.row.date;
             edi(scope.row.arNewCountDetail, false);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.arNewCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="英语区总新增"
-                     width="">
+    <el-table-column align="center" label="英语区总新增" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '英语区总新增' + scope.row.date;
             edi(scope.row.enNewCountDetail, false);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.enNewCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="华语区总新增"
-                     width="">
+    <el-table-column align="center" label="华语区总新增" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '华语区总新增' + scope.row.date;
             edi(scope.row.zhNewCountDetail, false);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.zhNewCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="土耳其区总新增"
-                     width="">
+    <el-table-column align="center" label="土耳其区总新增" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '土耳其区总新增' + scope.row.date;
             edi(scope.row.trNewCountDetail, false);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.trNewCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="英语2区总新增"
-                     width="">
+    <el-table-column align="center" label="英语2区总新增" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '英语2区总新增' + scope.row.date;
             edi(scope.row.en2NewCountDetail, false);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.en2NewCount }}
         </el-button>
       </template>
     </el-table-column>
 
-    <el-table-column prop="totalActiveCount"
-                     align="center"
-                     label="全服公会活跃度" />
+    <el-table-column
+      prop="totalActiveCount"
+      align="center"
+      label="全服公会活跃度"
+    />
 
-    <el-table-column align="center"
-                     label="阿拉伯公会活跃度"
-                     width="">
+    <el-table-column align="center" label="阿拉伯公会活跃度" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '阿拉伯公会活跃度' + scope.row.date;
             edi(scope.row.arActiveCountDetail, true);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.arActiveCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="英语区活跃度"
-                     width="">
+    <el-table-column align="center" label="英语区活跃度" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '英语区活跃度' + scope.row.date;
             edi(scope.row.enActiveCountDetail, true);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.enActiveCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="华语区活跃度"
-                     width="">
+    <el-table-column align="center" label="华语区活跃度" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '华语区活跃度' + scope.row.date;
             edi(scope.row.zhActiveCountDetail, true);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.zhActiveCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="土耳其区活跃度"
-                     width="">
+    <el-table-column align="center" label="土耳其区活跃度" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '土耳其区活跃度' + scope.row.date;
             edi(scope.row.trActiveCountDetail, true);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.trActiveCount }}
         </el-button>
       </template>
     </el-table-column>
-    <el-table-column align="center"
-                     label="英语2区活跃度"
-                     width="">
+    <el-table-column align="center" label="英语2区活跃度" width="">
       <template v-slot="scope">
-        <el-button @click="
+        <el-button
+          @click="
             detailsTitle = '英语2区活跃度' + scope.row.date;
             edi(scope.row.en2ActiveCountDetail, true);
           "
-                   type="text"
-                   size="small">
+          type="text"
+          size="small"
+        >
           {{ scope.row.en2ActiveCount }}
         </el-button>
       </template>
@@ -177,51 +181,70 @@
   /> -->
 
   <!-- 详情 -->
-  <el-dialog v-model="detailsDialog"
-             :title="detailsTitle"
-             width="50%"
-             center>
+  <el-dialog v-model="detailsDialog" :title="detailsTitle" width="50%" center>
     <!-- 内表格 -->
-    <el-table v-loading="loading"
-              :data="tableDataIn"
-              border
-              style="width: 100%; margin-top: 25px">
-      <el-table-column prop="date"
-                       align="center"
-                       label="日期" />
-      <el-table-column prop="endDate"
-                       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="ownerRegionName"
-                       align="center"
-                       label="公会长地区" />
-      <el-table-column prop="activeMemberCount"
-                       align="center"
-                       label="本周收礼主播数" />
-      <el-table-column prop="guildGoldFlow"
-                       align="center"
-                       label="本周公会钻石流水" />
-      <el-table-column prop="guildDiamondFlow"
-                       align="center"
-                       label="本周公会金币流水" />
-      <el-table-column prop="lastGuildGoldFlow"
-                       align="center"
-                       label="上周公会钻石流水"
-                       v-if="detailsIsShow" />
-      <el-table-column prop="guildGoldFlowWow"
-                       align="center"
-                       label="周环比"
-                       v-if="detailsIsShow">
+    <el-table
+      v-loading="loading"
+      :data="tableDataIn"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="endDate" 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="ownerRegionName"
+        align="center"
+        label="公会长所属国家"
+      />
+      <el-table-column prop="operatorName" align="center" label="公会负责人" />
+      <el-table-column
+        prop="activeMemberCount"
+        align="center"
+        label="本周收礼主播数"
+      />
+      <el-table-column
+        prop="guildGoldFlow"
+        align="center"
+        label="本周公会钻石流水"
+      >
+      <template v-slot="scope">
+          {{
+            formattedNumber(scope.row.guildGoldFlow)
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="guildDiamondFlow"
+        align="center"
+        label="本周公会金币流水"
+      >
+      <template v-slot="scope">
+          {{
+            formattedNumber(scope.row.guildDiamondFlow)
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="lastGuildGoldFlow"
+        align="center"
+        label="上周公会钻石流水"
+        v-if="detailsIsShow"
+      />
+      <el-table-column
+        prop="guildGoldFlowWow"
+        align="center"
+        label="周环比"
+        v-if="detailsIsShow"
+      >
         <template v-slot="scope">
           {{
-            scope.row.lastGuildGoldFlow === 0 ? '--'
-              : formatPercentage(scope.row.guildGoldFlow / scope.row.lastGuildGoldFlow) + '%'
+            scope.row.lastGuildGoldFlow === 0
+              ? "--"
+              : formatPercentage(
+                  scope.row.guildGoldFlow / scope.row.lastGuildGoldFlow
+                ) + "%"
           }}
         </template>
       </el-table-column>
@@ -229,9 +252,9 @@
     <!-- 操作 -->
     <template #footer>
       <span class="dialog-footer">
-        <el-button type="primary"
-                   class="primary"
-                   @click="detailsDialog = false">关闭</el-button>
+        <el-button type="primary" class="primary" @click="detailsDialog = false"
+          >关闭</el-button
+        >
       </span>
     </template>
   </el-dialog>
@@ -242,7 +265,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "guildStatisticsData",
-  data () {
+  data() {
     return {
       loading: false,
       // 查询条件
@@ -262,12 +285,23 @@ export default {
       detailsIsShow: false,
     };
   },
-  created () {
+  created() {
     this.getData();
   },
+  computed: {
+    // 千分位
+    formattedNumber() {
+      return (num) => {
+        if (num === null || num === undefined) return "";
+        return Math.floor(num)
+          .toString()
+          .replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+      };
+    },
+  },
   methods: {
     // 查询
-    getData () {
+    getData() {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = null;
@@ -298,19 +332,19 @@ export default {
       });
     },
     // 详情
-    edi (res, type) {
+    edi(res, type) {
       this.detailsIsShow = type;
       this.tableDataIn = JSON.parse(res);
       this.detailsDialog = true;
     },
-    formatPercentage (value) {
+    formatPercentage(value) {
       return parseFloat((value * 100).toFixed(2));
     },
     // 分页导航
-    handleSizeChange () {
+    handleSizeChange() {
       this.getData();
     },
-    handleCurrentChange () {
+    handleCurrentChange() {
       this.getData();
     },
   },

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/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,
-        // endDate: endTime,
+        startTime: startTime,
+        endTime: endTime,
         inviteErbanNo: this.inquire.inviteErbanNo,
         pageNum: this.currentPage,
         pageSize: this.pageSize,

src/views/guildOperationManagement/amethystClearRecord.vue

@@ -0,0 +1,201 @@
+<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.ownerErbanNo" 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.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="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column prop="uid" align="center" label="主播UID" />
+      <el-table-column prop="erbanNo" align="center" label="主播ID" />
+      <el-table-column prop="nick" 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
+      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: "amethystClearRecord",
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  getGuildAmethystClearRecordList,
+  exportClearAmethyst,
+  getGuildPolicyCycleDates,
+} from "@/api/SalaryDetails/SalaryDetails.js";
+import { formatDate } from "@/utils/relDate";
+const formData = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  erbanNo: "",
+  guildId: "",
+  ownerErbanNo: "",
+  cycleDate: "",
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+const dateCycleArr = ref([]);
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  getGuildAmethystClearRecordList(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 confirmExportExcel = async () => {
+  // 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();
+};
+const handleCurrentChange = (val) => {
+  formData.pageNo = val;
+  getData();
+};
+onMounted(() => {
+  getGuildPolicyCycleDates().then((res) => {
+    if (res.code == 200) {
+      dateCycleArr.value = res.data;
+    } else {
+      ElMessage({
+        showClose: true,
+        message: res.message,
+        type: "error",
+      });
+    }
+  });
+});
+</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/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"
-                 placeholder="请选择"
-                 @change="getlistByPartition()">
-        <el-option v-for="item in partitionOptions"
-                   :key="item.id"
-                   :label="item.desc"
-                   :value="item.id">
+      <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-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>
+      <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>
+      <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>
+      <el-input
+        v-model="formData.guildId"
+        placeholder=""
+        class="input"
+      ></el-input>
     </div>
-    <div class="inquire"
-         style="margin-top: 20px;">
+    <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
+        v-model="dataTime"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
       </el-date-picker>
     </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 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-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="ownerErbanNo"
-                       align="center"
-                       label="公会长ID" />
-      <el-table-column prop="guildId"
-                       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="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="状态">
+    <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="ownerErbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="guildId" 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="diamondNum" align="center" label="钻石流水" />
+      <el-table-column prop="goldNum" align="center" label="金币流水" />
+      <el-table-column
+        prop="rewardGold"
+        align="center"
+        label="对应流水发放金币"
+      />
+      <el-table-column prop="receivedGold" 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"
-                       align="center"
-                       label="发放时间" />
-      <el-table-column align="center"
-                       label="操作"
-                       width="300">
+      <el-table-column prop="receiveErbanNo" align="center" label="领取人ID" />
+      <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 == 0'>发放</el-button>
+          <el-button
+            class="primary"
+            type="primary"
+            @click="sendDiamond(scope.row)"
+            size="default"
+            v-if="scope.row.status == 0"
+            >发放</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column prop="operator"
-                       align="center"
-                       label="操作人" />
+      <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" />
+    <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'
+<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, getroomDayDiamondList
-  , roomDayDiamondExport, sendroomDayDiamond
+  getlistByPartitionId,
+  getroomDayDiamondList,
+  roomDayDiamondExport,
+  sendroomDayDiamond,
 } from "@/api/relAgency/relAgency.js";
 export default {
   name: "dailyDiamondFlow",
-  setup () {
-    const dataTime = ref('');
+  setup() {
+    const dataTime = ref("");
     const formData = reactive({
-      partitionId: '',
-      erbanNo: '',
+      partitionId: "",
+      erbanNo: "",
       pageNo: 1,
       pageSize: 10,
-      startTime: '',
-      endTime: '',
+      startTime: "",
+      endTime: "",
       status: -1,
-      regionId: '',
-      ownerErbanNo: '',
-      guildId: ''
-    })
+      regionId: "",
+      ownerErbanNo: "",
+      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.endTime = dataTime.value
+        formData.startTime = 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: '导出成功',
-            type: 'success',
+            message: "导出成功",
+            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: '',
-        erbanNo: '',
+        partitionId: "",
+        erbanNo: "",
         pageNo: 1,
         pageSize: 10,
-        startTime: '',
-        endTime: '',
+        startTime: "",
+        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 {

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/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
-        : "-";
-      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+        : obj.account_no? obj.account_no : "-";
+      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/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,26 @@ 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: "头饰样式",
+              align: "center",
+              width: "5%",
+              formatter: function (val, row, index) {
+                if (val) {
+                  return (
+                    "<img style='max-width: 50px;max-height: 50px' src='" +
+                    val +
+                    "'>"
+                  );
+                } else {
+                  return "-";
+                }
+              },
+            },
             {
               field: 'partitionFlag',
               title: '地区',
@@ -623,6 +676,9 @@ export default {
                 if ((val & 16) != 0) {
                   value += '英语2区<br>';
                 }
+                if ((val & 32) != 0) {
+                  value += '独联体<br>';
+                }
                 return value;
               }
             },
@@ -641,27 +697,9 @@ export default {
                 }
               }
             },
-            {
-              field: 'radishSale',
-              title: '萝卜购买',
-              align: 'center',
-              width: '5%',
-              formatter: function (val, row, index) {
-                if (val == true) {
-                  return "是";
-                } else if (val == false) {
-                  return "否";
-                } else {
-                  return "-";
-                }
-              }
-            },
             { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
             { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
             { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
-            { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
-            { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
-            { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
             { field: 'days', title: '有效期', align: 'center', width: '5%' },
             { field: 'seq', title: '排序', align: 'center', width: '5%' },
             {
@@ -867,6 +905,9 @@ export default {
           $("#headwearEnName").val("");
           $("#headwearTrName").val("");
           $("#headwearPtName").val("");
+          $("#headwearRuName").val("");
+          $("#headwearEsName").val("");
+          $("#headwearUzName").val("");
           $("#price").val("");
           $("#renewPrice").val("");
           $("#originalPrice").val("");
@@ -914,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();
@@ -1053,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);
@@ -1197,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/luckGift/luckGiftData.vue

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

src/views/luckGift/luckGiftFollowUserData.vue

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

src/views/luckGift/luckGiftSet.vue

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

src/views/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;
@@ -528,7 +618,8 @@ export default {
         console.log(this.controlsObj.value);
         console.log(this.controlsObj.options);
         this.controlsObj.value.forEach((res, i) => {
-          partitionFlagVal |= this.controlsObj.options[i].id;
+          // partitionFlagVal |= this.controlsObj.options[i].id;
+          partitionFlagVal += res;
         });
         obj.partitionFlag = partitionFlagVal;
         obj.name = JSON.stringify({
@@ -537,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({
@@ -545,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;
@@ -576,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,
@@ -583,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;
@@ -653,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) {
@@ -670,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,14 +818,20 @@ 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");
+                // $('#nameplateType1').attr("disabled", "true");
                 if (!json.isCustomWord) {
                   $('input[name="isCustomWord"]').get(0).checked = true;
                   $('#fixedWord-div').addClass("hidden");
@@ -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 == "")) {
-            let jsonFixedWord = { 'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord, 'tr': trFixedWord };
+            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 }
+          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/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/ChargeRecordView.vue

@@ -13,7 +13,9 @@
           <input type="hidden" name="status" id="exportStatus" />
           <input type="hidden" name="newUser" id="exportNewUser" />
           <input type="hidden" name="appChannel" id="exportAppChannel" />
-          <input type="hidden" name="appChannel" id="exportRegionId" />
+          <input type="hidden" name="regionId" id="exportRegionId" />
+          <input type="hidden" name="chargeRecordId" id="exportChargeRecordId" />
+          <input type="hidden" name="pingxxChargeId" id="exportPingxxChargeId" />
         </form>
         <section class="content">
           <div id="toolbar">
@@ -56,6 +58,14 @@
                 <label for="regionId">国家：</label>
                 <select name="regionId" id="regionId" class="form-control"></select>
               </div>
+              <div class="form-group">
+                <label for="qErbanNo">商户订单号：</label>
+                <input type="text" class="form-control" name="chargeRecordId" id="chargeRecordId" />
+              </div>
+              <div class="form-group">
+                <label for="qErbanNo">第三方订单号：</label>
+                <input type="text" class="form-control" name="pingxxChargeId" id="pingxxChargeId" />
+              </div>
             </form>
             <div id="mapObjHtml"></div>
             <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
@@ -166,6 +176,12 @@ export default {
             align: "center",
             width: "5%",
           },
+           {
+            field: "updateTime",
+            title: "更新时间",
+            align: "center",
+            width: "5%",
+          },
         ],
         undefinedText: "-",
         cache: false,
@@ -191,6 +207,9 @@ export default {
             newUser: $("#qNewUser").val(),
             appChannel: $("#qAppChannel").val(),
             regionId: $("#regionId").val(),
+            pingxxChargeId: $("#pingxxChargeId").val(),
+            chargeRecordId: $("#chargeRecordId").val(),
+            
           };
           return param;
         },
@@ -256,6 +275,8 @@ export default {
           newUser: $("#qNewUser").val(),
           appChannel: $("#qAppChannel").val(),
           regionId: $("#regionId").val(),
+          chargeRecordId: $("#chargeRecordId").val(),
+          pingxxChargeId: $("#pingxxChargeId").val(),
         };
 
         // 手动加载数据
@@ -338,6 +359,8 @@ export default {
         $("#exportNewUser").val($("#qNewUser").val());
         $("#exportAppChannel").val($("#qAppChannel").val());
         $("#exportRegionId").val($("#regionId").val());
+        $("#exportPingxxChargeId").val($("#pingxxChargeId").val());
+        $("#exportChargeRecordId").val($("#chargeRecordId").val());
         form.submit();
       });
     },

src/views/record/OfficicalGoldView.vue

@@ -25,12 +25,18 @@
                 <label for="type"
                        class="col-sm-2 control-label">备注:</label>
                 <div class="col-sm-10">
-                  <input type="text"
+                  <!-- <input type="text"
                          name="remark"
                          id="remark"
                          class="form-control"
                          maxlength="100"
-                         placeholder="非必填">
+                         placeholder="非必填"> -->
+                           <textarea class="form-control"
+                            name="remark"
+                            id="remark"
+                            style="height:80px;"
+                            placeholder="非必填"
+                            ></textarea>
                 </div>
               </div>
               <div class="form-group">
@@ -302,25 +308,21 @@ export default {
             'ernos': erBanNos,
             'type': type,
             'num': num,
-            'actualAmount': actualAmount,
             'remark': remark,
             'busType': busType
           };
-          if (type == 'CLEAR_USER_GOLD') {
-            clearUserGold(data);
-          } else {
-            give(data);
-          }
+          operate(data);
         });
 
-        function give (data) {
+        function operate (data) {
           isGiveBol = true;
           if (confirm('确认吗？')) {
             $("#tipMsg").text("处理中，请稍后...");
             $("#tipModal").modal('show');
+            
             $.ajax({
               type: "post",
-              url: "/admin/goldcoin/give",
+              url: "/admin/goldcoin/operate",
               data: data,
               dataType: "json",
               success: function (json) {
@@ -382,32 +384,7 @@ export default {
           }
         }
 
-        function clearUserGold (data) {
-          isGiveBol = true;
-          if (confirm('确认吗？')) {
-            $("#tipMsg").text("处理中，请稍后...");
-            $("#tipModal").modal('show');
-            $.ajax({
-              type: "post",
-              url: "/admin/goldcoin/clearUserGold",
-              data: { erBanNos: data.ernos, num: data.num },
-              dataType: "json",
-              success: function (json) {
-                if (json.code == 200) {
-                  $("#tipMsg").text("处理成功");
-                  $('#btnScan').click();
-                } else {
-                  $("#tipMsg").text("处理出错，errorCode: " + json.message);
-                }
-                isGiveBol = false;
-              },
-              error: function (json) {
-                $("#tipMsg").text("处理出错，网络出错");
-                isGiveBol = false;
-              }
-            });
-          }
-        }
+
 
         function trimTextArea (str) {
           return str.split('\n').map((line) => line.trim())
@@ -441,7 +418,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: '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,

src/views/resource/GamePlayView.vue

@@ -13,6 +13,18 @@
                    :value="item.id">
         </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"
+                   style="width: 70%"
+                   placeholder="请选择">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="百顺" value="BAISHUN"></el-option>
+          <el-option label="灵仙" value="LEADERCC"></el-option>
+          <el-option label="Joy" value="JOYPLAY"></el-option>
+      </el-select>
     </div>
     <!-- 按钮 -->
     <div class="buttonBox">
@@ -60,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="地区">
@@ -135,6 +162,11 @@
                        prop="HIGH_RECHARGE_USER"
                        label="可见用户"
                        :formatter="ruleJsonFormatter" />
+                       <el-table-column align="center"
+                       prop="panelType"
+                       label="游戏第三方" >
+                       <template v-slot="scope">{{ scope.row.code=='BAISHUN'?'百顺':scope.row.code=='LEADERCC'?'灵仙':'Joy'}}</template>
+                       </el-table-column>
       <el-table-column align="center"
                        label="操作"
                        width="200">
@@ -214,6 +246,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"
@@ -445,11 +504,15 @@ export default {
         seriesNameAr: '',
         seriesNameTr: '',
         seriesNamePt: '',
+        seriesNameRu: '',
+        seriesNameEs: '',
+        seriesNameUz: '',
       },
       imageUrl: '',
       partitionInfos: [],
       searchValues: {
         partitionId: null,
+        code:''
       },
     };
   },
@@ -528,6 +591,7 @@ export default {
         partitionId: this.searchValues.partitionId,
         page: this.currentPage,
         pageSize: this.pageSize,
+        code: this.searchValues.code,
       }).then(res => {
         let data = res.data;
         this.totals = data.total;
@@ -571,6 +635,9 @@ export default {
       this.resource.seriesNameAr = '';
       this.resource.seriesNameTr = '';
       this.resource.seriesNamePt = '';
+      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] = '';
@@ -596,6 +663,9 @@ export default {
         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++) {
@@ -635,6 +705,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,

src/views/resource/SplashView.vue

@@ -36,7 +36,46 @@
     <!-- 表格 -->
     <el-table :data="tableData" border style="width: 100%; margin-top: 25px">
       <el-table-column align="center" prop="id" label="资源位ID" />
-      <el-table-column align="center" prop="name" label="活动名称" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-华语区">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'zh') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-英语区">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'en') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-阿语区">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'ar') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       label="活动名称-土耳其区">
+        <template v-slot="scope">{{ getJsonField(scope.row.name, 'tr') }}</template>
+      </el-table-column>
+      <el-table-column prop="name"
+                       align="center"
+                       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>
@@ -147,20 +186,7 @@
     />
     <!-- 编辑弹窗 -->
     <el-dialog v-model="editDialog" title="开屏配置" width="50%" center>
-      <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.name"
-          style="width: 75%"
-          class="input"
-          placeholder="请输入活动名称"
-        ></el-input>
-      </div>
-      <div style="margin-bottom: 25px; margin-top: 70px">
+      <div style="margin-bottom: 25px;">
         <span
           style="display: inline-block; margin-right: 20px"
           class="col-sm-2 control-label"
@@ -179,6 +205,70 @@
           ></el-option>
         </el-select>
       </div>
+      <!-- 活动名称-华语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-华语</span>
+        <el-input v-model="resource.nickZh"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+       <!-- 活动名称-英语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-英语</span>
+        <el-input v-model="resource.nickEn"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+      <!-- 活动名称-阿语 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-阿语</span>
+        <el-input v-model="resource.nickAr"
+                  placeholder=""
+                  class="input"></el-input>
+      </div>
+       <!-- 活动名称-土耳其 -->
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">活动名称-土耳其</span>
+        <el-input v-model="resource.nickTr"
+                  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.nickPt"
+                  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"
@@ -419,6 +509,14 @@ export default {
         seqNo: 0,
         ruleValue: {},
         partitionId: null,
+        nickZh: "",
+        nickEn: "",
+        nickAr: "",
+        nickTr: "",
+        nickPt: "",
+        nickRu: "",
+        nickEs: "",
+        nickUz: "",
       },
       imageUrl: "",
       partitionInfos: [],
@@ -521,6 +619,16 @@ export default {
       this.resource.endTime = null;
       this.resource.seqNo = 0;
       this.resource.ruleValue = {};
+
+      this.resource.nickZh = "";
+      this.resource.nickEn = "";
+      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];
         this.resource.ruleValue[rule.ruleCode] = "";
@@ -538,6 +646,16 @@ export default {
       this.resource.startTime = row.startTime;
       this.resource.endTime = row.endTime;
       this.resource.seqNo = row.seqNo;
+
+      this.resource.nickZh = JSON.parse(row.name).zh;
+      this.resource.nickEn = JSON.parse(row.name).en;
+      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++) {
         let ruleCode = this.rules[i].ruleCode;
@@ -577,9 +695,19 @@ export default {
       if (now >= new Date(startTime) && now <= new Date(endTime)) {
         isEnabled = 1;
       }
+      let resourceName = JSON.stringify({
+          zh: this.resource.nickZh,
+          en: this.resource.nickEn,
+          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,
-        name: this.resource.name,
+        name: resourceName,
         icon: this.resource.icon,
         type: 2,
         skipType: this.resource.skipType,
@@ -623,6 +751,17 @@ export default {
       }
       return partitions[0].desc;
     },
+    // 解析json字段
+    getJsonField (jsonStr, field) {
+      try {
+        if (!jsonStr) return '';
+        const obj = JSON.parse(jsonStr);
+        return obj?.[field] || '';
+      } catch (e) {
+        console.error('JSON 解析失败:', jsonStr);
+        return '';
+      }
+    },
   },
 };
 </script>

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/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: '头饰图片',

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: '铭牌图片',

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

src/views/system/RechargeAgentDropshipping.vue

@@ -163,6 +163,7 @@ const getData = () => {
 // 详情
 const detailPageFun = (row) => {
   detailStatTable.value = JSON.parse(row.detailStat);
+  dateCycleArr.value.sort((a, b) => b.receiveTotalGuildUsd - a.receiveTotalGuildUsd);
   detailStatDialog.value = true;
 };
     // 重置

src/views/users/ChargeRecordArPartitionStatisticsView.vue

@@ -25,25 +25,123 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column prop="date" align="center" label="日期" />
-      <el-table-column prop="v5payUsd" align="center" label="
-    V5play充值美元" />
-      <el-table-column prop="googleUsd" align="center" label="google充值美元" />
-      <el-table-column prop="razerUsd" align="center" label="razer充值" />
+      <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充值美元"
-      />
-      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元" />
+      >
+        <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充值美元"
-      />
-      <el-table-column prop="iosUsd" align="center" label="ios充值美元" />
-      <el-table-column prop="companyUsd" align="center" label="对公打款美元" />
-      <el-table-column prop="totalUsd" align="center" label="总充值美元" />
+      >
+        <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>
 
@@ -56,20 +154,29 @@ export default {
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/system-helper";
-import {getChargeRecordPartitionDetail,exportPartitionDetail} from '@/api/users/ChargeRecordPartitionStatisticsView.js'
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
 import { formatDate } from "@/utils/relDate";
 
 const dataTime = ref([]);
 const formData = reactive({
   beginDate: "",
   endDate: "",
-  partitionId:2
+  partitionId: 2,
 });
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
 // 查询
 const getData = () => {
   tableData.loading = true;
@@ -81,37 +188,37 @@ const getData = () => {
     formData.endDate = dataTime.value;
   }
   getChargeRecordPartitionDetail(formData).then((res) => {
-      tableData.data = res;
-      tableData.loading = false;
+    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",
-        });
-      }
-    };
+// 导出
+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 = () => {
@@ -121,10 +228,30 @@ const setDefaultDateRange = () => {
 
   dataTime.value = [
     dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
-    dateFormat(today, "yyyy-MM-dd")
+    dateFormat(today, "yyyy-MM-dd"),
   ];
 };
-
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 2,
+  }).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();

src/views/users/ChargeRecordEn2PartitionStatisticsView.vue

@@ -25,25 +25,123 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column prop="date" align="center" label="日期" />
-      <el-table-column prop="v5payUsd" align="center" label="
-    V5play充值美元" />
-      <el-table-column prop="googleUsd" align="center" label="google充值美元" />
-      <el-table-column prop="razerUsd" align="center" label="razer充值" />
+      <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充值美元"
-      />
-      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元" />
+      >
+        <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充值美元"
-      />
-      <el-table-column prop="iosUsd" align="center" label="ios充值美元" />
-      <el-table-column prop="companyUsd" align="center" label="对公打款美元" />
-      <el-table-column prop="totalUsd" align="center" label="总充值美元" />
+      >
+        <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>
 
@@ -56,20 +154,29 @@ export default {
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/system-helper";
-import {getChargeRecordPartitionDetail,exportPartitionDetail} from '@/api/users/ChargeRecordPartitionStatisticsView.js'
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
 import { formatDate } from "@/utils/relDate";
 
 const dataTime = ref([]);
 const formData = reactive({
   beginDate: "",
   endDate: "",
-  partitionId:16
+  partitionId: 16,
 });
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
 // 查询
 const getData = () => {
   tableData.loading = true;
@@ -81,37 +188,37 @@ const getData = () => {
     formData.endDate = dataTime.value;
   }
   getChargeRecordPartitionDetail(formData).then((res) => {
-      tableData.data = res;
-      tableData.loading = false;
+    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",
-        });
-      }
-    };
+// 导出
+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 = () => {
@@ -121,10 +228,30 @@ const setDefaultDateRange = () => {
 
   dataTime.value = [
     dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
-    dateFormat(today, "yyyy-MM-dd")
+    dateFormat(today, "yyyy-MM-dd"),
   ];
 };
-
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 16,
+  }).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();

src/views/users/ChargeRecordEnPartitionStatisticsView.vue

@@ -25,25 +25,123 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column prop="date" align="center" label="日期" />
-      <el-table-column prop="v5payUsd" align="center" label="
-    V5play充值美元" />
-      <el-table-column prop="googleUsd" align="center" label="google充值美元" />
-      <el-table-column prop="razerUsd" align="center" label="razer充值" />
+      <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充值美元"
-      />
-      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元" />
+      >
+        <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充值美元"
-      />
-      <el-table-column prop="iosUsd" align="center" label="ios充值美元" />
-      <el-table-column prop="companyUsd" align="center" label="对公打款美元" />
-      <el-table-column prop="totalUsd" align="center" label="总充值美元" />
+      >
+        <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>
 
@@ -56,20 +154,29 @@ export default {
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/system-helper";
-import {getChargeRecordPartitionDetail,exportPartitionDetail} from '@/api/users/ChargeRecordPartitionStatisticsView.js'
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
 import { formatDate } from "@/utils/relDate";
 
 const dataTime = ref([]);
 const formData = reactive({
   beginDate: "",
   endDate: "",
-  partitionId:1
+  partitionId: 1,
 });
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
 // 查询
 const getData = () => {
   tableData.loading = true;
@@ -81,37 +188,37 @@ const getData = () => {
     formData.endDate = dataTime.value;
   }
   getChargeRecordPartitionDetail(formData).then((res) => {
-      tableData.data = res;
-      tableData.loading = false;
+    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",
-        });
-      }
-    };
+// 导出
+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 = () => {
@@ -121,10 +228,30 @@ const setDefaultDateRange = () => {
 
   dataTime.value = [
     dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
-    dateFormat(today, "yyyy-MM-dd")
+    dateFormat(today, "yyyy-MM-dd"),
   ];
 };
-
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 1,
+  }).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();

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/ChargeRecordTrPartitionStatisticsView.vue

@@ -25,25 +25,123 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column prop="date" align="center" label="日期" />
-      <el-table-column prop="v5payUsd" align="center" label="
-    V5play充值美元" />
-      <el-table-column prop="googleUsd" align="center" label="google充值美元" />
-      <el-table-column prop="razerUsd" align="center" label="razer充值" />
+      <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充值美元"
-      />
-      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元" />
+      >
+        <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充值美元"
-      />
-      <el-table-column prop="iosUsd" align="center" label="ios充值美元" />
-      <el-table-column prop="companyUsd" align="center" label="对公打款美元" />
-      <el-table-column prop="totalUsd" align="center" label="总充值美元" />
+      >
+        <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>
 
@@ -56,20 +154,29 @@ export default {
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/system-helper";
-import {getChargeRecordPartitionDetail,exportPartitionDetail} from '@/api/users/ChargeRecordPartitionStatisticsView.js'
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
 import { formatDate } from "@/utils/relDate";
 
 const dataTime = ref([]);
 const formData = reactive({
   beginDate: "",
   endDate: "",
-  partitionId:8
+  partitionId: 8,
 });
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
 // 查询
 const getData = () => {
   tableData.loading = true;
@@ -81,37 +188,37 @@ const getData = () => {
     formData.endDate = dataTime.value;
   }
   getChargeRecordPartitionDetail(formData).then((res) => {
-      tableData.data = res;
-      tableData.loading = false;
+    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",
-        });
-      }
-    };
+// 导出
+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 = () => {
@@ -121,10 +228,30 @@ const setDefaultDateRange = () => {
 
   dataTime.value = [
     dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
-    dateFormat(today, "yyyy-MM-dd")
+    dateFormat(today, "yyyy-MM-dd"),
   ];
 };
-
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 8,
+  }).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();

src/views/users/ChargeRecordZhPartitionStatisticsView.vue

@@ -25,25 +25,123 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column prop="date" align="center" label="日期" />
-      <el-table-column prop="v5payUsd" align="center" label="
-    V5play充值美元" />
-      <el-table-column prop="googleUsd" align="center" label="google充值美元" />
-      <el-table-column prop="razerUsd" align="center" label="razer充值" />
+      <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充值美元"
-      />
-      <el-table-column prop="myCardUsd" align="center" label="myCard充值美元" />
+      >
+        <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充值美元"
-      />
-      <el-table-column prop="iosUsd" align="center" label="ios充值美元" />
-      <el-table-column prop="companyUsd" align="center" label="对公打款美元" />
-      <el-table-column prop="totalUsd" align="center" label="总充值美元" />
+      >
+        <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>
 
@@ -56,20 +154,29 @@ export default {
 import { ref, onMounted, reactive, computed } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { dateFormat } from "@/utils/system-helper";
-import {getChargeRecordPartitionDetail,exportPartitionDetail} from '@/api/users/ChargeRecordPartitionStatisticsView.js'
+import {
+  getChargeRecordPartitionDetail,
+  exportPartitionDetail,
+  getChargeRecordPartitionRegionDetail,
+} from "@/api/users/ChargeRecordPartitionStatisticsView.js";
 import { formatDate } from "@/utils/relDate";
 
 const dataTime = ref([]);
 const formData = reactive({
   beginDate: "",
   endDate: "",
-  partitionId:4
+  partitionId: 4,
 });
 const tableData = reactive({
   data: [],
   total: 0,
   loading: false,
 });
+const detailDialog = ref(false);
+const detailData = reactive({
+    data: [],
+  loading: false,
+});
 // 查询
 const getData = () => {
   tableData.loading = true;
@@ -81,37 +188,37 @@ const getData = () => {
     formData.endDate = dataTime.value;
   }
   getChargeRecordPartitionDetail(formData).then((res) => {
-      tableData.data = res;
-      tableData.loading = false;
+    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",
-        });
-      }
-    };
+// 导出
+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 = () => {
@@ -121,10 +228,30 @@ const setDefaultDateRange = () => {
 
   dataTime.value = [
     dateFormat(sevenDaysAgo, "yyyy-MM-dd"),
-    dateFormat(today, "yyyy-MM-dd")
+    dateFormat(today, "yyyy-MM-dd"),
   ];
 };
-
+// 国家明细
+const detailDialogFun = (beginDate, channel) => {
+  detailData.loading = true;
+  getChargeRecordPartitionRegionDetail({
+    beginDate,
+    channel,
+    partitionId: 4,
+  }).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();

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;
                             }
                         },
@@ -728,7 +753,7 @@ export default {
                                 }
                             }
                         },
-                        { field: 'goldPtice', title: '礼物价格', align: 'center', width: '10%' },
+                        { field: 'goldPrice', title: '礼物价格', align: 'center', width: '10%' },
                         {
                             field: 'consumeType',
                             title: '消费类型',
@@ -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;
               },
             },
@@ -591,8 +594,7 @@ export default {
         $("#addSave").on("click", function () {
           if ($("#addMsgForm").validationEngine("validate")) {
             if (
-              $("#msgType").val() == 100 &&
-              ($("#skipUrlContent").val() == undefined ||
+              $("#msgType").val() == 100 && $("#skip").val() != '' && ($("#skipUrlContent").val() == undefined ||
                 $("#skipUrlContent").val().length <= 0)
             ) {
               alert("未填写跳转链接");

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/UserCheckAdminView.vue

@@ -265,7 +265,7 @@
               </div>
             </div>
 
-            <div class="form-group">
+            <!-- <div class="form-group">
               <label for="editDefUser"
                      class="col-sm-3 control-label">财富等级:</label>
               <div class="col-sm-8" style="display: flex;align-items: center;">
@@ -285,7 +285,7 @@
                         type="button"
                         id="modifyCharmLevelBtn">修改</button>
               </div>
-            </div>
+            </div> -->
 
             <div class="form-group">
               <label for="alipayAccountName"

src/views/users/UserInformationCustomer.vue

@@ -0,0 +1,218 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>用户ID:</span>
+      <el-input v-model="formData.erbanNo" placeholder="" class="input" />
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <!-- 表格数据 -->
+    <el-table
+      v-loading="tableData.loading"
+      :data="tableData.data"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="erbanNo" align="center" label="财富等级" >
+        <template #default="scope">
+            {{ scope.row.userLevelVo?.experLevelName + '(' + scope.row.userLevelVo?.experAmount + ')'}}
+        </template>
+        </el-table-column>
+      <el-table-column prop="nick" align="center" label="魅力等级" >
+        <template #default="scope">
+            {{ scope.row.userLevelVo?.charmLevelName + '(' + scope.row.userLevelVo?.charmAmount + ')'}}
+        </template>
+        </el-table-column>
+      <el-table-column  align="center" label="操作" >
+        <template #default="scope">
+          <el-button class="primary"
+                     type="primary"
+                     @click="detailPageFun(scope.row)"
+                     size="default"
+                     >编辑</el-button>
+        </template>
+        </el-table-column>  
+    </el-table>
+     <!-- 弹窗 -->
+    <el-dialog v-model="remarkDialog" title="编辑" width="25%" center destroy-on-close>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex;align-items: center;">
+        <span
+          style="display: inline-block;"
+          class="col-sm-3 control-label"
+          >财富等级:</span
+        >
+        {{experLevelName}}
+        <el-button class="primary"
+                     type="primary"
+                     size="default"
+                     style="margin-left: 30px;"
+                     @click="changePageFun(2)"
+                     >编辑</el-button>
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex;align-items: center;">
+        <span
+          style="display: inline-block;"
+          class="col-sm-3 control-label"
+          >魅力等级:</span
+        >
+        {{charmLevelName}}
+        <el-button class="primary"
+                     type="primary"
+                     size="default"
+                     style="margin-left: 30px;"
+                     @click="changePageFun(1)"
+                     >编辑</el-button>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="remarkDialog = false">取消</el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 填写弹窗 -->
+    <el-dialog v-model="changeDialog" :title="typeChange == 2?'财富等级修改':'魅力等级修改'" width="25%" center destroy-on-close>
+        <div style="margin-bottom: 25px; margin-top: 10px; display: flex;align-items: center;">
+        <span
+          style="display: inline-block;"
+          class="col-sm-3 control-label"
+          >当前等级:</span
+        >
+        {{typeChange == 2?experLevelName:charmLevelName}}
+      </div>
+      <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-3 control-label"
+          >更改等级</span
+        >
+        <el-input
+        v-model="newLevelSeq"
+          placeholder="请输入"
+          class="input"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="changeDialog = false">取消</el-button>
+          <el-button type="primary" @click="confirmChangeFun()">
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "UserInformationCustomer",
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { getUserCheckAdmin,changeUserExpChange} from "@/api/users/UserInformationCustomer.js"
+
+const formData = reactive({
+  erbanNo: "",
+});
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+    const remarkDialog = ref(false);
+    const charmLevelName = ref('');
+    const experLevelName = ref('');
+    const typeChange = ref(0);
+    const changeDialog = ref(false);
+    const newLevelSeq = ref('');
+    const uid = ref('');
+    
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  tableData.data = [];
+  getUserCheckAdmin(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data.push(res.data);
+      tableData.total = res.data.total;
+      tableData.loading = false;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+const detailPageFun = (row) => { 
+    experLevelName.value =row.userLevelVo.experLevelName + '(' +row.userLevelVo.experAmount + ')';
+    charmLevelName.value =row.userLevelVo.charmLevelName + '(' +row.userLevelVo.charmAmount + ')';
+    remarkDialog.value =true;
+    uid.value =row.uid;
+};
+const changePageFun = (val) => { 
+    typeChange.value = val;
+    changeDialog.value =true;
+};
+const confirmChangeFun = () => { 
+    changeUserExpChange({
+        uid:uid.value,type:typeChange.value,newLevelSeq:newLevelSeq.value
+    }).then((res) => {
+    if (res.code == 200) {
+        ElMessage({
+            message: "修改成功",
+            type: "success",
+          });
+          changeDialog.value =false;
+          remarkDialog.value =false;
+          newLevelSeq.value = '';
+          tableData.data = [];
+          getData();
+    } 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;
+}
+</style>

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) {

src/views/vip/VipGiveCustomer.vue

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