礼物管理土耳其编辑

src/api/nobleman/nobleman.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request';
 import { genQueryParam } from '@/utils/maintainer';
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 邀请移除记录
 export const pageOperateRecord = query => {
     return request({

src/api/noblemanNew/noblemanNew.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request';
 import { genQueryParam } from '@/utils/maintainer';
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 邀请移除记录
 export const pageOperateRecord = query => {
     return request({

src/api/personalHomepageResourceManagement/personalHomepageResourceManagement.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 地区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理列表
+export const pesonalBackgroundListByPage = query => {
+    return request({
+        url: '/admin/pesonalBackground/listByPage',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理赠送
+export const pesonalBackgroundListSend = query => {
+    return request({
+        url: '/admin/pesonalBackground/send',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理保存
+export const pesonalBackgroundSaveOrUpdate = query => {
+    return request({
+        url: '/admin/pesonalBackground/saveOrUpdate',
+        method: 'post',
+        params: query
+    });
+};
+// 个人主页记录管理&个人赠送记录
+export const pesonalBackgroundListRecordByPage = query => {
+    return request({
+        url: '/admin/pesonalBackground/listRecordByPage',
+        method: 'get',
+        params: query
+    });
+};
+// 个人赠送记录撤回
+export const pesonalBackgroundListRecordRecoveryPersonalBackground = query => {
+    return request({
+        url: '/admin/pesonalBackground/recoveryPersonalBackground',
+        method: 'get',
+        params: query
+    });
+};

src/api/refund/refund.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+// 活动配置 相关接口（一级菜单：活动配置）
+
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 国家
+export const regionInfoList = query => {
+    return request({
+        url: '/admin/regionInfo/list',
+        method: 'get',
+        params: query
+    });
+};
+// 列表
+export const refundList = query => {
+    return request({
+        url: '/admin/chargeRecord/refundList',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const refundExport = query => {
+    window.location.href = `/admin/chargeRecord/refundExport?${genQueryParam(query)}`;
+    return;
+};

src/api/relAgency/relAgency.js

@@ -4,6 +4,15 @@ import qs from 'qs';
 import { genQueryParam } from '@/utils/maintainer';
 // 活动配置 相关接口（一级菜单：活动配置）
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 获取 周期列表
 export const getDateCycleList = query => { 
     return request({

src/main.js

@@ -60,6 +60,17 @@ const app = createApp(App)
 app.config.globalProperties.$copy = function (text) {
     copy(text, this);
 };
-
+// 全局错误处理
+window.onerror = function (message, source, lineno, colno, error) {
+    console.log(error)
+    // 判断是否是 'insertBefore' 错误
+    if (error instanceof TypeError && message.includes('insertBefore')) {
+        console.error('捕获到 TypeError 错误:', error);
+        window.location.reload();
+        // 你可以在这里处理错误，比如记录日志或执行其他操作
+        return true;  // 阻止浏览器默认的错误处理
+    }
+    return false;  // 默认处理其他类型的错误
+};
 app.config.warnHandler = () => null;
 app.use(store).use(router).use(components).use(VueClipboard).mount('#app')

src/utils/partitionDesc.js

@@ -0,0 +1,20 @@
+const partitionInfoMap = {
+    1: '英语区',
+    2: '阿拉伯语区',
+    4: '华语区',
+    8: '土耳其区',
+}
+
+export const partitionDesc = (val) => {
+    return Object.keys(partitionInfoMap).filter(k=>{
+        return(Number(val) & Number(k)) != 0 
+    }).map(k=>partitionInfoMap[k]).join(",");
+}
+
+export const partitionIdArr = (val) => {
+    var arr =[];
+     Object.keys(partitionInfoMap).filter(k=>{
+        return(Number(val) & Number(k)) != 0 
+    }).map(k=>arr.push(Number(k)));
+    return arr
+}

src/utils/request.js

@@ -5,7 +5,7 @@ import global from "@/constants/global";
 const service = axios.create();
 import { ElMessage } from 'element-plus'
 service.interceptors.request.use(config => {
-    console.log('config', config);
+    // console.log('config', config);
     return config;
 }, error => {
     Promise.reject(error);
@@ -13,7 +13,7 @@ service.interceptors.request.use(config => {
 
 service.interceptors.response.use(res => {
     userLogout(res.headers[global.NEED_LOGOUT.toLowerCase()]);
-    console.log('res.data', res);
+    // console.log('res.data', res);
     // if (res.data.code == 200) {
         // ElMessage({
         //     message: "成功",

src/views/GiftPanelManagement/GiftPanelManagement.vue

@@ -121,6 +121,7 @@ export default {
           { desc: "英语区", id: 1 },
           { desc: "阿拉伯区", id: 2 },
           { desc: "华语区", id: 4 },
+          { desc: "土耳其区", id: 8 },
         ],
       },
       // 表格
@@ -206,6 +207,9 @@ export default {
       } else if (val == 4) {
         this.eidDialogTitle = `编辑礼物面板信息-华语区`;
         this.eidText = `华语区`;
+      }else if (val == 8) {
+        this.eidDialogTitle = `编辑礼物面板信息-土耳其区`;
+        this.eidText = `土耳其区`;
       }
       this.getData();
     },

src/views/car/CarGoodsAdminView.vue

@@ -70,6 +70,7 @@
                                 <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
                                 <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                                <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -101,6 +102,12 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="en_name">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="tr_name" class="col-sm-3 control-label">土耳其驾名称</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control validate[required]" name="name" id="tr_name">
+                            </div>
+                        </div>
 
                         <div class="form-group">
                             <label class="col-sm-3 control-label">使用萝卜购买</label>
@@ -438,6 +445,7 @@ export default {
                         {field: 'name.zh', title: '座驾名称', align: 'center', width: '20%'},
                         {field: 'name.ar', title: '阿语座驾名称', align: 'center', width: '20%'},
                         {field: 'name.en', title: '英语座驾名称', align: 'center', width: '20%'},
+                        {field: 'name.tr', title: '土耳其名称', align: 'center', width: '20%'},
                         {
                             field: 'partitionFlag', 
                             title: '地区', 
@@ -454,6 +462,9 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其区<br>';
+                                }
                                 return value;
                             }
                         },
@@ -664,9 +675,11 @@ export default {
                     $('#name').val('');
                     $('#ar_name').val('');
                     $('#en_name').val('');
+                    $('#tr_name').val('');
                     $("#name").attr('readonly', false);
                     $("#ar_name").attr('readonly', false);
                     $("#en_name").attr('readonly', false);
+                    $("#tr_name").attr('readonly', false);
                     // $("#price").attr('readonly', false);
                     // $("#renewPrice").attr('readonly', false);
                     $("#seq").val('');
@@ -865,10 +878,12 @@ export default {
                                     $("#name").val(jsonName.zh);
                                     $("#ar_name").val(jsonName.ar);
                                     $("#en_name").val(jsonName.en);
+                                    $("#tr_name").val(jsonName.tr);
                                 } else {
                                     $("#name").val(name);
                                     $("#ar_name").val(name);
                                     $("#en_name").val(name);
+                                    $("#tr_name").val(name);
                                 }
                                 $("#price").val(json.entity.price);
                                 $("#renewPrice").val(json.entity.renewPrice);
@@ -997,6 +1012,11 @@ export default {
                                 } else {
                                     $("input:checkbox[name='partitionFlag']")[2].checked = false; 
                                 }
+                                if ((partitionFlag & 8) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[3].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[3].checked = false; 
+                                }
 
                                 // 打开编辑弹窗
                                 $("#cardGoodsModal").modal('show');
@@ -1077,8 +1097,10 @@ export default {
                         var ar_name = $("#ar_name").val();
                         // 英语名称
                         var en_name = $("#en_name").val();
+                        // 土耳其名称
+                        var tr_name = $("#tr_name").val();
                         // 国际化字段
-                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name}
                         const nameValue = JSON.stringify(jsonName);
                         // 修改属性值
                         formData.name = nameValue; // 将giftName修改为"newGiftName"

src/views/chatbubble/ChatbubbleManageView.vue

@@ -63,6 +63,7 @@
                                 <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
                                 <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                                <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -94,27 +95,37 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-4 control-label">安卓图片:</label>
+                            <label for="tr_modal_name" class="col-sm-4 control-label">土耳其装扮名称:</label>
                             <div class="col-sm-6">
-                                <img src="" id="addAndroidIconPicUrl" style="height:44px;" alt="">
+                                <input type="text" class="form-control validate[required]" name="name" id="tr_modal_name" placeholder="请输入气泡名称">
-                                <input type="file" id="add_android_UploadIconPic" name="uploadFile"
-                                    accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
-                                <button class="btn btn-success" type="button" name="uploadBtn"
-                                    id="addAndroidIconPicUrl_androidUrl">上传</button>
-                                <input type="hidden" id="androidUrl" name="androidUrl" class="form-control" />
                             </div>
                         </div>
-                        <div class="form-group">
+                        <form class="form-horizontal" id="addForm1">
-                            <label class="col-sm-4 control-label">IOS图片:</label>
+                            <div class="form-group">
-                            <div class="col-sm-6">
+                                <label class="col-sm-4 control-label">安卓图片:</label>
-                                <img src="" id="addIosIconPicUrl" style="height:44px;" alt="">
+                                <div class="col-sm-6">
-                                <input type="file" id="add_ios_UploadIconPic" name="uploadFile"
+                                    <img src="" id="addAndroidIconPicUrl" style="height:44px;" alt="">
-                                    accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
+                                    <input type="file" id="add_android_UploadIconPic" name="uploadFile"
-                                <button class="btn btn-success" type="button" name="uploadBtn"
+                                        accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
-                                    id="addIosIconPicUrl_iosUrl">上传</button>
+                                    <button class="btn btn-success" type="button" name="uploadBtn"
-                                <input type="hidden" id="iosUrl" name="iosUrl" class="form-control" />
+                                        id="addAndroidIconPicUrl_androidUrl">上传</button>
+                                    <input type="hidden" id="androidUrl" name="androidUrl" class="form-control" />
+                                </div>
                             </div>
-                        </div>
+                        </form>
+                        <form class="form-horizontal" id="addForm2">
+                            <div class="form-group" >
+                                <label class="col-sm-4 control-label">IOS图片:</label>
+                                <div class="col-sm-6">
+                                    <img src="" id="addIosIconPicUrl" style="height:44px;" alt="">
+                                    <input type="file" id="add_ios_UploadIconPic" name="uploadFile"
+                                        accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
+                                    <button class="btn btn-success" type="button" name="uploadBtn"
+                                        id="addIosIconPicUrl_iosUrl">上传</button>
+                                    <input type="hidden" id="iosUrl" name="iosUrl" class="form-control" />
+                                </div>
+                            </div>
+                        </form>
                         <div class="form-group">
                             <label for="status" class="col-sm-4 control-label">装扮状态:</label>
                             <div class="col-sm-6">
@@ -216,12 +227,16 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其区<br>';
+                                }
                                 return value;
                             }
                         },
                         {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'},
                         {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'},
                         {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, 
+                        {field: 'name.tr', title: '土耳其扮名称', align: 'middle', width: '5%'}, 
                         {
                             field: 'iosUrl',
                             title: '装扮图片',
@@ -374,12 +389,16 @@ export default {
                         $("#ar_modal_name").val(row.name.ar);
                         // 英语名称
                         $("#en_modal_name").val(row.name.en);
+                        // 土耳其名称
+                        $("#tr_modal_name").val(row.name.tr);
                     } else {
                         $("#modal_name").val(name);
                         // 阿语名称
                         $("#ar_modal_name").val(name);
                         // 英语名称
                         $("#en_modal_name").val(name);
+                        // 土耳其名称
+                        $("#tr_modal_name").val(name);
                     }
                     $('#addAndroidIconPicUrl').attr("src", row.androidUrl);
                     $("#addForm #androidUrl").val(row.androidUrl);
@@ -407,28 +426,39 @@ export default {
                 });
 
 
-                $("[name='uploadBtn']").on('click', function () {
+                $("#addAndroidIconPicUrl_androidUrl").on('click', function () {
-                    let id = $(this).attr('id');
-                    let b = id.split("_");
-                    let imageId = b[0];
-                    let inputId = b[1];
-                    console.log(imageId)
-                    console.log(inputId)
                     var options = {
                         type: 'post',
                         url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
-                                $("#" + inputId).val(json.path);
+                                $("#addAndroidIconPicUrl").val(json.path);
-                                $("#" + imageId).attr("src", json.path);
+                                $("#addAndroidIconPicUrl").attr("src", json.path);
                             } else {
                                 $("#tipMsg").text(json.msg);
                                 $("#tipModal").modal('show');
                             }
                         }
                     };
-                    $("#addForm").ajaxSubmit(options);
+                    $("#addForm1").ajaxSubmit(options);
+                });
+                $("#addIosIconPicUrl_iosUrl").on('click', function () {
+                    var options = {
+                        type: 'post',
+                        url: '/admin/upload/img',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.path) {
+                                $("#addIosIconPicUrl").val(json.path);
+                                $("#addIosIconPicUrl").attr("src", json.path);
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        }
+                    };
+                    $("#addForm2").ajaxSubmit(options);
                 });
 
 
@@ -454,8 +484,10 @@ export default {
                     var ar_name = $("#ar_modal_name").val();
                     // 英语名称
                     var en_name = $("#en_modal_name").val();
+                    // 土耳其名称
+                    var tr_name = $("#tr_modal_name").val();
                     // 国际化字段
-                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name}
                     const nameValue = JSON.stringify(jsonName);
                     // 修改属性值
                     formData.name = nameValue; // 将giftName修改为"newGiftName"
@@ -467,6 +499,8 @@ export default {
                         partitionFlag |= partitionFlagArray[i].value;
                     }
                     formData.partitionFlag = partitionFlag;
+                    formData.androidUrl = $('#addAndroidIconPicUrl').attr('src');
+                    formData.iosUrl = $('#addIosIconPicUrl').attr('src');
                     // 将修改后的对象转换回序列化字符串
                     let newSerializeStr = $.param(formData);
                     //做下数据校验
@@ -528,6 +562,7 @@ export default {
                     $('#modal_name').val('');
                     $('#ar_modal_name').val('');
                     $('#en_modal_name').val('');
+                    $('#tr_modal_name').val('');
                     $('input[name="partitionFlag"]').each(function() {
                         $(this).checked = false;
                     });  

src/views/firstpage/towPageBannerView.vue

@@ -197,6 +197,8 @@
                   class="form-control"
                   name="skipUri"
                   id="skipUrlContent"
+                  onkeydown="return event.key !== ' '"
+                  oninput="this.value = this.value.replace(/\s+/g, '')"
                 />
               </div>
             </div>
@@ -457,9 +459,11 @@
               <div class="col-sm-6">
                 <input
                   type="text"
-                  class="form-control validate[required]"
+                  class="form-control"
                   name="skipUri"
                   id="addSkipUrlContent"
+                  onkeydown="return event.key !== ' '"
+                  oninput="this.value = this.value.replace(/\s+/g, '')"
                 />
               </div>
             </div>
@@ -733,7 +737,6 @@ export default {
         //         }
         //     }
         // }
-
         function initTable() {
           $("#table").bootstrapTable({
             columns: [
@@ -1520,7 +1523,7 @@ export default {
   margin-right: 10px;
   margin-left: 5px;
 }
-.text{
+.text {
   font-size: 20px;
   margin-top: 20px;
   color: rgb(173, 53, 53);

src/views/guildOperationManagement/agencyDiamondFlow.vue

@@ -20,6 +20,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="公会ID" prop="agencyId">
               <el-input
                 v-model.trim="searchForm.agencyId"
@@ -66,6 +77,7 @@
                             {{ regionType(scope.row.region) }}
                         </template>
                     </el-table-column> -->
+          <el-table-column align="center" prop="partitionDesc" label="分区"> </el-table-column>
           <el-table-column align="center" prop="agencyId" label="公会ID">
           </el-table-column>
           <el-table-column align="center" prop="agencyName" label="公会名称">
@@ -81,7 +93,11 @@
           </el-table-column>
           <el-table-column align="center" prop="energyValue" label="总钻石流水">
             <template v-slot="scope">
-              {{ scope.row.energyValue ? scope.row.energyValue.toLocaleString() : "null"}}
+              {{
+                scope.row.energyValue
+                  ? scope.row.energyValue.toLocaleString()
+                  : "null"
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +125,7 @@
 </template>
 
 <script lang=js>
-import { getDateCycleList, getAgencyDiamondFlow, agencyDiamondFlowExport } from '@/api/relAgency/relAgency.js';
+import { getDateCycleList, getAgencyDiamondFlow, agencyDiamondFlowExport,listPartitionInfo } from '@/api/relAgency/relAgency.js';
 import TablePagination from '@/components/common/TablePagination';
 import { formatDate, formatDateYMD } from '@/utils/relDate';
 // @ts-ignore
@@ -125,6 +141,7 @@ export default {
     components: { TablePagination },
     data() {
         return {
+            partitionArr: [],
             dateCycleList: [],
             btnLoading: false, // 导出弹出框(dialog)的确认按钮
             tableLoading: false, // 表格是否加载中
@@ -140,7 +157,8 @@ export default {
                 agencyOwnerId: null,
                 agencyId: null,
                 dateCycle: null,
-                region: null
+                region: null,
+                partitionId: "",
             },
             searchRule: {
                 startTime: [
@@ -173,6 +191,10 @@ export default {
         };
     },
     created() {
+      listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId=this.partitionArr[0].id;
+    });
         this.getDateCycleList();
     },
     methods: {
@@ -272,11 +294,12 @@ export default {
         },
         // 分页导航
         handleSizeChange(val) {
+          console.log(val);
            this.pageParams.pageSize = val;
             this.getData();
         },
         handlePageChange(val) {
-          this.pageParams.pageSize = val;
+          this.pageParams.pageNo = val;
             this.getData();
         },
         headerCopy(column, e) {

src/views/guildOperationManagement/agentSendSalary.vue

@@ -10,6 +10,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="充值代理ID" prop="chargeAgentErbanNo">
               <el-input
                 v-model.trim="searchForm.chargeAgentErbanNo"
@@ -58,6 +69,8 @@
           @header-click="headerCopy"
           style="width: 100%"
         >
+          <el-table-column align="center" prop="partitionDesc" label="分区">
+          </el-table-column>
           <el-table-column
             align="center"
             prop="receiveErbano"
@@ -110,7 +123,11 @@
 </template>
 
 <script>
-import { chargeAgentList, chargeAgentSum } from "@/api/relAgency/relAgency.js";
+import {
+  chargeAgentList,
+  chargeAgentSum,
+  listPartitionInfo,
+} from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
 import { dateFormat } from "@/utils/system-helper";
@@ -138,7 +155,9 @@ export default {
         chargeAgentErbanNo: null,
         startTime: null,
         endTime: null,
+        partitionId: "",
       },
+      partitionArr: [],
       searchRule: {
         startTime: [
           {
@@ -171,6 +190,10 @@ export default {
   },
   created() {
     // this.getData();
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId=this.partitionArr[0].id;
+    });
   },
   methods: {
     getData() {

src/views/guildOperationManagement/anchorSalaryOperate.vue

@@ -10,6 +10,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="主播ID" prop="erbanNo">
               <el-input
                 v-model.trim="searchForm.erbanNo"
@@ -59,6 +70,7 @@
                             {{ dateCycleType(scope.row.dateCycle) }}
                         </template>
                     </el-table-column> -->
+          <el-table-column align="center" prop="partitionDesc" label="分区" />
           <el-table-column align="center" prop="erbano" label="主播ID">
           </el-table-column>
           <el-table-column align="center" prop="nick" label="主播昵称">
@@ -313,6 +325,7 @@ import {
   getDateCycleList,
   getAnchorSalaryBill,
   anchorSalaryBillDetail,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -340,7 +353,9 @@ export default {
         agencyId: null,
         dateCycle: null,
         erbanNo: null,
+        partitionId: null,
       },
+      partitionArr: [],
       searchRule: {
         startTime: [
           {
@@ -384,6 +399,10 @@ export default {
   },
   created() {
     this.getDateCycleList();
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId = this.partitionArr[0].id;
+    });
   },
   methods: {
     getDateCycleList() {
@@ -429,19 +448,19 @@ export default {
           this.dialogTitle = "钻石兑换薪资";
           this.dialogType = 1;
           break;
-        case 2:
+        case 3:
           this.dialogTitle = "薪资转增代理";
           this.dialogType = 2;
           break;
-        case 3:
+        case 4:
           this.dialogTitle = "薪资转增公会长";
           this.dialogType = 3;
           break;
-        case 4:
+        case 5:
           this.dialogTitle = "官方提现";
           this.dialogType = 4;
           break;
-        case 6:
+        case 2:
           this.dialogTitle = "薪资兑换金币";
           this.dialogType = 6;
           break;
@@ -508,7 +527,7 @@ export default {
       this.getData();
     },
     handlePageChange(val) {
-      this.pageParams.pageSize = val;
+      this.pageParams.pageNo = val;
       this.getData();
     },
     // 弹窗分页导航

src/views/guildOperationManagement/diamondFlow.vue

@@ -1,6 +1,23 @@
 <template>
   <div class="box">
     <!-- 查询 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
     <div class="inquire">
       <span>公会ID</span>
       <el-input
@@ -86,6 +103,7 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column type="index" width="100" align="center" label="序号" />
+      <el-table-column prop="partitionDesc" align="center" label="分区" />
       <el-table-column prop="guildId" align="center" label="公会ID" />
       <el-table-column prop="guildName" align="center" label="公会昵称" />
       <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
@@ -110,6 +128,7 @@
 import {
   diamondStatistics,
   diamondStatisticsExport,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -125,6 +144,8 @@ export default {
         guildId: "",
         guildBoosId: "",
         time: [],
+        partitionId: "",
+        partitionArr: [],
       },
       // 表格
       tableData: [],
@@ -138,6 +159,10 @@ export default {
   },
   created() {
     // this.getData();
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
   },
   methods: {
     // 查询接口
@@ -157,6 +182,7 @@ export default {
       diamondStatistics({
         guildId: this.inquire.guildId,
         ownerErbanNo: this.inquire.guildBoosId,
+        partitionId: this.inquire.partitionId,
         startTime: startTime,
         endTime: endTime,
         pageNo: this.currentPage,

src/views/guildOperationManagement/guildInfo.vue

@@ -3,9 +3,28 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input v-model="inquire.userId"
+      <el-input
-                placeholder=""
+        v-model="inquire.userId"
-                class="input"></el-input>
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
     </div>
     <!-- <div class="inquire">
       <span>推荐人</span>
@@ -30,78 +49,72 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="getData()"
-               type="primary"
+      >查询</el-button
-               @click="getData()">查询</el-button>
+    >
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="addDialog = true"
-               type="primary"
+      >添加</el-button
-               @click="addDialog = true">添加</el-button>
+    >
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
-               type="primary"
+      >导出</el-button
-               @click="exportInfoFun()">导出</el-button>
+    >
 
     <!-- 表格 -->
-    <el-table v-loading="loading"
+    <el-table
-              :data="tableData"
+      v-loading="loading"
-              border
+      :data="tableData"
-              style="width: 100%; margin-top: 25px">
+      border
-      <el-table-column prop="id"
+      style="width: 100%; margin-top: 25px"
-                       align="center"
+    >
-                       label="公会ID" />
+      <el-table-column prop="id" align="center" label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo"
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-                       align="center"
+      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-                       label="会长ID" />
+      <el-table-column
-      <el-table-column prop="ownerNick"
+        prop="ownerPartitionName"
-                       align="center"
+        align="center"
-                       label="会长昵称" />
+        label="会长分区"
-      <el-table-column prop="ownerPartitionName"
+      />
-                       align="center"
+      <el-table-column prop="name" align="center" label="公会昵称" />
-                       label="会长分区" />
+      <el-table-column align="center" prop="giftInfo" label="公会头像">
-      <el-table-column prop="name"
-                       align="center"
-                       label="公会昵称" />
-      <el-table-column align="center"
-                       prop="giftInfo"
-                       label="公会头像">
         <template v-slot="scope">
-          <el-image style="width: 100px; height: 100px"
+          <el-image
-                    :src="scope.row.avatar"
+            style="width: 100px; height: 100px"
-                    :zoom-rate="1.1"
+            :src="scope.row.avatar"
-                    :preview-src-list="[scope.row.avatar]"
+            :zoom-rate="1.1"
-                    fit="scale-down"
+            :preview-src-list="[scope.row.avatar]"
-                    preview-teleported="true"
+            fit="scale-down"
-                    hide-on-click-modal="true" />
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
         </template>
       </el-table-column>
-      <el-table-column align="center"
+      <el-table-column align="center" prop="giftInfo" label="公会背景图">
-                       prop="giftInfo"
-                       label="公会背景图">
         <template v-slot="scope">
-          <el-image style="width: 100px; height: 100px"
+          <el-image
-                    :src="scope.row.backgroundUrl"
+            style="width: 100px; height: 100px"
-                    :zoom-rate="1.1"
+            :src="scope.row.backgroundUrl"
-                    :preview-src-list="[scope.row.backgroundUrl]"
+            :zoom-rate="1.1"
-                    fit="scale-down"
+            :preview-src-list="[scope.row.backgroundUrl]"
-                    preview-teleported="true"
+            fit="scale-down"
-                    hide-on-click-modal="true" />
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime"
+      <el-table-column prop="createTime" align="center" label="创建日期" />
-                       align="center"
-                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center"
+      <el-table-column align="center" label="成员数量/上限">
-                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button @click="memberDialogFun(scope.row)"
+          <el-button
-                     type="text"
+            @click="memberDialogFun(scope.row)"
-                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
+            type="text"
+            size="default"
+            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column prop="adminName"
+      <el-table-column prop="adminName" align="center" label="操作人" />
-                       align="center"
-                       label="操作人" />
       <!-- <el-table-column align="center" label="收款账户" width="300">
         <template v-slot="scope">
           <el-button
@@ -140,37 +153,43 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center"
+      <el-table-column align="center" label="操作" width="300">
-                       label="操作"
-                       width="300">
         <template v-slot="scope">
-          <el-button @click="ediClick(scope)"
+          <el-button
-                     class="primary"
+            @click="ediClick(scope)"
-                     type="primary"
+            class="primary"
-                     size="default"
+            type="primary"
-                     :disabled="!scope.row.enable">编辑</el-button>
+            size="default"
-          <el-button @click="
+            :disabled="!scope.row.enable"
+            >编辑</el-button
+          >
+          <el-button
+            @click="
               delDialog = true;
               delDialogData = scope.row;
             "
-                     :class="scope.row.enable ? 'danger' : 'info'"
+            :class="scope.row.enable ? 'danger' : 'info'"
-                     :type="scope.row.enable ? 'danger' : 'info'"
+            :type="scope.row.enable ? 'danger' : 'info'"
-                     size="default"
+            size="default"
-                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
+            :disabled="!scope.row.enable"
+            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog"
+    <el-dialog v-model="addDialog" title="新增" width="28%" center>
-               title="新增"
-               width="28%"
-               center>
       <div style="margin-bottom: 25px">
-        <span style="display: inline-block; margin-right: 20px; width: 100px"
+        <span
-              class="col-sm-2 control-label">会长ID</span>
+          style="display: inline-block; margin-right: 20px; width: 100px"
-        <el-input v-model="resource.id"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >会长ID</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="resource.id"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -199,60 +218,78 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="add()"> 确认 </el-button>
-                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination style="margin-top: 10px"
+    <el-pagination
-                   class="paginationClass"
+      style="margin-top: 10px"
-                   v-model:current-page="currentPage"
+      class="paginationClass"
-                   v-model:page-size="pageSize"
+      v-model:current-page="currentPage"
-                   :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      v-model:page-size="pageSize"
-                   layout="sizes, prev, pager, next"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-                   :total="total"
+      layout="sizes, prev, pager, next"
-                   @size-change="handleSizeChange"
+      :total="total"
-                   @current-change="handleCurrentChange" />
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog"
+    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
-               title="编辑"
-               width="28%"
-               center>
       <!-- 公会ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">公会ID</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.id"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >公会ID</span
-                  class="input"
+        >
-                  disabled></el-input>
+        <el-input
+          v-model="ediObj.id"
+          style="width: 75%"
+          class="input"
+          disabled
+        ></el-input>
       </div>
       <!-- 会长ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">会长ID</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.leaderId"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >会长ID</span
-                  class="input"
+        >
-                  disabled></el-input>
+        <el-input
+          v-model="ediObj.leaderId"
+          style="width: 75%"
+          class="input"
+          disabled
+        ></el-input>
       </div>
       <!-- 会长昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">会长昵称</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.leaderNick"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >会长昵称</span
-                  class="input"
+        >
-                  disabled></el-input>
+        <el-input
+          v-model="ediObj.leaderNick"
+          style="width: 75%"
+          class="input"
+          disabled
+        ></el-input>
       </div>
       <!-- 公会昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">公会昵称</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.guildNick"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >公会昵称</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="ediObj.guildNick"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
@@ -272,116 +309,129 @@
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left"
+        <span class="left" style="margin-right: 20px">公会背景图</span>
-              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload class="avatar-uploader"
+        <el-upload
-                   action="/admin/tencent/cos/upload/file"
+          class="avatar-uploader"
-                   :show-file-list="false"
+          action="/admin/tencent/cos/upload/file"
-                   :on-success="handleAvatarSuccess"
+          :show-file-list="false"
-                   :before-upload="beforeAvatarUpload"
+          :on-success="handleAvatarSuccess"
-                   :on-error="handleAvatarError">
+          :before-upload="beforeAvatarUpload"
-          <img v-if="ediObj.imageUrl1"
+          :on-error="handleAvatarError"
-               :src="ediObj.imageUrl1"
+        >
-               class="avatar" />
+          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
-          <el-icon v-else
+          <el-icon v-else class="avatar-uploader-icon">
-                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">成员数量上限</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.guildNumber"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >成员数量上限</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="ediObj.guildNumber"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="editDialogClick()">
-                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog"
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
-               title="提示"
-               width="30%"
-               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
-                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog v-model="payAccountDialog"
+    <el-dialog
-               :title="payAccountTitle"
+      v-model="payAccountDialog"
-               width="28%"
+      :title="payAccountTitle"
-               center>
+      width="28%"
+      center
+    >
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">Payoneer</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.payoneer"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >Payoneer</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="payAccount.payoneer"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">USDT-ERC20</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.usdt"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >USDT-ERC20</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="payAccount.usdt"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">PayPal</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.payPal"
+          class="col-sm-2 control-label"
-                  style="width: 75%"
+          >PayPal</span
-                  class="input"></el-input>
+        >
+        <el-input
+          v-model="payAccount.payPal"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="payAccountClick()">
-                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog"
+    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
-               :title="memberTitle"
-               width="36%"
-               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input v-model="member.userID"
+        <el-input
-                  placeholder="请输入新增平台id"
+          v-model="member.userID"
-                  class="input"></el-input>
+          placeholder="请输入新增平台id"
-        <el-button type="primary"
+          class="input"
-                   @click="addMemberFun()"> 新增 </el-button>
+        ></el-input>
+        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table v-loading="loading"
+      <el-table
-                :data="member.tableData"
+        v-loading="loading"
-                border
+        :data="member.tableData"
-                style="width: 100%; margin-top: 25px">
+        border
-        <el-table-column align="center"
+        style="width: 100%; margin-top: 25px"
-                         label="用户平台ID">
+      >
+        <el-table-column align="center" label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -394,61 +444,54 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick"
+        <el-table-column prop="nick" align="center" label="用户昵称" />
-                         align="center"
+        <el-table-column prop="createTime" align="center" label="加入时间" />
-                         label="用户昵称" />
+        <el-table-column prop="adminName" align="center" label="操作人" />
-        <el-table-column prop="createTime"
+        <el-table-column align="center" label="操作" width="300">
-                         align="center"
-                         label="加入时间" />
-        <el-table-column prop="adminName"
-                         align="center"
-                         label="操作人" />
-        <el-table-column align="center"
-                         label="操作"
-                         width="300">
           <template v-slot="scope">
-            <el-button @click="setMemberFun(scope.row)"
+            <el-button
-                       :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              @click="setMemberFun(scope.row)"
-                       :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
-                       size="default"
+              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
-                       :disabled="scope.row.roleType == 1 ? true : false">{{
+              size="default"
+              :disabled="scope.row.roleType == 1 ? true : false"
+              >{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button>
+              }}</el-button
-            <el-button @click="
+            >
+            <el-button
+              @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
-                       class="danger"
+              class="danger"
-                       type="danger"
+              type="danger"
-                       size="default"
+              size="default"
-                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
+              :disabled="scope.row.roleType == 1 ? true : false"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary"
+          <el-button type="primary" @click="memberDialog = false">
-                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog"
+    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
-               title="提示"
-               width="30%"
-               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="delmemberRemoveClick()">
-                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -468,6 +511,7 @@ import {
   addMember,
   setManager,
   removeMember,
+  listPartitionInfo,
 } from "@/api/noblemanNew/noblemanNew";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -475,7 +519,7 @@ import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
 export default {
   name: "GuildInfoNew",
-  data () {
+  data() {
     return {
       loading: false,
       delDialog: false,
@@ -485,6 +529,8 @@ export default {
         userId: "",
         referrer: "",
         time: "",
+        partitionId: "",
+        partitionArr: [],
       },
       //新增所需对象
       resource: {
@@ -533,12 +579,16 @@ export default {
       memberRemoveObj: {},
     };
   },
-  created () {
+  created() {
-    this.getData();
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+      this.getData();
+    });
   },
   methods: {
     // 查询接口
-    getData () {
+    getData() {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -551,6 +601,7 @@ export default {
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
         // startDate: startTime,
         // endDate: endTime,
         pageNum: this.currentPage,
@@ -562,7 +613,7 @@ export default {
       });
     },
     // 打开成员信息弹窗
-    memberDialogFun (val) {
+    memberDialogFun(val) {
       var than = this;
       than.memberTitle = `【${val.name}】成员信息`;
       than.memberNew = val;
@@ -574,7 +625,7 @@ export default {
       });
     },
     // 二次确认删除成员
-    delmemberRemoveClick () {
+    delmemberRemoveClick() {
       removeMember({
         guildMemberId: this.memberRemoveObj.guildMemberId,
       }).then((res) => {
@@ -600,7 +651,7 @@ export default {
       });
     },
     // 设置管理员
-    setMemberFun (val) {
+    setMemberFun(val) {
       setManager({
         guildMemberId: val.guildMemberId,
         status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
@@ -627,7 +678,7 @@ export default {
       });
     },
     // 新增成员
-    addMemberFun () {
+    addMemberFun() {
       addMember({
         erbanNo: this.member.userID,
         guildId: this.memberNew.id,
@@ -654,7 +705,7 @@ export default {
       });
     },
     // 打开收款账户弹窗
-    payAccountDialogFun (val) {
+    payAccountDialogFun(val) {
       this.payAccountTitle = `(${val.ownerNick}【ID:${val.ownerErbanNo}】)的收款账户`;
       this.payAccount.payoneer = val.payAccount.payoneer;
       this.payAccount.usdt = val.payAccount.usdt;
@@ -663,7 +714,7 @@ export default {
       this.payAccountNew = val;
     },
     // 保存收款账户
-    payAccountClick () {
+    payAccountClick() {
       savePayAccount({
         id: this.payAccountNew.payAccount.familyId,
         payPal: this.payAccount.payPal,
@@ -688,7 +739,7 @@ export default {
       });
     },
     // 导出
-    exportInfoFun () {
+    exportInfoFun() {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -702,10 +753,10 @@ export default {
         familyName: this.inquire.nick,
         // startDate: startTime,
         // endDate: endTime,
-      }).then((res) => { });
+      }).then((res) => {});
     },
     // 添加
-    add () {
+    add() {
       this.addDialog = false;
       create({
         erbanNo: this.resource.id,
@@ -728,7 +779,7 @@ export default {
       });
     },
     // 编辑按钮
-    ediClick (res) {
+    ediClick(res) {
       var obj = res.row;
       this.ediObj.leaderId = obj.ownerErbanNo;
       this.ediObj.leaderNick = obj.ownerNick;
@@ -740,7 +791,7 @@ export default {
       this.editDialog = true;
     },
     // 二次确认弹窗
-    editDialogClick () {
+    editDialogClick() {
       console.log(this.ediObj);
       update({
         id: this.ediObj.id,
@@ -768,7 +819,7 @@ export default {
       });
     },
     // 解散按钮
-    delClick () {
+    delClick() {
       console.log(this.delDialogData.id);
       var guildId = this.delDialogData.id;
       dismiss({ guildId }).then((res) => {
@@ -790,21 +841,21 @@ export default {
         this.delDialog = false;
       });
     },
-    beforeAvatarUpload () {
+    beforeAvatarUpload() {
       ElMessage({
         showClose: true,
         message: "上传中~",
         type: "warning",
       });
     },
-    handleAvatarError () {
+    handleAvatarError() {
       ElMessage({
         showClose: true,
         message: "上传失败！",
         type: "error",
       });
     },
-    handleAvatarSuccess (res, file) {
+    handleAvatarSuccess(res, file) {
       console.log(file);
       this.ediObj.imageUrl1 = file.response.data;
       ElMessage({
@@ -823,10 +874,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange () {
+    handleSizeChange() {
       this.getData();
     },
-    handleCurrentChange () {
+    handleCurrentChange() {
       this.getData();
     },
   },

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -20,6 +20,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="MoliStar ID" prop="agencyOwnerErbanNo">
               <el-input
                 v-model.trim="searchForm.agencyOwnerErbanNo"
@@ -72,7 +83,9 @@
 
             <el-form-item label-width="40px">
               <el-button type="primary" @click="handSearch">搜索</el-button>
-              <el-button  type="primary" plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button type="primary" plain @click="resetSearchForm"
+                >重置搜索</el-button
+              >
               <el-button
                 type="primary"
                 class="exportBtn"
@@ -103,10 +116,11 @@
           v-loading="tableLoading"
           @header-click="headerCopy"
           @selection-change="handleSelectionChange"
-          style="width: 100%;overflow-x: auto;"
+          style="width: 100%; overflow-x: auto"
         >
           <el-table-column type="selection"> </el-table-column>
           <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
+          <el-table-column align="center" prop="partitionDesc" label="分区" />
           <el-table-column align="center" prop="nick" label="昵称" />
           <el-table-column align="center" prop="accountCountry" label="国家" />
           <el-table-column
@@ -149,7 +163,12 @@
               {{ scope.row.remark ? scope.row.remark : "/" }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="hallSalary" label="操作" width="150">
+          <el-table-column
+            align="center"
+            prop="hallSalary"
+            label="操作"
+            width="150"
+          >
             <template v-slot="scope">
               <div v-if="scope.row.status == 0">
                 <el-button
@@ -244,6 +263,7 @@ import {
   agencyWithdrawBatchSet,
   batchReject,
   adminCountry,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -282,7 +302,9 @@ export default {
         endTime: null,
         adminCountry: null,
         country: null,
+        partitionId: null,
       },
+      partitionArr: [],
       adminCountryArr: [],
       searchRule: {
         startTime: [
@@ -334,6 +356,10 @@ export default {
   created() {
     adminCountry().then((res) => {
       this.adminCountryArr = res.data;
+    });
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId = this.partitionArr[0].id;
       this.getData();
     });
   },

src/views/headwear/HeadwearAdminView.vue

@@ -73,6 +73,7 @@
                                 <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
                                 <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                                <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -93,6 +94,12 @@
                                 <input type="text" class="form-control" name="headwearName" id="headwearEnName">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="headwearTrName" class="col-sm-3 control-label">土耳其头饰名称:</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control" name="headwearName" id="headwearTrName">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">使用萝卜购买</label>
                             <div class="col-sm-9">
@@ -385,6 +392,7 @@ export default {
                         {field: 'name.zh', title: '头饰名称', align: 'center', width: '5%'},
                         {field: 'name.ar', title: '阿语头饰名称', align: 'center', width: '5%'},
                         {field: 'name.en', title: '英语头饰名称', align: 'center', width: '5%'},
+                        {field: 'name.tr', title: '土耳其头饰名称', align: 'center', width: '5%'},
                         {
                             field: 'partitionFlag', 
                             title: '地区', 
@@ -401,6 +409,9 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其<br>';
+                                }
                                 return value;
                             }
                         },
@@ -643,6 +654,7 @@ export default {
                     $("#headwearName").val("");
                     $("#headwearArName").val("");
                     $("#headwearEnName").val("");
+                    $("#headwearTrName").val("");
                     $("#price").val("");
                     $("#renewPrice").val("");
                     $("#originalPrice").val("");
@@ -688,8 +700,9 @@ export default {
                     var headwearName = $("#headwearName").val();
                     var headwearArName = $("#headwearArName").val();
                     var headwearEnName = $("#headwearEnName").val();
+                    var headwearTrName = $("#headwearTrName").val();
                     // 国际化字段
-                    var jsonName = {"zh":headwearName,"ar":headwearArName,"en":headwearEnName}
+                    var jsonName = {"zh":headwearName,"ar":headwearArName,"en":headwearEnName,"tr":headwearTrName}
                     const nameValue = JSON.stringify(jsonName);
                     var price = $("#price").val();
                     var renewPrice = $("#renewPrice").val();
@@ -825,10 +838,12 @@ export default {
                                     $("#headwearName").val(jsonName.zh);
                                     $("#headwearArName").val(jsonName.ar);
                                     $("#headwearEnName").val(jsonName.en);
+                                    $("#headwearTrName").val(jsonName.tr);
                                 } else {
                                     $("#headwearName").val(name);
                                     $("#headwearArName").val(name);
                                     $("#headwearEnName").val(name);
+                                    $("#headwearTrName").val(name);
                                 }
                                 
                                 $("#price").val(json.price);

src/views/luckGift/luckGiftData.vue

@@ -31,6 +31,11 @@
         </el-date-picker>
       </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()"
@@ -145,6 +150,9 @@ export default {
   data() {
     return {
       loading: false,
+      totalInput: 0,
+      totalOutput: 0,
+      totalProductionRatio: 0,
       //查询所需条件对象
       inquire: {
         userId: "",
@@ -163,6 +171,10 @@ export default {
             name: "华语区",
             type: 4,
           },
+          {
+            type: 8,
+            name: "土耳其区",
+          },
         ],
       },
       // 表格
@@ -183,10 +195,10 @@ export default {
     // 查询接口
     getData() {
       console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
-      if (!this.inquire.time) {
+      if (!this.inquire.time && this.inquire.userId == '') {
         ElMessage({
           showClose: true,
-          message: "请选择时间",
+          message: "时间和ID至少填一项",
           type: "error",
         });
         return;
@@ -196,12 +208,16 @@ export default {
         erbanNo: this.inquire.userId,
         pageNo: this.currentPage,
         pageSize: this.pageSize,
-        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        date: this.inquire.time
-        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+          ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+          : null,
         partitionId: this.inquire.value,
       }).then((res) => {
-        this.total = res.data.total;
+        this.total = res.data.dataPage.total;
-        this.tableData = res.data.rows;
+        this.tableData = res.data.dataPage.rows;
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
         this.loading = false;
       });
     },

src/views/luckGift/luckGiftDataAll.vue

@@ -15,11 +15,11 @@
         </el-select>
       </div>
       <!-- 时间 -->
-      <div class="inquire">
+      <!-- <div class="inquire">
         <span>时间</span>
         <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
         </el-date-picker>
-      </div>
+      </div> -->
     </div>
     <!-- 按钮 -->
     <div class="but">
@@ -27,7 +27,9 @@
         >查询
       </el-button>
     </div>
-
+    <el-button type="text">数组出金币总额：{{ totalInput }}</el-button>
+    <el-button type="text">数组出返币总额：{{ totalOutput }}</el-button>
+    <el-button type="text">投产比：{{ totalProductionRatio }}</el-button>
     <!-- 表格 -->
     <el-table
       v-loading="loading"
@@ -38,21 +40,16 @@
       <el-table-column prop="date" align="center" label="日期" />
       <el-table-column prop="totalInput" align="center" label="进入" />
       <el-table-column prop="totalOutput" align="center" label="退出" />
-      <el-table-column prop="x" align="center" label="退出/进入比例"
+      <el-table-column
-        ><template v-slot="scope">
+        prop="productionRatio"
-          {{ (scope.row.totalOutput / scope.row.totalInput).toFixed(4) }}
+        align="center"
-        </template>
+        label="退出/进入比例"
-      </el-table-column>
+      />
       <el-table-column prop="num" align="center" label="参与次数" />
       <el-table-column prop="count" align="center" label="参与人数" />
       <el-table-column prop="winCount" align="center" label="得到人数" />
       <el-table-column prop="winNum" align="center" label="得到次数" />
-      <el-table-column prop="winRate" align="center" label="得到率"
+      <el-table-column prop="winRate" align="center" label="得到率" />
-        ><template v-slot="scope">
-          {{ scope.row.winRate ? scope.row.winRate : "-" }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="stock" align="center" label="数组库存" />
     </el-table>
   </div>
 </template>
@@ -68,6 +65,9 @@ export default {
   data() {
     return {
       loading: false,
+      totalInput: "0",
+      totalOutput: "0",
+      totalProductionRatio: "0",
       //查询所需条件对象
       inquire: {
         value: 2,
@@ -84,6 +84,10 @@ export default {
             value: 4,
             label: "华语区",
           },
+          {
+            value: 8,
+            label: "土耳其区",
+          },
         ],
         time: "",
       },
@@ -101,26 +105,15 @@ export default {
   methods: {
     // 查询接口
     getData() {
-      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
-      if (!this.inquire.time) {
-        ElMessage({
-          showClose: true,
-          message: "请选择时间",
-          type: "error",
-        });
-        return;
-      }
       this.loading = true;
       platform({
-        erbanNo: this.inquire.userId,
-        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
-        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
         partitionId: this.inquire.value,
       }).then((res) => {
-        this.total = res.data.total;
+        this.totalInput = res.data.totalInput;
-        this.tableData = res.data;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.tableData = res.data.dataList;
         this.loading = false;
-        console.log(this.tableData, 123);
       });
     },
     // 分页导航

src/views/luckGift/luckGiftSet.vue

@@ -357,6 +357,10 @@ export default {
             name: "华语区",
             type: 4,
           },
+          {
+            name: "土耳其区",
+            type: 8,
+          },
         ],
         comparisonValue: "",
         goldInventory: "",

src/views/medal/MedalInfo.vue

@@ -48,6 +48,9 @@
       <el-table-column prop="name" align="center" label="勋章名称-阿语区">
         <template v-slot="scope">{{ JSON.parse(scope.row.name).ar }}</template>
       </el-table-column>
+      <el-table-column prop="name" align="center" label="勋章名称-土耳其区">
+        <template v-slot="scope">{{ JSON.parse(scope.row.name).tr }}</template>
+      </el-table-column>
       <el-table-column
         align="center"
         prop="picUrl"
@@ -182,6 +185,19 @@
           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.nickTr"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
 
       <!-- 勋章图片 -->
       <div style="margin-bottom: 25px; margin-top: 10px; display: flex">
@@ -198,10 +214,7 @@
           :before-upload="beforeAvatarUpload"
           :on-error="handleAvatarError"
         >
-          <img
+          <img :src="controlsObj.imageUrl1" class="avatar" />
-            :src="controlsObj.imageUrl1"
-            class="avatar"
-          />
         </el-upload>
       </div>
 
@@ -349,6 +362,7 @@ export default {
         nickZh: "",
         nickEn: "",
         nickAr: "",
+        nickTr: "",
         imageUrl1: "",
         value2: "",
         options2: [
@@ -419,6 +433,7 @@ export default {
       this.controlsObj.nickZh = "";
       this.controlsObj.nickEn = "";
       this.controlsObj.nickAr = "";
+      this.controlsObj.nickTr = "";
       this.controlsObj.imageUrl1 = "";
       this.controlsObj.value2 = "";
       this.controlsDialog = true;
@@ -431,6 +446,7 @@ export default {
       this.controlsObj.nickZh = JSON.parse(val.name).zh;
       this.controlsObj.nickEn = JSON.parse(val.name).en;
       this.controlsObj.nickAr = JSON.parse(val.name).ar;
+      this.controlsObj.nickTr = JSON.parse(val.name).tr;
       this.controlsObj.imageUrl1 = val.picUrl;
       this.controlsObj.value2 = val.enable;
       this.controlsObj.id = val.id;
@@ -452,6 +468,7 @@ export default {
           zh: this.controlsObj.nickZh,
           en: this.controlsObj.nickEn,
           ar: this.controlsObj.nickAr,
+          tr: this.controlsObj.nickTr,
         });
         obj.picUrl = this.controlsObj.imageUrl1;
         obj.enable = this.controlsObj.value2;
@@ -480,6 +497,7 @@ export default {
           zh: this.controlsObj.nickZh,
           en: this.controlsObj.nickEn,
           ar: this.controlsObj.nickAr,
+          tr: this.controlsObj.nickTr,
         });
         obj1.picUrl = this.controlsObj.imageUrl1;
         obj1.enable = this.controlsObj.value2;
@@ -535,32 +553,51 @@ export default {
       //1 2 4
       var val = 0;
       if (type == 2) {
-        if (num == 0 || num == 7) {
+        if (num == 0 || num == 15) {
-          val = [4, 1, 2];
+          val = [1, 2, 4, 8];
+        }
+        if (num == 0 || num == 15) {
+          val = [1, 2, 4, 8];
         } else if (num == 1) {
           val = [1];
         } else if (num == 3) {
           val = [1, 2];
+        } else if (num == 7) {
+          val = [1, 2, 4];
         } else if (num == 2) {
           val = [2];
         } else if (num == 6) {
           val = [2, 4];
+        } else if (num == 14) {
+          val = [2, 4, 8];
         } else if (num == 4) {
           val = [4];
+        } else if (num == 12) {
+          val = [4, 8];
+        } else if (num == 8) {
+          val = [8];
         }
       } else {
-        if (num == 0 || num == 7) {
+        if (num == 0 || num == 15) {
-          val = "华语区、英语区、阿语区";
+          val = "英语区、阿语区、华语区、土耳其区";
         } else if (num == 1) {
           val = "英语区";
         } else if (num == 3) {
           val = "英语区、阿语区";
+        } else if (num == 7) {
+          val = "英语区、阿语区、华语区";
         } else if (num == 2) {
           val = "阿语区";
         } else if (num == 6) {
           val = "阿语区、华语区";
+        } else if (num == 14) {
+          val = "阿语区、华语区、土耳其区";
         } else if (num == 4) {
           val = "华语区";
+        } else if (num == 12) {
+          val = "华语区、土耳其区";
+        } else if (num == 8) {
+          val = "土耳其区";
         }
       }
       return val;

src/views/nameplate/NameplateInfoView.vue

@@ -74,6 +74,7 @@
                                 <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
                                 <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                                <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -103,6 +104,12 @@
                                 <input type="text" class="form-control validate[required]" name="name1" id="en_name1" placeholder="请输入,5个字符内">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="tr_name1" class="col-sm-4 control-label">土耳其铭牌名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name1" id="tr_name1" placeholder="请输入,5个字符内">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-4 control-label">用户自定义文案:</label>
                             <div class="col-sm-6">
@@ -129,6 +136,12 @@
                                     <input type="text" class="form-control" name="enFixedWord" id="enFixedWord">
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="trFixedWord" class="col-sm-4 control-label">土耳其固定文案:</label>
+                                <div class="col-sm-6">
+                                    <input type="text" class="form-control" name="trFixedWord" id="trFixedWord">
+                                </div>
+                            </div>
                         </div>
                         <div class="form-group">
                             <label for="days" class="col-sm-4 control-label">有效期（天）:</label>
@@ -247,6 +260,7 @@ export default {
                         {field: 'name.zh', title: '铭牌名称', align: 'middle', width: '5%'},
                         {field: 'name.ar', title: '阿语铭牌名称', align: 'middle', width: '5%'},
                         {field: 'name.en', title: '英语铭牌名称', align: 'middle', width: '5%'},
+                        {field: 'name.tr', title: '土耳其名称', align: 'middle', width: '5%'},
                         {
                             field: 'partitionFlag', 
                             title: '地区', 
@@ -263,6 +277,9 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其区<br>';
+                                }
                                 return value;
                             }
                         },
@@ -320,6 +337,19 @@ export default {
                                 }
                             }
                         },
+                        {
+                            field: 'fixedWord.tr',
+                            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%' },
@@ -454,10 +484,12 @@ export default {
                                     $("#name1").val(jsonName.zh);
                                     $("#ar_name1").val(jsonName.ar);
                                     $("#en_name1").val(jsonName.en);
+                                    $("#tr_name1").val(jsonName.tr);
                                 } else {
                                     $("#name1").val(name);
                                     $("#ar_name1").val(name);
                                     $("#en_name1").val(name);
+                                    $("#tr_name1").val(name);
                                 }
                                 let fixedWord = json.fixedWord;
                                 if (fixedWord && fixedWord.startsWith('{') && fixedWord.endsWith('}')) {
@@ -465,10 +497,12 @@ export default {
                                     $('#zhFixedWord').val(jsonValue.zh);
                                     $('#arFixedWord').val(jsonValue.ar);
                                     $('#enFixedWord').val(jsonValue.en);
+                                    $('#trFixedWord').val(jsonValue.tr);
                                 } else {
                                     $('#zhFixedWord').val(fixedWord);
                                     $('#arFixedWord').val(fixedWord);
                                     $('#enFixedWord').val(fixedWord); 
+                                    $('#trFixedWord').val(fixedWord); 
                                 }
                                 $('#nameplateType1').attr("disabled", "true");
                                 if (!json.isCustomWord) {
@@ -477,6 +511,7 @@ export default {
                                     $('#zhFixedWord').val('');
                                     $('#arFixedWord').val('');
                                     $('#enFixedWord').val('');
+                                    $('#trFixedWord').val('');
                                 } else {
                                     $('input[name="isCustomWord"]').get(1).checked = true;
                                     $('#fixedWord-div').removeClass("hidden");
@@ -553,17 +588,19 @@ export default {
                     var zhFixedWord = $('#zhFixedWord').val();
                     var arFixedWord = $('#arFixedWord').val();
                     var enFixedWord = $('#enFixedWord').val();
+                    var trFixedWord = $('#trFixedWord').val();
                     let fixedWordValue = '';
-                    if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '')) {
+                    if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '' && trFixedWord=="")) {
-                        let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord};
+                        let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord,'tr':trFixedWord};
                         fixedWordValue = JSON.stringify(jsonFixedWord);
                     }
                     var isCustomWord = $('input[name="isCustomWord"]:checked').val();
                     var name = $('#name1').val();
                     var ar_name = $('#ar_name1').val();
                     var en_name = $('#en_name1').val();
+                    var tr_name = $('#tr_name1').val();
 
-                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name}
                     const nameValue = JSON.stringify(jsonName);
                     var nameplateType = $('#nameplateType1').val();
                     var id = $('#id').val();
@@ -771,12 +808,14 @@ function cleanNamePlateModal() {
     $('#zhFixedWord').val('');
     $('#arFixedWord').val('');
     $('#enFixedWord').val('');  
+    $('#trFixedWord').val('');  
     $('input[name="isCustomWord"]').each(function () {
         $(this).removeAttr("checked");
     });
     $('#name1').val('');
     $('#ar_name1').val('');
     $('#en_name1').val('');
+    $('#tr_name1').val('');
     $('#nameplateType1').val('');
     $('#name1').removeAttr("readonly");
     $('#nameplateType1').removeAttr("disabled");

src/views/privilege/personalHomepageGiftRecordManagement.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="backgroundId" align="center" label="个人主页id" />
+      <el-table-column
+        prop="backgroundName"
+        align="center"
+        label="个人主页名称"
+      />
+      <el-table-column prop="uid" align="center" label="用户uID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="days" align="center" label="赠送天数" />
+      <el-table-column prop="remake" align="center" label="备注" />
+      <el-table-column prop="createTime" align="center" label="操作时间" />
+      <el-table-column prop="optUser" align="center" label="操作人" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            v-if="scope.row.status=1"
+            @click="personalBackground(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >撤回</el-button
+          >
+          <div v-else>已撤回</div>
+        </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"
+    />
+  </div>
+</template>
+<script>
+import {
+  pesonalBackgroundListRecordByPage,
+  pesonalBackgroundListRecordRecoveryPersonalBackground,
+} from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "personalHomepageRecordManagementSend",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      pesonalBackgroundListRecordByPage({
+        erbanNo: this.inquire.id,
+        page: this.currentPage,
+        comeFrom: 2,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    personalBackground(val) {
+      pesonalBackgroundListRecordRecoveryPersonalBackground({
+        recordId: val.recordId,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } 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;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+</style>

src/views/privilege/personalHomepageRecordManagement.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="backgroundId" align="center" label="个人主页id" />
+      <el-table-column prop="backgroundName" align="center" label="个人主页名称" />
+      <el-table-column prop="uid" align="center" label="用户uID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="status" align="center" label="个人主页状态" />
+      <el-table-column prop="createTime" align="center" label="购买天数" />
+      <el-table-column prop="days" align="center" label="有效时间" />
+      <el-table-column prop="expireTime" align="center" label="过期时间" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import { pesonalBackgroundListRecordByPage } from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "personalHomepageRecordManagement",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      pesonalBackgroundListRecordByPage({
+        erbanNo: this.inquire.id,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+        } 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;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+</style>

src/views/privilege/personalHomepageResourceManagement.vue

@@ -0,0 +1,801 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>地区</span>
+      <el-select v-model="inquire.partitionId" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.partitionArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>名称</span>
+      <el-input v-model="inquire.name" placeholder="" class="input"></el-input>
+    </div>
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 新增按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        operationValue.partitionVal = [];
+        operationValue.nameZh = '';
+        operationValue.nameEn = '';
+        operationValue.nameAr = '';
+        operationValue.nameTr = '';
+        operationValue.price = '';
+        operationValue.day = '';
+        operationValue.imageUrl = '';
+        operationValue.status = '';
+        operationType = 1;
+        filePreview: null; // 文件预览 URL
+        isImage = false;
+        isVideo = false;
+        isSVGA = false;
+        operationDialogTitle = '新增';
+        operationDialog = true;
+      "
+      >新增</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="partitionFlag" align="center" label="地区">
+        <template v-slot="scope">
+          {{ partitionDesc(scope.row.partitionFlag) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="中文名称">
+        <template v-slot="scope">
+          {{ jsonFun(scope.row.name).zh }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="阿语名称">
+        <template v-slot="scope">
+          {{ jsonFun(scope.row.name).ar }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="英语名称"
+        ><template v-slot="scope">
+          {{ jsonFun(scope.row.name).en }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="土耳其名称"
+        ><template v-slot="scope">
+          {{ jsonFun(scope.row.name).tr }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="图片">
+        <template v-slot="scope">
+          <el-image
+            :src="scope.row.pic"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.pic]"
+            fit="contain"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="装扮动效图片类型">
+        <template v-slot="scope">
+          {{
+            scope.row.effectType == 0
+              ? "无"
+              : scope.row.effectType == 1
+              ? "MP4"
+              : "SVGA"
+          }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop=""
+        width="300"
+        max-height="100"
+        align="center"
+        label="装扮动效图片"
+      >
+        <template v-slot="scope">
+          <div v-if="scope.row.effectType == 0">无</div>
+          <!-- 视频预览 -->
+          <video
+            v-if="scope.row.effectType == 1"
+            :src="scope.row.effect"
+            controls
+            style="width: 300px; max-height: 300px; display: block"
+          ></video>
+          <!-- SVGA 预览 -->
+          <div
+            v-if="scope.row.effectType == 2"
+            :id="`svga-player${scope.row.id}`"
+            style="width: 300px; max-height: 300px; display: block"
+          >
+            {{
+              scope.row.effect && scope.row.id
+                ? initSVGAList(scope.row.effect, scope.row.id)
+                : ""
+            }}
+            <!-- <img style="width: 100px; height: 100px; display: block" src="/Uploads/article/original_img/1487053722.jpg" alt="">
+      <el-image src=""></el-image> -->
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="" align="center" label="状态">
+        <template v-slot="scope">
+          {{ scope.row.status == 1 ? "有效" : "无效" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="贵族限定">
+        <template v-slot="scope">
+          {{ scope.row.type == 1 ? "普通" : "贵族" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" align="center" label="操作时间" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="
+              operationValue.partitionVal = partitionIdArr(
+                scope.row.partitionFlag
+              );
+              operationValue.nameZh = jsonFun(scope.row.name).zh;
+              operationValue.nameEn = jsonFun(scope.row.name).en;
+              operationValue.nameAr = jsonFun(scope.row.name).ar;
+              operationValue.nameTr = jsonFun(scope.row.name).tr;
+              operationValue.imageUrl = scope.row.pic;
+              operationValue.status = scope.row.status;
+              operationType = 2;
+              operationValueId = scope.row.id;
+              operationDialogTitle = '编辑';
+              filePreview: scope.row.effect; // 文件预览 URL
+              scope.row.effectType == 1
+                ? (isVideo = true)
+                : scope.row.effectType == 2
+                ? (isSVGA = true)
+                : (isImage = true);
+              operationValue.effectType = scope.row.effectType;
+              initSVGA(scope.row.effect);
+              operationDialog = true;
+            "
+            class="primary"
+            type="primary"
+            size="default"
+            >编辑</el-button
+          >
+          <el-button
+            @click="
+              sendDialog = true;
+              sendObj.erbanNos = send.days = send.remark = null;
+              sendObj.personalBackgroundId = scope.row.id;
+            "
+            class="primary"
+            type="primary"
+            size="default"
+            >赠送</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 新增&编辑弹窗 -->
+    <el-dialog
+      v-model="operationDialog"
+      :title="operationDialogTitle"
+      width="28%"
+      center
+    >
+      <!-- <div class="operation">
+        <span style="margin-right: 20px">地区</span>
+        <el-select v-model="operationValue.partitionId" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </div> -->
+      <div class="operation">
+        <span style="margin-right: 20px">地区</span>
+        <el-checkbox-group
+          v-model="operationValue.partitionVal"
+          v-for="(val, i) in inquire.partitionArr"
+          :key="i"
+        >
+          <el-checkbox style="margin-right: 10px" :label="val.id">{{
+            val.desc
+          }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">华语名称</span>
+        <el-input
+          v-model="operationValue.nameZh"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">英语名称</span>
+        <el-input
+          v-model="operationValue.nameEn"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">阿拉伯名称</span>
+        <el-input
+          v-model="operationValue.nameAr"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">土耳其名称</span>
+        <el-input
+          v-model="operationValue.nameTr"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <!-- <div class="operation">
+        <span style="margin-right: 20px">价格</span>
+        <el-input
+          v-model="operationValue.price"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">有效天数</span>
+        <el-input
+          v-model="operationValue.day"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div> -->
+      <div class="operation">
+        <span class="left" style="margin-right: 20px">图片</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img
+            v-if="operationValue.imageUrl"
+            :src="operationValue.imageUrl"
+            class="avatar"
+          />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">装扮动效图片类型</span>
+        <el-select v-model="operationValue.effectType" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.effectTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="operation">
+        <span class="left" style="margin-right: 20px">装扮动效图片</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          accept="image/*,.mp4,.svga"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess1"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <!-- 文件预览 -->
+          <div style="margin-top: 20px">
+            <!-- 图片预览 -->
+            <img
+              v-if="isImage"
+              :src="filePreview"
+              alt="Uploaded Image"
+              style="max-width: 300px"
+            />
+
+            <!-- 视频预览 -->
+            <video
+              v-else-if="isVideo"
+              :src="filePreview"
+              controls
+              style="max-width: 300px"
+            ></video>
+
+            <!-- SVGA 预览 -->
+            <div
+              v-else-if="isSVGA"
+              :id="`svga-player`"
+              style="width: 200px; height: 200px"
+            ></div>
+          </div>
+        </el-upload>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">状态</span>
+        <el-select v-model="operationValue.status" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              operationDialog = false;
+              isImage = false;
+              isVideo = false;
+              isSVGA = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            @click="operation(type == 1 ? null : operationValueId)"
+          >
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 赠送 -->
+    <el-dialog v-model="sendDialog" title="赠送" width="28%" center>
+      <div class="operation">
+        <span style="margin-right: 20px">用户平台ID</span>
+        <el-input
+          v-model="sendObj.erbanNos"
+          style="width: 200px"
+          class="input"
+          placeholder="多个请用英文“,”隔开"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">天数</span>
+        <el-input
+          v-model="sendObj.days"
+          style="width: 200px"
+          class="input"
+          placeholder=""
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">备注</span>
+        <el-input
+          v-model="sendObj.remark"
+          style="width: 200px"
+          class="input"
+          placeholder=""
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="sendDialog = false">取消</el-button>
+          <el-button type="primary" @click="send()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  pesonalBackgroundListByPage,
+  pesonalBackgroundSaveOrUpdate,
+  pesonalBackgroundListSend,
+} from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+import { partitionDesc, partitionIdArr } from "@/utils/partitionDesc.js";
+import { ref, reactive, onMounted, onUnmounted, nextTick } from "vue";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import SVGA from "svgaplayerweb";
+export default {
+  name: "personalHomepageResourceManagement",
+  setup() {
+    // 响应式数据
+    const file = ref(null);
+    const filePreview = ref(null);
+    const isImage = ref(false);
+    const isVideo = ref(false);
+    const isSVGA = ref(false);
+    const loading = ref(false);
+
+    const inquire = reactive({
+      partitionId: "",
+      partitionArr: [],
+      name: "",
+      status: "",
+      options: [
+        { label: "有效", value: 1 },
+        { label: "无效", value: 2 },
+        { label: "全部", value: 3 },
+      ],
+    });
+
+    const operationDialog = ref(false);
+    const operationType = ref(null);
+    const operationDialogTitle = ref("新增%编辑");
+    const operationValueId = ref(null);
+
+    const operationValue = reactive({
+      partitionVal: [],
+      nameZh: "",
+      nameEn: "",
+      nameAr: "",
+      nameTr: "",
+      price: "",
+      day: "",
+      imageUrl: "",
+      status: "",
+      options: [
+        { label: "有效", value: 1 },
+        { label: "无效", value: 2 },
+      ],
+      effectType: "",
+      effectTypeArr: [
+        { label: "无", value: 0 },
+        { label: "MP4", value: 1 },
+        { label: "SVGA", value: 2 },
+      ],
+    });
+
+    const sendDialog = ref(false);
+    const sendObj = reactive({
+      erbanNos: null,
+      days: null,
+      personalBackgroundId: null,
+      remark: null,
+    });
+
+    const tableData = ref([]);
+    const total = ref(0); // 总页数
+    const currentPage = ref(1); // 页码
+    const pageSize = ref(10); // 条数
+
+    // 生命周期钩子
+    onMounted(() => {
+      console.log("组件已挂载");
+      listPartitionInfo().then((res) => {
+        inquire.partitionArr = operationValue.partitionArr = res.data;
+        inquire.partitionId = inquire.partitionArr[0].id;
+        getData();
+      });
+    });
+
+    onUnmounted(() => {
+      console.log("组件已卸载");
+    });
+
+    // 查询接口
+    const getData = () => {
+      loading.value = true;
+      pesonalBackgroundListByPage({
+        partitionId: inquire.partitionId,
+        name: inquire.name,
+        status: inquire.status,
+        page: currentPage.value,
+        pageSize: pageSize.value,
+      }).then((res) => {
+        if (res.code == 200) {
+          loading.value = false;
+          total.value = res.data.total;
+          tableData.value = res.data.list;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const operation = (id) => {
+      const obj = {
+        partitionFlag: operationValue.partitionVal.reduce(
+          (accumulator, currentValue) => accumulator + currentValue,
+          0
+        ),
+        name: JSON.stringify({
+          ar: operationValue.nameAr,
+          zh: operationValue.nameZh,
+          en: operationValue.nameEn,
+          tr: operationValue.nameTr,
+        }),
+        pic: operationValue.imageUrl,
+        effectType: operationValue.effectType,
+        effect: filePreview.value,
+        status: operationValue.status,
+        type: 1, // 资料卡类型 1：普通 2：贵族
+        id,
+      };
+      console.log(obj);
+      pesonalBackgroundSaveOrUpdate(obj).then((res) => {
+        if (res.code == 200) {
+          operationDialog.value = false;
+          getData();
+          isImage.value = false;
+          isVideo.value = false;
+          isSVGA.value = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const send = () => {
+      pesonalBackgroundListSend(sendObj).then((res) => {
+        if (res.code == 200) {
+          sendDialog.value = false;
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const beforeAvatarUpload = () => {
+      ElMessage({
+        showClose: true,
+        message: "上传中可能较慢，请等待上传成功后在进行下一步~",
+        type: "warning",
+      });
+    };
+
+    const handleAvatarError = () => {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    };
+
+    const handleAvatarSuccess = (res, file) => {
+      console.log(file);
+      operationValue.imageUrl = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    };
+
+    const handleAvatarSuccess1 = (res, files) => {
+      console.log(files.raw);
+      const selectedFile = files.raw;
+      if (!selectedFile) return;
+      // 清除旧的预览数据
+      // resetFile();
+      const fileType = selectedFile.type;
+      const fileName = selectedFile.name;
+      // 创建预览 URL
+      filePreview.value = res.data;
+      file.value = selectedFile;
+      // 根据文件类型判断
+      if (fileType.startsWith("image/")) {
+        isImage.value = true;
+      } else if (fileType === "video/mp4") {
+        isVideo.value = true;
+      } else if (fileName.endsWith(".svga")) {
+        isSVGA.value = true;
+        initSVGA(res.data);
+      }
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    };
+
+    // const resetFile = () => {
+    //   nextTick(() => {
+    //     file.value = null;
+    //     filePreview.value = null;
+    //     isImage.value = false;
+    //     isVideo.value = false;
+    //     isSVGA.value = false;
+    //     // 清除 SVGA 容器内容
+    //     const svgaPlayer = document.getElementById("svga-player");
+    //     if (svgaPlayer) {
+    //       svgaPlayer.innerHTML = "";
+    //     }
+    //   });
+    // };
+
+    const initSVGA = (url) => {
+      nextTick(() => {
+        setTimeout(function () {
+          const container = document.getElementById("svga-player");
+          if (container) {
+            const player = new SVGA.Player(container);
+            const parser = new SVGA.Parser();
+            parser.load(
+              url,
+              (videoItem) => {
+                player.setVideoItem(videoItem);
+                player.startAnimation();
+              },
+              (error) => {
+                console.log("SVGA失败", error);
+              }
+            );
+          }
+        }, 10);
+      });
+    };
+    const initializedIds = new Set();
+    const initSVGAList = (url, id) => {
+      if (initializedIds.has(id)) return; // 避免重复初始化
+      console.log('SVGASVGASVGASVGASVGASVGA',url,id);
+      nextTick(() => {
+        const container = document.getElementById("svga-player" + id);
+        if (!container) {
+          console.error(`SVGA container for ID ${id} not found`);
+          return;
+        }
+        try {
+          const player = new SVGA.Player(container);
+          const parser = new SVGA.Parser();
+          parser.load(url, (videoItem) => {
+            player.setVideoItem(videoItem);
+            player.startAnimation();
+          });
+          initializedIds.add(id); // 标记已初始化
+        } catch (error) {
+          console.error("SVGA initialization failed:", error);
+        }
+      });
+    };
+
+    const jsonFun = (val) => JSON.parse(val);
+
+    // 分页导航
+    const handleSizeChange = () => {
+      getData();
+    };
+
+    const handleCurrentChange = () => {
+      getData();
+    };
+
+    return {
+      partitionDesc,
+      partitionIdArr,
+      file,
+      filePreview,
+      isImage,
+      isVideo,
+      isSVGA,
+      loading,
+      inquire,
+      operationDialog,
+      operationType,
+      operationDialogTitle,
+      operationValueId,
+      operationValue,
+      sendDialog,
+      sendObj,
+      tableData,
+      total,
+      currentPage,
+      pageSize,
+      getData,
+      operation,
+      send,
+      beforeAvatarUpload,
+      handleAvatarError,
+      handleAvatarSuccess,
+      handleAvatarSuccess1,
+      // resetFile,
+      initSVGA,
+      initSVGAList,
+      jsonFun,
+      handleSizeChange,
+      handleCurrentChange,
+    };
+  },
+};
+</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;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+.avatar {
+  width: 100%;
+}
+</style>

src/views/recharge/RechargeDiamondGiveDetailView.vue

@@ -1,189 +1,299 @@
 <template>
-    <section class="content">
+  <section class="content">
-        <div class="box box-primary">
+    <div class="box box-primary">
-            <div class="box-body">
+      <div class="box-body">
-                <!-- Content Header (Page header) -->
+        <!-- Content Header (Page header) -->
-                <section class="content-header">
+        <section class="content-header">
-                    <h1 id="itemTitle"></h1>
+          <h1 id="itemTitle"></h1>
-                </section>
+        </section>
-                <!-- .content -->
+        <!-- .content -->
-                <div id="table"></div>
+        <div id="table"></div>
-                <div id="toolbar">
+        <div id="toolbar">
-                    <form id="searchForm" action="/admin/recharge/user/give/export" method="get" target="_blank">
+          <form
-                        <div class="col-sm-12">
+            id="searchForm"
-                            <label for="fromErBanNo" class="col-sm-2 control-label">转出人id:</label>
+            action="/admin/recharge/user/give/export"
-                            <div class="col-sm-2">
+            method="get"
-                                <input type="text" class="form-control" name="fromErBanNo" id="fromErBanNo">
+            target="_blank"
-                            </div>
+          >
-                            <label for="toErBanNo" class="col-sm-2 control-label">收入人id:</label>
+            <div class="col-sm-12">
-                            <div class="col-sm-2">
+              <label for="fromErBanNo" class="col-sm-2 control-label"
-                                <input type="text" class="form-control" name="toErBanNo" id="toErBanNo">
+                >转出人id:</label
-                            </div>
+              >
-                            <label for="toRegion" class="col-sm-2 control-label">收入人地区:</label>
+              <div class="col-sm-2">
-                            <div class="col-sm-2">
+                <input
-                                <select name="toRegion" id="toRegion" data-btn-class="btn-warning" class="form-control">
+                  type="text"
-                                    <option value="" selected="selected">全部</option>
+                  class="form-control"
-                                </select>
+                  name="fromErBanNo"
-                            </div>
+                  id="fromErBanNo"
-                        </div>
+                />
-                        <div class="col-sm-12">
+              </div>
-                            <label for="startTime" class="col-sm-2 control-label">时间:</label>
+              <label for="toErBanNo" class="col-sm-2 control-label"
-                            <div class="col-sm-3"><input type="text" class="form-control" name="startTime" id="startTime">
+                >收入人id:</label
-                            </div>
+              >
-                            <label for="endTime" class="col-sm-1 control-label">-</label>
+              <div class="col-sm-2">
-                            <div class="col-sm-3"><input type="text" class="form-control" name="endTime" id="endTime"></div>
+                <input
-                        </div>
+                  type="text"
-                    </form>
+                  class="form-control"
-                    <button id="btnSearch" class="btn btn-default">
+                  name="toErBanNo"
-                        <i class="glyphicon glyphicon-search"></i>查询
+                  id="toErBanNo"
-                    </button>
+                />
-                    <button id="btnExport" class="btn btn-default">
+              </div>
-                        <i class="glyphicon glyphicon-Export"></i>导出
+              <label for="toRegion" class="col-sm-2 control-label"
-                    </button>
+                >收入人地区:</label
-                </div>
+              >
+              <div class="col-sm-2">
+                <select
+                  name="toRegion"
+                  id="toRegion"
+                  data-btn-class="btn-warning"
+                  class="form-control"
+                >
+                  <option value="" selected="selected">全部</option>
+                </select>
+              </div>
             </div>
+            <div class="col-sm-12">
+              <label for="startTime" class="col-sm-2 control-label"
+                >时间:</label
+              >
+              <div class="col-sm-3">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="startTime"
+                  id="startTime"
+                />
+              </div>
+              <label for="endTime" class="col-sm-1 control-label">-</label>
+              <div class="col-sm-3">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="endTime"
+                  id="endTime"
+                />
+              </div>
+            </div>
+          </form>
+          <div id="mapObjHtml">
+            <span
+              style="
+                margin-right: 10px;
+                display: inline-block;
+                font-size: 18px;
+                color: #2049a9;
+              "
+              >金币转赠明细: <b class="b1"></b
+            ></span>
+            <span
+              style="
+                margin-right: 10px;
+                display: inline-block;
+                font-size: 18px;
+                color: #2049a9;
+              "
+              >转赠非充值代理用户总数: <b class="b2"></b
+            ></span>
+          </div>
+          <button id="btnSearch" class="btn btn-default">
+            <i class="glyphicon glyphicon-search"></i>查询
+          </button>
+          <button id="btnExport" class="btn btn-default">
+            <i class="glyphicon glyphicon-Export"></i>导出
+          </button>
         </div>
-    </section>
+      </div>
+    </div>
+  </section>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
 
 export default {
-    name: "RechargeDiamondGiveDetailView",
+  name: "RechargeDiamondGiveDetailView",
-    setup() {
+  setup() {
-        return {};
+    return {};
-    },
+  },
-    created() {
+  created() {
-        this.$nextTick(function () {
+    this.$nextTick(function () {
-            this.initData();
+      this.initData();
-        });
+    });
-    },
+  },
-    methods: {
+  methods: {
-        initData() {
+    initData() {
-            $(function () {
+      $(function () {
-                userRegion();
+        userRegion();
-                $('#table').bootstrapTable('destroy');
+        $("#table").bootstrapTable("destroy");
-                $('#table').bootstrapTable({
+        $("#table").bootstrapTable({
-                    columns: [
+          columns: [
-                        { field: 'createTime', title: '时间', align: 'center', width: '5%' },
+            {
-                        { field: 'fromErBanNo', title: '转出人peko id', align: 'center', width: '5%' },
+              field: "createTime",
-                        { field: 'fromNick', title: '转出人昵称', align: 'center', width: '5%' },
+              title: "时间",
-                        { field: 'fromClanName', title: '转出人所在公会', align: 'center', width: '5%' },
+              align: "center",
-                        {
+              width: "5%",
-                            field: 'fromRegion',
+            },
-                            title: '转出人所属代充地区',
+            {
-                            align: 'center',
+              field: "fromErBanNo",
-                            width: '5%',
+              title: "转出人peko id",
-                            formatter: function (val, row, index) {
+              align: "center",
-                                var value = '';
+              width: "5%",
-                                if (val) {
+            },
-                                    var array = val.split(',');
+            {
-                                    for (let i = 0, len = array.length; i < len; i++) {
+              field: "fromNick",
-                                        var region = array[i];
+              title: "转出人昵称",
-                                        value += region;
+              align: "center",
-                                        if (i != len - 1) {
+              width: "5%",
-                                            value += '<br/>';
+            },
-                                        }
+            {
-                                    }
+              field: "fromClanName",
-                                }
+              title: "转出人所在公会",
-                                return value;
+              align: "center",
-                            }
+              width: "5%",
-                        },
+            },
-                        { field: 'toErBanNo', title: '收入人peko id', align: 'center', width: '5%' },
+            {
-                        { field: 'toNick', title: '收入人昵称', align: 'center', width: '5%' },
+              field: "fromRegion",
-                        { field: 'toRegion', title: '收入人地区', align: 'center', width: '5%' },
+              title: "转出人所属代充地区",
-                        { field: 'inviteCode', title: '收入人填写的邀请码', align: 'center', width: '5%' },
+              align: "center",
-                        { field: 'diamondNum', title: '转赠数额', align: 'center', width: '5%' },
+              width: "5%",
-                    ],
+              formatter: function (val, row, index) {
-                    cache: false,
+                var value = "";
-                    striped: true,
+                if (val) {
-                    showRefresh: false,
+                  var array = val.split(",");
-                    pageSize: 20,
+                  for (let i = 0, len = array.length; i < len; i++) {
-                    pagination: true,
+                    var region = array[i];
-                    pageList: [20, 50, 100],
+                    value += region;
-                    search: false,
+                    if (i != len - 1) {
-                    sidePagination: "server", //表示服务端请求
+                      value += "<br/>";
-                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-                    //设置为limit可以获取limit, offset, search, sort, order
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            page: params.pageNumber,
-                            pageSize: params.pageSize,
-                            fromErBanNo: $('#fromErBanNo').val(),
-                            toErBanNo: $('#toErBanNo').val(),
-                            toRegion: $('#toRegion').val(),
-                            startTime: $('#startTime').val(),
-                            endTime: $('#endTime').val(),
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/recharge/user/give/dayDetailPage',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
-
-                var picker1 = $("#startTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    todayBtn: true,
-                    autoclose: true,
-                });
-                var picker2 = $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    todayBtn: true,
-                    autoclose: true
-                });
-                picker1.on('changeDate', function () {
-                    var date = $('#startTime').datetimepicker('getDate');
-                    picker2.datetimepicker('setStartDate', date);
-                });
-                picker2.on('changeDate', function () {
-                    var date = $('#endTime').datetimepicker('getDate');
-                    picker1.datetimepicker('setEndDate', date);
-                });
-
-                //导出功能
-                $("#btnExport").on('click', function () {
-                    $("#searchForm").submit();
-                });
-
-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
-
-                //用户地区
-                function userRegion() {
-                    var array;
-                    $.ajax({
-                        type: "get",
-                        url: "/admin/recharge/user/give/getRegion",
-                        dataType: "json",
-                        async: false,
-                        success: function (json) {
-                            if (json.success == 'true' || json.code == 200) {
-                                array = json.data;
-                            }
-                        }
-                    });
-                    var $select = $('#toRegion');
-                    for (let i = 0; i < array.length; i++) {
-                        var value = array[i];
-                        var $option = $('<option value="' + value + '" />');
-                        $option.html(value);
-                        $select.append($option);
                     }
+                  }
                 }
-            });
+                return value;
-        }
+              },
-    },
+            },
+            {
+              field: "toErBanNo",
+              title: "收入人peko id",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "toNick",
+              title: "收入人昵称",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "toRegion",
+              title: "收入人地区",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "inviteCode",
+              title: "收入人填写的邀请码",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "diamondNum",
+              title: "转赠数额",
+              align: "center",
+              width: "5%",
+            },
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+          //设置为limit可以获取limit, offset, search, sort, order
+          queryParamsType: "undefined",
+          queryParams: function queryParams(params) {
+            //设置查询参数
+            var param = {
+              page: params.pageNumber,
+              pageSize: params.pageSize,
+              fromErBanNo: $("#fromErBanNo").val(),
+              toErBanNo: $("#toErBanNo").val(),
+              toRegion: $("#toRegion").val(),
+              startTime: $("#startTime").val(),
+              endTime: $("#endTime").val(),
+            };
+            return param;
+          },
+          toolbar: "#toolbar",
+          url: "/admin/recharge/user/give/dayDetailPage",
+          onLoadSuccess: function (res) {
+            //加载成功时执行
+            console.log();
+            $("#mapObjHtml .b1").text(res.totalMap.totalDiamondNum);
+            $("#mapObjHtml .b2").text(res.totalMap.totalDiamondNum4Normal);
+          },
+          onLoadError: function () {
+            //加载失败时执行
+            console.log("load fail");
+          },
+        });
 
+        var picker1 = $("#startTime").datetimepicker({
+          format: "yyyy-mm-dd hh:ii:00",
+          todayBtn: true,
+          autoclose: true,
+        });
+        var picker2 = $("#endTime").datetimepicker({
+          format: "yyyy-mm-dd hh:ii:00",
+          todayBtn: true,
+          autoclose: true,
+        });
+        picker1.on("changeDate", function () {
+          var date = $("#startTime").datetimepicker("getDate");
+          picker2.datetimepicker("setStartDate", date);
+        });
+        picker2.on("changeDate", function () {
+          var date = $("#endTime").datetimepicker("getDate");
+          picker1.datetimepicker("setEndDate", date);
+        });
+
+        //导出功能
+        $("#btnExport").on("click", function () {
+          $("#searchForm").submit();
+        });
+
+        // 查询刷新
+        $("#btnSearch").on("click", function () {
+          TableHelper.doRefresh("#table");
+        });
+
+        //用户地区
+        function userRegion() {
+          var array;
+          $.ajax({
+            type: "get",
+            url: "/admin/recharge/user/give/getRegion",
+            dataType: "json",
+            async: false,
+            success: function (json) {
+              if (json.success == "true" || json.code == 200) {
+                array = json.data;
+              }
+            },
+          });
+          var $select = $("#toRegion");
+          for (let i = 0; i < array.length; i++) {
+            var value = array[i];
+            var $option = $('<option value="' + value + '" />');
+            $option.html(value);
+            $select.append($option);
+          }
+        }
+      });
+    },
+  },
 };
 </script>
 

src/views/record/ChargeRecordView.vue

@@ -5,66 +5,55 @@
         <section class="content-header">
           <h1 id="itemTitle"></h1>
         </section>
-        <form id="form2"
+        <form id="form2" action="" method="post" target="_blank">
-              action=""
+          <input type="hidden" name="erbanNo" id="exportErbanNo" />
-              method="post"
+          <input type="hidden" name="channel" id="exportChannel" />
-              target="_blank">
+          <input type="hidden" name="startTime" id="exportStartTime" />
-          <input type="hidden"
+          <input type="hidden" name="endTime" id="exportEndTime" />
-                 name="erbanNo"
+          <input type="hidden" name="status" id="exportStatus" />
-                 id="exportErbanNo">
+          <input type="hidden" name="newUser" id="exportNewUser" />
-          <input type="hidden"
+          <input type="hidden" name="appChannel" id="exportAppChannel" />
-                 name="channel"
-                 id="exportChannel">
-          <input type="hidden"
-                 name="startTime"
-                 id="exportStartTime">
-          <input type="hidden"
-                 name="endTime"
-                 id="exportEndTime">
-          <input type="hidden"
-                 name="status"
-                 id="exportStatus">
-          <input type="hidden"
-                 name="newUser"
-                 id="exportNewUser">
-          <input type="hidden"
-                 name="appChannel"
-                 id="exportAppChannel">
         </form>
         <section class="content">
           <div id="toolbar">
             <form class="form-inline">
               <div class="form-group">
                 <label for="qErbanNo">平台号：</label>
-                <input type="text"
+                <input
-                       class="form-control"
+                  type="text"
-                       name="erbanNo"
+                  class="form-control"
-                       id="qErbanNo">
+                  name="erbanNo"
+                  id="qErbanNo"
+                />
               </div>
               <div class="form-group">
                 <label for="qChannel">渠道:</label>
-                <input type="text"
+                <input
-                       class="form-control"
+                  type="text"
-                       name="channel"
+                  class="form-control"
-                       id="qChannel">
+                  name="channel"
+                  id="qChannel"
+                />
               </div>
               <div class="form-group">
                 <label for="qChannel">时间:</label>
-                <input type="text"
+                <input
-                       class="form-control datetime"
+                  type="text"
-                       name="startTime"
+                  class="form-control datetime"
-                       id="qStartTime">
+                  name="startTime"
+                  id="qStartTime"
+                />
                 <label for="qChannel">-</label>
-                <input type="text"
+                <input
-                       class="form-control datetime"
+                  type="text"
-                       name="endTime"
+                  class="form-control datetime"
-                       id="qEndTime">
+                  name="endTime"
+                  id="qEndTime"
+                />
               </div>
               <div class="form-group">
                 <label for="qStatus">状态:</label>
-                <select class="form-control"
+                <select class="form-control" name="status" id="qStatus">
-                        name="status"
-                        id="qStatus">
                   <option value="">全部</option>
                   <option value="1">发起充值</option>
                   <option value="2">充值成功</option>
@@ -72,9 +61,7 @@
               </div>
               <div class="form-group">
                 <label for="qNewUser">新用户:</label>
-                <select class="form-control"
+                <select class="form-control" name="newUser" id="qNewUser">
-                        name="newUser"
-                        id="qNewUser">
                   <option value="">全部</option>
                   <option value="1">是</option>
                   <option value="0">否</option>
@@ -82,20 +69,20 @@
               </div>
               <div class="form-group">
                 <label for="qChannel">app渠道</label>
-                <input type="text"
+                <input
-                       class="form-control"
+                  type="text"
-                       name="appChannel"
+                  class="form-control"
-                       id="qAppChannel">
+                  name="appChannel"
+                  id="qAppChannel"
+                />
               </div>
             </form>
-            <button id="btnSearch"
+            <div id="mapObjHtml"></div>
-                    class="btn btn-sm btn-primary">查询</button>
+            <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-            <button id="btnExport"
+            <button id="btnExport" class="btn btn-sm btn-primary">导出</button>
-                    class="btn btn-sm btn-primary">导出</button>
           </div>
           <!-- .content -->
-          <div class="content"
+          <div class="content" id="table"></div>
-               id="table"></div>
         </section>
       </div>
     </div>
@@ -103,152 +90,185 @@
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-
 export default {
   name: "ChargeRecordView",
-  setup () {
+  created() {
-    return {};
-  },
-  created () {
     this.$nextTick(function () {
       this.initData();
     });
   },
   methods: {
-    initData () {
+    initData() {
-      $(function () {
+      $(".datetime").datetimepicker({
-        $('.datetime').datetimepicker({
+        format: "yyyy-mm-dd hh:ii:00",
-          format: 'yyyy-mm-dd hh:ii:00',
+        autoclose: true,
-          autoclose: true
-        });
-        $('#table').bootstrapTable('destroy');
-        $('#table').bootstrapTable({
-          columns: [
-            { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
-            { field: 'uid', title: 'uid', align: 'center', width: '5%' },
-            { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-            { field: 'partitionName', title: '分区', align: 'center', width: '5%' },
-            { field: 'createTime', title: '创建时间', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-            { field: 'localCurrencyCode', title: '当地货币代码', align: 'center', width: '5%' },
-            { field: 'localAmount', title: '当地金额', align: 'center', width: '5%' },
-            { field: 'chargeRecordId', title: '商户订单号', align: 'center', width: '5%' },
-            { field: 'pingxxChargeId', title: '第三方订单号', align: 'center', width: '5%' },
-            {
-              field: 'status', title: '状态', align: 'center', width: '5%',
-              formatter: function (val, row, index) {
-                if (val == 2) {
-                  return '充值成功';
-                } else {
-                  return '发起充值';
-                }
-
-              }
-            },
-            {
-              field: 'newUser', title: '是否新用户', align: 'center', width: '5%',
-              formatter: function (val, row, index) {
-                if (val) {
-                  return '是';
-                } else {
-                  return '否';
-                }
-
-              }
-            },
-            { field: 'appChannel', title: 'app渠道', align: 'center', width: '5%' },
-          ],
-          undefinedText: "-",
-          cache: false,
-          striped: true,
-          showRefresh: false,
-          pageSize: 20,
-          pagination: true,
-          pageList: [20, 50, 100, 200, 300, 500],
-          search: false,
-          sidePagination: "server", //表示服务端请求
-          queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
-            var param = {
-              pageNumber: params.pageNumber,
-              pageSize: params.pageSize,
-              erbanNo: $('#qErbanNo').val(),
-              channel: $('#qChannel').val(),
-              startTime: $('#qStartTime').val(),
-              endTime: $('#qEndTime').val(),
-              status: $('#qStatus').val(),
-              newUser: $('#qNewUser').val(),
-              appChannel: $('#qAppChannel').val(),
-            };
-            return param;
-          },
-          ajax: function (request) {                    //使用ajax请求
-            $.ajax({
-              type: "GET",
-              url: '/admin/chargeRecord/list',
-              contentType: 'application/json;charset=utf-8',
-              dataType: 'json',
-              data: request.data,
-              success: function (res) {
-                apiResult(res);
-                request.success({
-                  rows: res.data.records,
-                  total: res.data.total
-                });
-              },
-              error: function (req) {
-                serverError(req);
-              }
-            })
-          },
-          toolbar: '#toolbar',
-          onLoadSuccess: function () {  //加载成功时执行
-            console.log("load success");
-          },
-          onLoadError: function () {  //加载失败时执行
-            console.log("load fail");
-          }
-        });
-
-        // 查询刷新
-        $('#btnSearch').on('click', function () {
-          TableHelper.doRefresh('#table');
-        });
-
-        function serverError (req) {
-          $("#tipMsg").text(req.responseJSON.message);
-          $("#tipModal").modal('show');
-        }
-
-        function apiResult (json) {
-          if (json.code == 200 && json.message == 'success') {
-            return true;
-          }
-          $("#tipMsg").text("请求失败，错误信息：" + json.message);
-          $("#tipModal").modal('show');
-          return false;
-        }
-
-        // 导出excel
-        $('#btnExport').on('click', function () {
-          var form = $("#form2");
-          form.attr("action", "/admin/chargeRecord/exportChargeDetail");
-          $('#exportErbanNo').val($('#qErbanNo').val());
-          $('#exportChannel').val($('#qChannel').val());
-          $('#exportStartTime').val($('#qStartTime').val());
-          $('#exportEndTime').val($('#qEndTime').val());
-          $('#exportStatus').val($('#qStatus').val());
-          $('#exportNewUser').val($('#qNewUser').val());
-          $('#exportAppChannel').val($('#qAppChannel').val());
-
-          form.submit();
-        })
-
       });
-    }
-  },
 
+      // 初始化表格，但不设置 `ajax` 方法，也不绑定 `url`，只提供列配置
+      $("#table").bootstrapTable({
+        columns: [
+          { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
+          { field: "uid", title: "uid", align: "center", width: "5%" },
+          { field: "nick", title: "昵称", align: "center", width: "5%" },
+          {
+            field: "partitionName",
+            title: "分区",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "createTime",
+            title: "创建时间",
+            align: "center",
+            valign: "middle",
+            width: "10%",
+          },
+          { field: "channel", title: "渠道", align: "center", width: "5%" },
+          {
+            field: "localCurrencyCode",
+            title: "当地货币代码",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "localAmount",
+            title: "当地金额",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "chargeRecordId",
+            title: "商户订单号",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "pingxxChargeId",
+            title: "第三方订单号",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "status",
+            title: "状态",
+            align: "center",
+            width: "5%",
+            formatter: function (val, row, index) {
+              return val == 2 ? "充值成功" : "发起充值";
+            },
+          },
+          {
+            field: "newUser",
+            title: "是否新用户",
+            align: "center",
+            width: "5%",
+            formatter: function (val, row, index) {
+              return val ? "是" : "否";
+            },
+          },
+          {
+            field: "appChannel",
+            title: "app渠道",
+            align: "center",
+            width: "5%",
+          },
+        ],
+        undefinedText: "-",
+        cache: false,
+        striped: true,
+        showRefresh: false,
+        pageSize: 20,
+        pagination: true,
+        pageList: [20, 50, 100, 200, 300, 500],
+        search: false,
+        sidePagination: "server",
+        queryParamsType: "undefined",
+        data: [], // 初始化为空数据
+      });
+
+      // 查询刷新
+      $("#btnSearch").on("click", function () {
+        const params = {
+          pageNumber: 1,
+          pageSize: 20,
+          erbanNo: $("#qErbanNo").val(),
+          channel: $("#qChannel").val(),
+          startTime: $("#qStartTime").val(),
+          endTime: $("#qEndTime").val(),
+          status: $("#qStatus").val(),
+          newUser: $("#qNewUser").val(),
+          appChannel: $("#qAppChannel").val(),
+        };
+
+        // 手动加载数据
+        $.ajax({
+          type: "GET",
+          url: "/admin/chargeRecord/list",
+          contentType: "application/json;charset=utf-8",
+          dataType: "json",
+          data: params,
+          success: function (res) {
+            if (apiResult(res)) {
+              $("#table").bootstrapTable("load", {
+                rows: res.data.rows,
+                total: res.data.total,
+              });
+
+              $("#mapObjHtml span").remove();
+              const totalMap = res.data.totalMap;
+              let str = "";
+              const sortedKeys = Object.keys(totalMap).sort((keyA, keyB) => {
+                return keyA === "总充值{USD}"
+                  ? -1
+                  : keyB === "总充值{USD}"
+                  ? 1
+                  : 0;
+              });
+              for (const key of sortedKeys) {
+                str += `
+              <span style="margin-right:10px;display: inline-block;font-size: 18px;color: #2049a9;" type="text">${key}: ${totalMap[key]}, </span>
+            `;
+              }
+              $("#mapObjHtml").append(str);
+            }
+          },
+          error: function (req) {
+            serverError(req);
+          },
+        });
+      });
+
+      function serverError(req) {
+        $("#tipMsg").text(req.responseJSON.message);
+        $("#tipModal").modal("show");
+      }
+
+      function apiResult(json) {
+        if (json.code == 200 && json.message == "success") {
+          return true;
+        }
+        $("#tipMsg").text("请求失败，错误信息：" + json.message);
+        $("#tipModal").modal("show");
+        return false;
+      }
+
+      // 导出excel
+      $("#btnExport").on("click", function () {
+        const form = $("#form2");
+        form.attr("action", "/admin/chargeRecord/exportChargeDetail");
+        $("#exportErbanNo").val($("#qErbanNo").val());
+        $("#exportChannel").val($("#qChannel").val());
+        $("#exportStartTime").val($("#qStartTime").val());
+        $("#exportEndTime").val($("#qEndTime").val());
+        $("#exportStatus").val($("#qStatus").val());
+        $("#exportNewUser").val($("#qNewUser").val());
+        $("#exportAppChannel").val($("#qAppChannel").val());
+
+        form.submit();
+      });
+    },
+  },
 };
 </script>
 

src/views/refund/UserRefundQuiry.vue

@@ -0,0 +1,410 @@
+<template>
+  <div class="box">
+    <!-- 分区 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 平台ID -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 充值订单号 -->
+    <div class="inquire">
+      <span>充值订单号</span>
+      <el-input
+        v-model="inquire.rechargeNumber"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 第三方订单号 -->
+    <div class="inquire">
+      <span>第三方订单号</span>
+      <el-input
+        v-model="inquire.partyNumber"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 国家 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">国家</span>
+        <el-select
+          v-model="inquire.country"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.countryArr"
+            :key="item.id"
+            :label="item.regionDesc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 状态 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">状态</span>
+        <el-select
+          v-model="inquire.status"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.statusArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 平台 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">平台</span>
+        <el-select
+          v-model="inquire.platform"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.platformArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 支付渠道 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">支付渠道</span>
+        <el-select
+          v-model="inquire.paymentChannels"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.paymentChannelsArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">时间</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >搜索</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = inquire.partitionArr[0].id;
+        inquire.userId = '';
+        inquire.rechargeNumber = '';
+        inquire.partyNumber = '';
+        inquire.country = inquire.countryArr[0].id;
+        inquire.status = 0;
+        inquire.platform = '';
+        inquire.paymentChannels = '';
+        inquire.time = '';
+        getData();
+      "
+      >重置搜索</el-button
+    >
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
+      >导出</el-button
+    >
+    <div>
+      <el-button v-for="(value, key) in sortedMapObj" :key="key" type="text"
+        >{{ key }}: {{ value }},
+      </el-button>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="chargeStatusDesc" align="center" label="支付状态">
+      </el-table-column>
+      <el-table-column prop="chargeRecordId" align="center" label="订单ID" />
+      <el-table-column
+        prop="pingxxChargeId"
+        align="center"
+        label="第三方订单ID"
+      />
+      <el-table-column prop="channel" align="center" label="充值渠道" />
+      <el-table-column prop="erbanNo" align="center" label="平台ID" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="partitionDesc" align="center" label="地区" />
+      <el-table-column prop="phone" align="center" label="电话" />
+      <el-table-column prop="os" align="center" label="平台" />
+      <el-table-column prop="genderDesc" align="center" label="性别" />
+      <el-table-column prop="chargeIp" align="center" label="用户IP" />
+      <el-table-column prop="totalGold" align="center" label="金币数量" />
+      <el-table-column prop="amount" align="center" label="花费金额（USD）" />
+      <el-table-column
+        prop="localCurrencyCode"
+        align="center"
+        label="当地货币代码"
+      />
+      <el-table-column
+        prop="localAmount"
+        align="center"
+        label="当地货币花费金额"
+      />
+      <el-table-column prop="createTime" align="center" label="购买时间" />
+      <el-table-column prop="successTime" align="center" label="回调时间" />
+      <el-table-column prop="successTime" align="center" label="退款时间" />
+      <el-table-column prop="amount" align="center" label="退款金额" />
+      <el-table-column
+        prop="refundDesc"
+        align="center"
+        label="状态"
+      ></el-table-column>
+      <el-table-column prop="regionName" align="center" label="国家" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  refundList,
+  regionInfoList,
+  refundExport,
+} from "@/api/refund/refund";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "userRefundQuiry",
+  computed: {
+    sortedMapObj() {
+      const entries = Object.entries(this.mapObj);
+      // 将 "总充值{USD}" 的键排到第一位
+      entries.sort(([keyA], [keyB]) =>
+        keyA === "总充值{USD}" ? -1 : keyB === "总充值{USD}" ? 1 : 0
+      );
+      return Object.fromEntries(entries);
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      delDialog: false,
+      delDialogData: null,
+      mapObj: {},
+      //查询所需条件对象
+      inquire: {
+        partitionId: 0,
+        partitionArr: [],
+        userId: "",
+        rechargeNumber: "",
+        partyNumber: "",
+        country: "",
+        countryArr: [],
+        status: "",
+        statusArr: [
+          { desc: "全部", id: 0 },
+          { desc: "退款中", id: 2 },
+          { desc: "退款成功", id: 1 },
+          { desc: "退款失败", id: 3 },
+        ],
+        platform: "",
+        platformArr: [
+          { desc: "全部", id: "" },
+          { desc: "Android", id: "android" },
+          { desc: "iOS", id: "iOS" },
+        ],
+        paymentChannels: "",
+        paymentChannelsArr: [
+          { desc: "google内购", id: "google_play_billing" },
+          { desc: "payermax", id: "payermax" },
+          { desc: "myCard", id: "MyCard" },
+          { desc: "startPay", id: "start_pay" },
+          { desc: "ios内购", id: "ios_pay" },
+          { desc: "对公打款", id: "company" },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+    regionInfoList().then((res) => {
+      this.inquire.countryArr = res.data;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59");
+      }
+      refundList({
+        partitionId: this.inquire.partitionId,
+        channel: this.inquire.paymentChannels,
+        chargeRecordId: this.inquire.rechargeNumber,
+        pingxxChargeId: this.inquire.partyNumber,
+        refundStatus: this.inquire.status,
+        regionId: this.inquire.country,
+        os: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.mapObj = res.data.totalMap;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    jsonFun(val) {
+      return JSON.parse(val);
+    },
+    exportInfoFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59");
+      }
+      refundExport({
+        partitionId: this.inquire.partitionId,
+        channel: this.inquire.paymentChannels,
+        chargeRecordId: this.inquire.rechargeNumber,
+        pingxxChargeId: this.inquire.partyNumber,
+        refundStatus: this.inquire.status,
+        regionId: this.inquire.country,
+        os: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then();
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 10px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/room/RoomTabHomeView.vue

@@ -8,36 +8,39 @@
         </section>
         <div id="toolbar">
           <div class="col-sm-12">
-            <label for="erbanNo"
+            <label for="erbanNo" class="col-sm-2 control-label"
-                   class="col-sm-2 control-label">房主平台号:</label>
+              >房主平台号:</label
+            >
             <div class="col-sm-2">
-              <input type="text"
+              <input
-                     class="form-control"
+                type="text"
-                     name="erbanNo"
+                class="form-control"
-                     id="erbanNo"
+                name="erbanNo"
-                     placeholder="">
+                id="erbanNo"
+                placeholder=""
+              />
             </div>
-            <label for="roomTitle"
+            <label for="roomTitle" class="col-sm-2 control-label"
-                   class="col-sm-2 control-label">房间标题:</label>
+              >房间标题:</label
+            >
             <div class="col-sm-2">
-              <input type="text"
+              <input
-                     class="form-control"
+                type="text"
-                     name="roomTitle"
+                class="form-control"
-                     id="roomTitle"
+                name="roomTitle"
-                     placeholder="">
+                id="roomTitle"
+                placeholder=""
+              />
             </div>
-            <label for="partitionId"
+            <label for="partitionId" class="col-sm-1 control-label"
-                   class="col-sm-1 control-label">地区:</label>
+              >地区:</label
+            >
             <div class="col-sm-2">
-              <select name="partitionId"
+              <select name="partitionId" id="partitionId" class="form-control">
-                      id="partitionId"
+                <option value="4" selected>华语区</option>
-                      class="form-control">
-                <option value="4"
-                        selected>华语区</option>
               </select>
             </div>
-            <button id="btnSearch"
+            <button id="btnSearch" class="btn btn-default">
-                    class="btn btn-default">
               <i class="glyphicon glyphicon-search"></i>查询
             </button>
           </div>
@@ -46,44 +49,40 @@
 
       <!-- .content -->
       <div id="table"></div>
-
     </div>
   </section>
 
   <!-- 编辑弹框 -->
-  <div class="modal fade"
+  <div
-       id="roomTabHomeModal"
+    class="modal fade"
-       tabindex="-1"
+    id="roomTabHomeModal"
-       role="dialog"
+    tabindex="-1"
-       aria-labelledby="modalLabel">
+    role="dialog"
-    <div class="modal-dialog"
+    aria-labelledby="modalLabel"
-         role="document">
+  >
+    <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button"
+          <button
-                  class="close"
+            type="button"
-                  data-dismiss="modal"
+            class="close"
-                  aria-label="Close"><span aria-hidden="true">&times;</span>
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+            <span aria-hidden="true">&times;</span>
           </button>
-          <h4 class="modal-title"
+          <h4 class="modal-title" id="modalLabel">编辑</h4>
-              id="modalLabel">编辑</h4>
         </div>
         <div class="modal-body">
-          <form class="form-horizontal"
+          <form class="form-horizontal" id="addForm">
-                id="addForm">
+            <input type="hidden" name="id" id="id" />
-            <input type="hidden"
+            <input type="hidden" name="roomUid" id="roomUid" />
-                   name="id"
-                   id="id" />
-            <input type="hidden"
-                   name="roomUid"
-                   id="roomUid" />
             <div class="form-group">
-              <label for="modal_isTop"
+              <label for="modal_isTop" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">是否置顶<font color="red">*</font>：</label>
+                >是否置顶<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <select name="isTop"
+                <select name="isTop" id="modal_isTop" class="form-control">
-                        id="modal_isTop"
-                        class="form-control">
                   <option value=""></option>
                   <option value="1">是</option>
                   <option value="0">否</option>
@@ -91,45 +90,69 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_seq"
+              <label for="modal_type" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶排序<font color="red">*</font>:</label>
+                >房间类型：<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <select name="type" id="modal_type" class="form-control">
-                       class="form-control"
+                  <option value="1">客服房间</option>
-                       name="seq"
+                  <option value="2">热门房间</option>
-                       id="modal_seq"
+                </select>
-                       placeholder="数字小的排前面，必填">
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_topStart"
+              <label for="modal_seq" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶开始时间<font color="red">*</font>
+                >置顶排序调整为位置排序<font color="red">*</font>:</label
-                :</label>
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
-                       class="input-sm form-control datetime"
+                  type="number"
-                       name="topStart"
+                  class="form-control"
-                       id="modal_topStart">
+                  name="seq"
+                  id="modal_seq"
+                  min="1"
+                  max="5"
+                  placeholder="填入的数字=在首页的第几个位置"
+                  oninput="this.value = Math.min(Math.max(this.value, 1), 5)"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_topEnd"
+              <label for="modal_topStart" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶结束时间<font color="red">*</font>
+                >置顶开始时间<font color="red">*</font> :</label
-                :</label>
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
-                       class="input-sm form-control datetime"
+                  type="text"
-                       name="topEnd"
+                  class="input-sm form-control datetime"
-                       id="modal_topEnd">
+                  name="topStart"
+                  id="modal_topStart"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_isShow"
+              <label for="modal_topEnd" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">是否在App首页展示<font color="red">*</font>：</label>
+                >置顶结束时间<font color="red">*</font> :</label
+              >
               <div class="col-sm-9">
-                <select name="isShow"
+                <input
-                        id="modal_isShow"
+                  type="text"
-                        class="form-control validate[required]">
+                  class="input-sm form-control datetime"
+                  name="topEnd"
+                  id="modal_topEnd"
+                />
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="modal_isShow" class="col-sm-3 control-label"
+                >是否在App首页展示<font color="red">*</font>：</label
+              >
+              <div class="col-sm-9">
+                <select
+                  name="isShow"
+                  id="modal_isShow"
+                  class="form-control validate[required]"
+                >
                   <option value="1">是</option>
                   <option value="0">否</option>
                 </select>
@@ -138,24 +161,23 @@
           </form>
         </div>
         <div class="modal-footer">
-          <button type="button"
+          <button type="button" class="btn btn-default" data-dismiss="modal">
-                  class="btn btn-default"
+            关闭
-                  data-dismiss="modal">关闭</button>
+          </button>
-          <button type="button"
+          <button type="button" class="btn btn-primary" id="btnConfirm">
-                  class="btn btn-primary"
+            确定
-                  id="btnConfirm">确定</button>
+          </button>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-import { formatTime } from '@/utils/maintainer';
+import { formatTime } from "@/utils/maintainer";
-import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { getPartitionInfoList } from "@/api/partition/partitionInfo";
-import { buildSelectOption } from '@/utils/system-helper';
+import { buildSelectOption } from "@/utils/system-helper";
 
 // tab类型选择变化查询
 /*function selectOnTabChange(obj){
@@ -164,115 +186,173 @@ import { buildSelectOption } from '@/utils/system-helper';
 }*/
 export default {
   name: "RoomTabHomeView",
-  setup () {
+  setup() {
     return {};
   },
-  created () {
+  created() {
     this.$nextTick(function () {
       this.initPartition();
       this.initData();
     });
   },
   methods: {
-    initData () {
+    initData() {
       $(function () {
-        $('.datetime').datetimepicker({
+        $(".datetime").datetimepicker({
-          format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
-          autoclose: true
+          autoclose: true,
         });
 
-        $('#table').bootstrapTable('destroy');
+        $("#table").bootstrapTable("destroy");
-        $('#table').bootstrapTable({
+        $("#table").bootstrapTable({
           columns: [
-            { field: 'erbanNo', title: '房主平台号', align: 'center', width: '5%' },
-            { field: 'roomUid', title: '房主Uid', align: 'center', width: '5%' },
-            { field: 'roomTitle', title: '房间标题', align: 'center', width: '8%' },
-            { field: 'roomTag', title: '房间标签', align: 'center', width: '5%' },
             {
-              field: 'isPermitRoom',
+              field: "erbanNo",
-              title: '房间类型',
+              title: "房主平台号",
-              align: 'center',
+              align: "center",
-              width: '5%',
+              width: "5%",
+            },
+            {
+              field: "roomUid",
+              title: "房主Uid",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "roomTitle",
+              title: "房间标题",
+              align: "center",
+              width: "8%",
+            },
+            {
+              field: "roomTag",
+              title: "房间标签",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "isPermitRoom",
+              title: "房间类型",
+              align: "center",
+              width: "5%",
               formatter: function (val, row, index) {
-                let value = '';
+                let value = "";
                 if (val == 1) {
-                  value = '牌照房';
+                  value = "牌照房";
                 } else if (val == 4) {
-                  value = '个播房';
+                  value = "个播房";
                 } else {
-                  value = '非牌照房';
+                  value = "非牌照房";
                 }
                 return value;
-              }
+              },
             },
             {
-              field: 'avatar',
+              field: "avatar",
-              title: '图标内容',
+              title: "图标内容",
-              align: 'center',
+              align: "center",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 return "<img src='" + val + "' width='40' height='40'>";
-              }
+              },
             },
             {
-              field: 'isTop',
+              field: "isTop",
-              title: '是否置顶',
+              title: "是否置顶",
-              align: 'center',
+              align: "center",
-              valign: 'middle',
+              valign: "middle",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 if (val == 1) {
-                  return '是';
+                  return "是";
                 } else if (val == 0) {
-                  return '否';
+                  return "否";
                 }
-                return '否';
+                return "否";
-              }
+              },
             },
             {
-              field: 'isShow',
+              field: "isShow",
-              title: '是否在App首页展示',
+              title: "是否在App首页展示",
-              align: 'center',
+              align: "center",
-              valign: 'middle',
+              valign: "middle",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 if (val == 1) {
-                  return '是';
+                  return "是";
                 } else if (val == 0) {
-                  return '否';
+                  return "否";
                 }
-                return '是';
+                return "是";
-              }
+              },
             },
-            { field: 'seq', title: '置顶排序', align: 'center', width: '5%' },
+            { field: "seq", title: "置顶排序", align: "center", width: "5%" },
-            { field: 'topStart', title: '置顶开始时间', align: 'center', valign: 'middle', width: '10%', formatter: formatTime },
-            { field: 'topEnd', title: '置顶结束时间', align: 'center', valign: 'middle', width: '10%', formatter: formatTime },
             {
-              field: 'isHourTop1', title: '小时榜top1', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+              field: "topStart",
-                return val ? '是' : '否';
+              title: "置顶开始时间",
-              }
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: formatTime,
             },
             {
-              field: 'isHourTop1', title: '周榜top1', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+              field: "topEnd",
-                return val ? '是' : '否';
+              title: "置顶结束时间",
-              }
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: formatTime,
             },
             {
-              field: 'micUserCount', title: '麦上人数', align: 'center', valign: 'middle', width: '10%'
+              field: "isHourTop1",
-            },
+              title: "小时榜top1",
-            {
+              align: "center",
-              field: 'onlineNum', title: '房间人数', align: 'center', valign: 'middle', width: '10%'
+              valign: "middle",
-            },
+              width: "10%",
-            {
-              field: 'id',
-              title: '操作',
-              align: 'center',
-              width: '10%',
               formatter: function (val, row, index) {
-                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' + val + '" data-index="' + index + '">' +
+                return val ? "是" : "否";
-                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>';
+              },
-              }
+            },
-            }
+            {
+              field: "isHourTop1",
+              title: "周榜top1",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: function (val, row, index) {
+                return val ? "是" : "否";
+              },
+            },
+            {
+              field: "micUserCount",
+              title: "麦上人数",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+            },
+            {
+              field: "onlineNum",
+              title: "房间人数",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+            },
+            {
+              field: "id",
+              title: "操作",
+              align: "center",
+              width: "10%",
+              formatter: function (val, row, index) {
+                return (
+                  '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' +
+                  val +
+                  '" data-index="' +
+                  index +
+                  '">' +
+                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>'
+                );
+              },
+            },
           ],
           undefinedText: "",
           cache: false,
@@ -281,51 +361,55 @@ export default {
           search: false,
           sidePagination: "server", //表示服务端请求
           queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
+          queryParams: function queryParams(params) {
+            //设置查询参数
             var param = {
               page: params.pageNumber,
               pageSize: params.pageSize,
-              erbanNo: $('#erbanNo').val(),
+              erbanNo: $("#erbanNo").val(),
-              roomTitle: $('#roomTitle').val(),
+              roomTitle: $("#roomTitle").val(),
-              partitionId: $('#partitionId').val(),
+              partitionId: $("#partitionId").val(),
             };
             console.log(param);
             return param;
           },
-          url: '/admin/roomTabHome/list',
+          url: "/admin/roomTabHome/list",
           responseHandler: function (data) {
-            console.info(111, data)
+            console.info(111, data);
             if (data.code === 200) {
-              return { "rows": data.data, "total": data.data.length };
+              return { rows: data.data, total: data.data.length };
             } else {
-              return { "rows": [], "total": 0 };
+              return { rows: [], total: 0 };
             }
           },
-          toolbar: '#toolbar',
+          toolbar: "#toolbar",
-          onLoadSuccess: function () {  //加载成功时执行
+          onLoadSuccess: function () {
+            //加载成功时执行
             console.log("load success");
           },
-          onLoadError: function () {  //加载失败时执行
+          onLoadError: function () {
+            //加载失败时执行
             console.log("load fail");
-          }
+          },
         });
 
         // 查询刷新
-        $('#btnSearch').on('click', function () {
+        $("#btnSearch").on("click", function () {
-          TableHelper.doRefresh('#table');
+          TableHelper.doRefresh("#table");
         });
 
         // 编辑或者新增
         $("#btnConfirm").click(function () {
           var id = $("#id").val();
-          var roomUid = $('#roomUid').val();
+          var roomUid = $("#roomUid").val();
           var seq = $("#modal_seq").val();
           var isTop = $("#modal_isTop").val();
+          var type = $("#modal_type").val();
           var iconContent = $("#modal_iconContent").val();
           var topStart = $("#modal_topStart").val();
           var topEnd = $("#modal_topEnd").val();
-          var isShow = $('#modal_isShow').val();
+          var isShow = $("#modal_isShow").val();
-          if ($("#addForm").validationEngine('validate')) {
+          if ($("#addForm").validationEngine("validate")) {
             $.ajax({
               type: "post",
               url: "/admin/roomTabHome/save",
@@ -343,34 +427,34 @@ export default {
               success: function (json) {
                 if (json.code == 200) {
                   $("#tipMsg").text("保存成功");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
-                  $("#roomTabHomeModal").modal('hide');
+                  $("#roomTabHomeModal").modal("hide");
                 } else {
                   $("#tipMsg").text("保存失败." + json.msg);
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
-                  $("#roomTabHomeModal").modal('hide');
+                  $("#roomTabHomeModal").modal("hide");
                 }
-              }
+              },
             });
           }
-
         });
 
         // 获取信息
-        $("#table").on("click", '.opt-edit', function () {
+        $("#table").on("click", ".opt-edit", function () {
           var id = $(this).attr("data-id");
-          const index = $(this).data('index');
+          const index = $(this).data("index");
-          const record = TableHelper.getData('#table')[index];
+          const record = TableHelper.getData("#table")[index];
           $("#id").val(null);
           $("#modal_seq").val(0);
           $("#modal_isTop").val(0);
-          $("#modal_topStart").val('');
+          $("#modal_type").val(0);
-          $("#modal_topEnd").val('');
+          $("#modal_topStart").val("");
+          $("#modal_topEnd").val("");
           $("#modal_isShow").val(0);
-          $('#roomUid').val(record.roomUid);
+          $("#roomUid").val(record.roomUid);
-          if (id && id != 'null') {
+          if (id && id != "null") {
             $.ajax({
               type: "get",
               url: "/admin/roomTabHome/get",
@@ -382,53 +466,53 @@ export default {
                   $("#id").val(id);
                   $("#modal_seq").val(json.seq);
                   $("#modal_isTop").val(json.isTop ? 1 : 0);
+                  $("#modal_type").val(json.type);
                   $("#modal_topStart").val(formatTime(json.topStart));
                   $("#modal_topEnd").val(formatTime(json.topEnd));
                   $("#modal_isShow").val(json.isShow ? 1 : 0);
                 } else {
                   $("#tipMsg").text("获取菜单信息出错");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                 }
-              }
+              },
             });
           }
           // 打开编辑弹窗
-          $("#roomTabHomeModal").modal('show');
+          $("#roomTabHomeModal").modal("show");
           $("#modalLabel").text("编辑");
         });
 
         // 删除操作
-        $("#table").on("click", '.opt-remove', function () {
+        $("#table").on("click", ".opt-remove", function () {
           var id = $(this).attr("data-id");
-          if (id == 'undefined') {
+          if (id == "undefined") {
             $("#tipMsg").text("id参数有误");
-            $("#tipModal").modal('show');
+            $("#tipModal").modal("show");
             return;
           }
           if (confirm("你确认删除吗? \r\n 删除后不会恢复，请谨慎操作！")) {
             $.ajax({
-              type: 'post',
+              type: "post",
               url: "/admin/roomTabHome/delete",
               data: { id: id },
               dataType: "json",
               success: function (json) {
                 if (json.code == 200) {
                   $("#tipMsg").text("删除成功");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
                 } else {
                   $("#tipMsg").text("删除失败");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                 }
-              }
+              },
             });
           }
         });
-
       });
     },
-    initPartition () {
+    initPartition() {
-      getPartitionInfoList().then(res => {
+      getPartitionInfoList().then((res) => {
         let data = res.data;
         buildSelectOption(
           "#partitionId",

src/views/room/RoomtagAdminView.vue

@@ -103,6 +103,12 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="en_modal_name">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="tr_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="tr_modal_name">
+                            </div>
+                        </div>
                         <!-- 上传act图片 -->
                         <div class="form-group">
                             <label class="col-sm-3 control-label">图片:</label>
@@ -214,6 +220,7 @@ export default {
                         {field: 'name.zh', title: '名称', align: 'center', width: '10%'},
                         {field: 'name.ar', title: '阿语名称', align: 'center', width: '10%'},
                         {field: 'name.en', title: '英语名称', align: 'center', width: '10%'},
+                        {field: 'name.tr', title: '土耳其名称', align: 'center', width: '10%'},
                         {field: 'pict', title: '图片', align:'center', width: '10%',valign:'center',
                             formatter: function (val,row,index) {
                                 if(null == val || val == '') {
@@ -390,6 +397,7 @@ export default {
                     $("#modal_name").val("");
                     $("#ar_modal_name").val("");
                     $("#en_modal_name").val("");
+                    $("#tr_modal_name").val("");
                     $("#modal_seq").val("");
                     $("#modal_status").val("");
                     $("#modal_type").val("");
@@ -409,8 +417,10 @@ export default {
                     var ar_name = $("#ar_modal_name").val();
                     // 英语名称
                     var en_name = $("#en_modal_name").val();
+                    // 土耳其名称
+                    var tr_name = $("#tr_modal_name").val();
                     // 国际化字段
-                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name}
                     const nameValue = JSON.stringify(jsonName);
                     var seq = $("#modal_seq").val();
                     var status = $("#modal_status").val();
@@ -483,12 +493,16 @@ export default {
                                     $("#ar_modal_name").val(jsonName.ar);
                                     // 英语名称
                                     $("#en_modal_name").val(jsonName.en);
+                                    // 土耳其名称
+                                    $("#tr_modal_name").val(jsonName.tr);
                                 } else {
                                     $("#modal_name").val(name);
                                     // 阿语名称
                                     $("#ar_modal_name").val(name);
                                     // 英语名称
                                     $("#en_modal_name").val(name); 
+                                    // 土耳其名称
+                                    $("#tr_modal_name").val(name); 
                                 }
                                 
                                 $("#modal_seq").val(json.seq);

src/views/roomBackground/roomBackground.vue

@@ -300,7 +300,6 @@
         >
           <!-- 这里是原来的图片预览 -->
           <el-image
-            
             style="width: 100px; height: 100px"
             :src="dialogObj.imageUrl2"
             :zoom-rate="1.1"
@@ -415,6 +414,7 @@ export default {
     listPartitionInfo().then((res) => {
       console.log(res);
       this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
       this.getData();
     });
   },

src/views/roomBackground/roomBackgroundCustom.vue

@@ -224,6 +224,7 @@ export default {
     listPartitionInfo().then((res) => {
       console.log(res);
       this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
       this.getData();
     });
   },

src/views/system/I18nMessageAdminView.vue

@@ -60,6 +60,13 @@
                                     v-model="i18nMessage.ar" />
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ar" class="col-sm-3 control-label">土耳其:</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control validate[required]" name="tr" id="tr"
+                                    v-model="i18nMessage.tr" />
+                            </div>
+                        </div>
                     </form>
                 </div>
                 <div class="modal-footer">
@@ -84,6 +91,7 @@ export default {
                 { field: 'zh', title: '华语', align: 'center', width: '15%' },
                 { field: 'en', title: '英语', align: 'center', width: '15%' },
                 { field: 'ar', title: '阿语', align: 'center', width: '15%' },
+                { field: 'tr', title: '土耳其', align: 'center', width: '15%' },
                 {
                     field: 'key',
                     title: '操作',
@@ -151,6 +159,7 @@ export default {
             this.i18nMessage.zh = '';
             this.i18nMessage.en = '';
             this.i18nMessage.ar = '';
+            this.i18nMessage.tr = '';
             $('#editModal').modal('show');
         },
         edit(obj) {
@@ -160,6 +169,7 @@ export default {
             this.i18nMessage.zh = record.zh;
             this.i18nMessage.en = record.en;
             this.i18nMessage.ar = record.ar;
+            this.i18nMessage.tr = record.tr;
             $('#editModal').modal('show');
         },
         save() {

src/views/users/ChargeRecordTrPartitionStatisticsView.vue

@@ -0,0 +1,161 @@
+<template>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <section class="content-body">
+          <div id="toolbar">
+            <div class="col-sm-12">
+              <div class="pull-left">
+                <form id="searchForm"
+                      class="col-sm-pull-12"
+                      action="/admin/chargeRecord/exportPartitionDetail"
+                      method="get"
+                      target="_blank">
+                  <div class="col-sm-11">
+                    <input type="number"
+                           name="partitionId"
+                           value="8"
+                           hidden />
+                    <label for="beginDate"
+                           class="col-sm-2 control-label">开始日期:</label>
+                    <div class="col-sm-4"><input type="text"
+                             class="form-control"
+                             name="beginDate"
+                             id="beginDate"
+                             placeholder="必填"></div>
+                    <label for="endDate"
+                           class="col-sm-2 control-label">结束日期:</label>
+                    <div class="col-sm-4"><input type="text"
+                             class="form-control"
+                             name="endDate"
+                             id="endDate"
+                             placeholder="必填"></div>
+                  </div>
+                </form>
+              </div>
+              <div class="pull-right">
+                <button id="btnSearch"
+                        class="btn btn-default">
+                  <i class="glyphicon glyphicon-search"></i>查询
+                </button>
+                <button id="btnExport"
+                        class="btn btn-default">
+                  <i class="glyphicon glyphicon-export"></i>导出
+                </button>
+              </div>
+
+            </div>
+          </div>
+
+          <!-- .content -->
+          <div id="table"></div>
+        </section>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script>
+import TableHelper from '@/utils/bootstrap-table-helper';
+
+export default {
+  name: "ChargeRecordTrPartitionStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+
+      $(function () {
+        var chargeStart = $('#beginDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
+        chargeStart.datepicker("setDate", new Date(new Date() - 7 * 24 * 60 * 60 * 1000))
+
+        var chargeEnd = $('#endDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
+        chargeEnd.datepicker("setDate", new Date())
+
+        chargeStart.on('changeDate', function () {
+          var date = $('#beginDate').datepicker('getDate');
+          chargeEnd.datepicker('setStartDate', date);
+        });
+        chargeEnd.on('changeDate', function () {
+          var date = $('#endDate').datepicker('getDate');
+          chargeStart.datepicker('setEndDate', date);
+        });
+
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'date', title: '日期', align: 'center', width: '14%' },
+            { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '14%' },
+            { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '14%' },
+            { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '14%' },
+            { field: 'startPayUsd', title: 'startPay充值美元', align: 'center', width: '14%' },
+            { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '14%' },
+            { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '14%' },
+            { field: 'totalUsd', title: '总充值美元', align: 'center', width: '14%' },
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pagination: false,
+          search: false,
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              partitionId: 8,
+              beginDate: $('#beginDate').val(),
+              endDate: $('#endDate').val()
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/partitionDetail',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
+        });
+
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          $("#searchForm").submit();
+        });
+
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          TableHelper.doRefresh('#table');
+        });
+      });
+    }
+  },
+
+};
+</script>
+
+<style scoped></style>

src/views/users/DiamondGiveHistoryView.vue

@@ -29,8 +29,8 @@
                             </div>
 
                             <label class="col-sm-2 control-label">统计时间:</label>
-                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime">
+                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"></div>
-                            </div><span class="col-sm-1">至</span>
+                            <span class="col-sm-1">至</span>
                             <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
 
                         </div>
@@ -111,24 +111,7 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
-var picker1 = $("#beginTime").datetimepicker({
+
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true,
-});
-var picker2 = $("#endTime").datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true
-});
-var picker3 = $('#editEndTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
-var picker4 = $('#editStartTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
 
 /*picker1.on('changeDate', function () {
     var date = $('#beginDate').datetimepicker('getDate');
@@ -290,7 +273,16 @@ export default {
                         console.log("load fail");
                     }
                 });
-
+                var picker1 = $("#beginTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true,
+                });
+                var picker2 = $("#endTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true
+                });
                 // 查询刷新
                 $('#btnSearch').on('click', function () {
                     TableHelper.doRefresh('#table');

src/views/users/GiftManageView.vue

@@ -156,6 +156,7 @@
                                 <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
                                 <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
                                 <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                                <input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
                             </div>
                         </div>
                         <div class="form-group">
@@ -188,6 +189,12 @@
                                 <input type="text" class="form-control validate[required]" name="giftName" id="giftEnName">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="giftTrName" class="col-sm-2 control-label">土耳其礼物名称</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control validate[required]" name="giftName" id="giftTrName">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="goldPrice" class="col-sm-2 control-label">礼物价格</label>
                             <div class="col-sm-10">
@@ -282,6 +289,22 @@
                                 <label class="radio-inline"><input type="radio" name="isLatest" value="1">是</label>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">是否需要全服通知</label>
+                            <div class="col-sm-3">
+                                <label class="radio-inline"><input type="radio" name="notifyFull" value="0" checked>否</label>
+                                <label class="radio-inline"><input type="radio" name="notifyFull" value="1">是</label>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">是否需要塞头像</label>
+                            <div class="col-sm-3">
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="0" checked>否</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="1">送礼者</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="2">收礼者</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="3">左送右收</label>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">限时礼物</label>
                             <div class="col-sm-3">
@@ -654,6 +677,7 @@ export default {
                         {field: 'giftName.zh', title: '礼物名称', align: 'center', width: '15%'},
                         {field: 'giftName.ar', title: '阿语礼物名称', align: 'center', width: '10%'},
                         {field: 'giftName.en', title: '英语礼物名称', align: 'center', width: '10%'},
+                        {field: 'giftName.tr', title: '土耳其礼物名称', align: 'center', width: '10%'},
                         {
                             field: 'partitionFlag', 
                             title: '地区', 
@@ -670,6 +694,9 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其<br>';
+                                }
                                 return value;
                             }
                         },
@@ -769,6 +796,36 @@ export default {
                                 }
                             }
                         },
+                        {
+                            field: 'notifyFull',
+                            title: '是否需要全服通知',
+                            align: 'center',
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                if (val == 1) {
+                                    return '是';
+                                } else {
+                                    return '否'
+                                }
+                            }
+                        },
+                        {
+                            field: 'showAvatarType',
+                            title: '是否需要塞头像',
+                            align: 'center',
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                if (val == 0) {
+                                    return '否';
+                                }else if (val == 1) {
+                                    return '送礼者';
+                                } else if (val == 2) {
+                                    return '收礼者';
+                                }else {
+                                    return '左送右收'
+                                }
+                            }
+                        },
                         {
                             field: 'roomExclude',
                             title: '房间专属',
@@ -961,6 +1018,8 @@ export default {
                     $("input:radio[name='hasSvga']")[0].checked = true;
                     $("input:radio[name='isLatest']")[0].checked = true;
                     $("input:radio[name='isTimeLimit']")[0].checked = true;
+                    $("input:radio[name='notifyFull']")[0].checked = true;
+                    $("input:radio[name='showAvatarType']")[0].checked = true;
                     $("input:radio[name='roomExclude']")[0].checked = true;
                     $("#notifyStaySecond").val('');
                     $("#isSkipRoom").val('');
@@ -1212,6 +1271,8 @@ export default {
                     $("input:radio[name='hasSvga']")[0].checked = true;
                     $("input:radio[name='isLatest']")[1].checked = true;
                     $("input:radio[name='isTimeLimit']")[1].checked = true;
+                    $("input:radio[name='notifyFull']")[0].checked = true;
+                    $("input:radio[name='showAvatarType']")[0].checked = true;
                     $("input:radio[name='roomExclude']")[0].checked = true;
                     $('#giftType').val('');
                     $("#notifyStaySecond").val('');
@@ -1248,12 +1309,16 @@ export default {
                                     $("#giftArName").val(jsonName.ar);
                                     // 英语名称
                                     $("#giftEnName").val(jsonName.en);
+                                    // 土耳其
+                                    $("#giftTrName").val(jsonName.tr);
                                 } else {
                                     $("#giftName").val(giftName);
                                     // 阿语名称
                                     $("#giftArName").val(giftName);
                                     // 英语名称
                                     $("#giftEnName").val(giftName);
+                                    // 土耳其名称
+                                    $("#giftTrName").val(giftName);
                                 }
                                 $("#goldPrice").val(json.entity.goldPrice);
 
@@ -1290,6 +1355,8 @@ export default {
                                 var hasSvga = parseNum(json.entity.hasSvga);
                                 var isLatest = parseNum(json.entity.isLatest);
                                 var isTimeLimit = parseNum(json.entity.isTimeLimit);
+                                var notifyFull = parseNum(json.entity.notifyFull);
+                                var showAvatarType = json.entity.showAvatarType;
                                 var isWholeServer = parseNum(json.entity.isWholeServer);
                                 var roomExclude = parseNum(json.entity.roomExclude);
                                 var partitionFlag = json.entity.partitionFlag;
@@ -1307,6 +1374,8 @@ export default {
                                 $("input:radio[name='hasSvga']")[hasSvga].checked = true;
                                 $("input:radio[name='isLatest']")[isLatest].checked = true;
                                 $("input:radio[name='isTimeLimit']")[isTimeLimit].checked = true;
+                                $("input:radio[name='notifyFull']")[notifyFull].checked = true;
+                                $("input:radio[name='showAvatarType']")[showAvatarType].checked = true;
                                 $("input:radio[name='isWholeServerLabel']")[isWholeServer].checked = true;
                                 $("input:radio[name='roomExclude']")[roomExclude].checked = true;
 
@@ -1396,8 +1465,10 @@ export default {
                         var ar_name = $("#giftArName").val();
                         // 英语名称
                         var en_name = $("#giftEnName").val();
+                        // 土耳其名称
+                        var tr_name = $("#giftTrName").val();
                         // 国际化字段
-                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name,'tr':tr_name}
                         const nameValue = JSON.stringify(jsonName);
                         // 修改属性值
                         formData.giftName = nameValue; // 将giftName修改为"newGiftName"

src/views/users/GiftSendRecordView.vue

@@ -14,15 +14,6 @@
                     <div id="toolbar">
                         送礼用户id：<input type="text" name="senderErbanNo" id="senderErbanNo" class="input-sm" />
                         收礼用户id：<input type="text" name="receiverErbanNo" id="receiverErbanNo" class="input-sm" />
-                        礼物类型：
-                        <select name="giftType" id="giftType">
-                            <option value="">全部</option>
-                            <option value="0">背包礼物</option>
-                            <option value="2">普通礼物</option>
-                            <option value="5">福袋奖池礼物</option>
-                            <option value="7">贵族礼物</option>
-                            <option value="8">周星榜礼物</option>
-                        </select>
                         礼物名称：<input type="text" name="giftName" id="giftName" class="input-sm" />
                         送礼时间：<input type="text" name="startTime" id="startTime" class="input-sm">
                         - <input type="text" name="endTime" id="endTime" class="input-sm">
@@ -50,7 +41,7 @@ export default {
     },
     methods: {
         initData() {
-            let tableLoaded = false;
+
             let currParams = {};
 
             $('#table').bootstrapTable('destroy');
@@ -83,9 +74,9 @@ export default {
                 cache: false,
                 striped: true,
                 showRefresh: false,
-                pageSize: 10,
+                pageSize: 30,
                 pagination: true,
-                pageList: [10, 20, 30, 50],
+                pageList: [30, 50, 100, 200],
                 sidePagination: "server", //表示服务端请求
                 //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
                 //设置为limit可以获取limit, offset, search, sort, order
@@ -110,11 +101,9 @@ export default {
                 url: '/admin/giftSendRecord/list',
                 onLoadSuccess: function () {  //加载成功时执行
                     console.log("load success");
-                    tableLoaded = true;
                 },
                 onLoadError: function () {  //加载失败时执行
                     console.log("load fail");
-                    tableLoaded = false;
                 }
             })
             $('#btnSearch').on('click', function () {
@@ -123,7 +112,6 @@ export default {
                 //     $("#tipModal").modal('show');
                 //     return;
                 // }
-                console.debug('ASDFASDF')
                 // if ($('#startTime').val() && $('#endTime').val()) {
                 //     var dateStart = new Date($('#startTime').val().replace(/\-/g, "/"));
                 //     var dateEnd = new Date($('#endTime').val().replace(/\-/g, "/"));
@@ -135,18 +123,24 @@ export default {
                 //         return;
                 //     }
                 // }
-                if (tableLoaded || currParams.pageNumber > 1) {
+                if (currParams.pageNumber > 1) {
                     TableHelper.doRefreshAndToPage1('#table');
                 } else {
                     TableHelper.doRefresh('#table');
                 }
             })
             var picker1 = $("#startTime").datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             var picker2 = $('#endTime').datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             picker1.on('changeDate', function () {