完成幸运礼物优化

package-lock.json

@@ -22,10 +22,12 @@
         "knockout": "^3.5.1",
         "less": "^4.2.0",
         "less-loader": "^11.1.3",
+        "moment-timezone": "^0.5.45",
         "node-sass": "^9.0.0",
         "popper.js": "^1.16.1",
         "sass": "^1.67.0",
         "sass-loader": "^13.3.2",
+        "svgaplayerweb": "^2.3.2",
         "unplugin-element-plus": "^0.8.0",
         "vue-clipboard2": "^0.3.3",
         "vue-router": "^4.0.3",
@@ -8974,6 +8976,25 @@
       "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
       "dev": true
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.45",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.45.tgz",
+      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
@@ -11970,6 +11991,11 @@
       "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
       "dev": true
     },
+    "node_modules/svgaplayerweb": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmmirror.com/svgaplayerweb/-/svgaplayerweb-2.3.2.tgz",
+      "integrity": "sha512-QuTvNIgy3W6Mi4h74SczEHUtAwb8m3ax7Ai7xRLUuN6hjJh49RGtWOWq1IuF2I7ECcl0HAYn8FcTn99UDz9UiQ=="
+    },
     "node_modules/svgo": {
       "version": "2.8.0",
       "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",

package.json

@@ -22,10 +22,12 @@
     "knockout": "^3.5.1",
     "less": "^4.2.0",
     "less-loader": "^11.1.3",
+    "moment-timezone": "^0.5.45",
     "node-sass": "^9.0.0",
     "popper.js": "^1.16.1",
     "sass": "^1.67.0",
     "sass-loader": "^13.3.2",
+    "svgaplayerweb": "^2.3.2",
     "unplugin-element-plus": "^0.8.0",
     "vue-clipboard2": "^0.3.3",
     "vue-router": "^4.0.3",

src/api/lingSmallGames/lingSmallGames.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 获取游戏列表
+export const sysConfKey = query => {
+    return request({
+        url: '/admin/sysConf/key',
+        method: 'get',
+        params: query
+    });
+};
+// 获取列表
+export const statisPage = query => {
+    return request({
+        url: '/admin/miniGame/leadercc/statis/page',
+        method: 'get',
+        params: query
+    });
+};
+// 获取详情列表
+export const detailPage = query => {
+    return request({
+        url: '/admin/miniGame/leadercc/statis/detailPage',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const exportForMiniGame = query => {
+    window.location.href = `/admin/miniGame/leadercc/statis/exportForMiniGame?${genQueryParam(query)}`;
+    return;
+};
+// 导出弹窗
+export const statisExport = query => {
+    window.location.href = `/admin/miniGame/leadercc/statis/export?${genQueryParam(query)}`;
+    return;
+};

src/api/luckGift/luckGift.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 奖池拉框
+export const listType = query => {
+    return request({
+        url: '/admin/lucky24/pool/listType',
+        method: 'get',
+        params: query
+    });
+};
+// 池子列表
+export const list = query => {
+    return request({
+        url: '/admin/lucky24/pool/list',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置
+export const getConfig = query => {
+    return request({
+        url: '/admin/lucky24/config/getConfig',
+        method: 'get',
+        params: query
+    });
+};
+// 基础配置-修改
+export const updateSet = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky24/config/update',
+        method: 'post',
+        data: query
+    });
+};
+// 个人数据
+export const personal = query => {
+    return request({
+        url: '/admin/lucky24/record/personal',
+        method: 'get',
+        params: query
+    });
+};
+// 汇总
+export const platform = query => {
+    return request({
+        url: '/admin/lucky24/record/platform',
+        method: 'get',
+        params: query
+    });
+};
+// 保存池子
+export const save = query => {
+    return request({
+        headers: { "Content-Type": 'application/json;charset=UTF-8' },
+        url: '/admin/lucky24/pool/save',
+        method: 'post',
+        data: query
+    });
+};
+// 赠送用户
+export const updateUserMulti = query => {
+    return request({
+        url: '/admin/lucky24/config/updateUserMulti',
+        method: 'post',
+        params: query
+    });
+};

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

@@ -4,8 +4,17 @@ 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 => {
+export const getDateCycleList = query => { 
     return request({
         url: '/anchorSalaryBill/dateCycle/list',
         method: 'get',
@@ -88,9 +97,16 @@ export const agencyWithdrawExamineExport = query => {
     });
 };
 // 官方提现记录 结算
+// export const agencyWithdrawSet = query => {
+//     return request({
+//         url: '/agencyWithdrawExamine/settle',
+//         method: 'post',
+//         params: query
+//     });
+// };
 export const agencyWithdrawSet = query => {
     return request({
-        url: '/agencyWithdrawExamine/settle',
+        url: '/agencyWithdrawExamine/batchSettle',
         method: 'post',
         params: query
     });
@@ -103,6 +119,14 @@ export const agencyWithdrawBatchSet = query => {
         params: query
     });
 };
+// 官方提现记录 批量驳回
+export const batchReject = query => {
+    return request({
+        url: '/agencyWithdrawExamine/batchReject',
+        method: 'post',
+        params: query
+    });
+};
 
 // 公会开业数据统计
 export const agencyOpenList = query => {
@@ -135,4 +159,27 @@ export const excellentAnchorDetail = query => {
         method: 'get',
         params: query
     });
+};
+// 官方提现-国家
+export const adminCountry = query => {
+    return request({
+        url: '/admin/country/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// =====================================钻石充值流水=======================================
+// 查询
+export const diamondStatistics = query => {
+    return request({
+        url: '/admin/guild/diamondStatistics',
+        method: 'get',
+        params: query
+    });
+};
+//  导出
+export const diamondStatisticsExport = query => {
+    window.location.href = `/admin/guild/diamondStatistics/export?${genQueryParam(query)}`;
+    return;
 };

src/api/relPrivilegeManage/relPrivilegeManage.js

@@ -35,7 +35,7 @@ export const prettyNumberExamineReject = query => {
 // 靓号导入
 export const erbanUpload = query => {
     return request({
-        url: '/prettyNumberExamine/erban/upload',
+        url: '/admin/prettyNumber/upload',
         method: 'post',
         headers: { 'Content-Type': 'multipart/form-data' },
         data: query

src/api/roomBackground/roomBackground.js

@@ -0,0 +1,87 @@
+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
+    });
+};
+// ==============================================首页ui配置==============================================
+// 配置
+export const appUiSetting = query => {
+    return request({
+        url: '/appUiSetting',
+        method: 'get',
+        params: query
+    });
+};
+// 保存
+export const appUiSettingSave = query => {
+    return request({
+        url: '/appUiSetting/save',
+        method: 'post',
+        data: query
+    });
+};
+// ==============================================自定义背景==============================================
+// 列表
+export const page = query => {
+    return request({
+        url: '/admin/roomBackground/page',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const roomBackgroundAdd = query => {
+    return request({
+        url: '/admin/roomBackground/add',
+        method: 'post',
+        params: query
+    });
+};
+// 编辑
+export const roomBackgroundUpdate = query => {
+    return request({
+        url: '/admin/roomBackground/update',
+        method: 'post',
+        params: query
+    });
+};
+// ==============================================自定义背景==============================================
+// 列表
+export const customPage = query => {
+    return request({
+        url: '/admin/roomBackground/custom/page',
+        method: 'get',
+        params: query
+    });
+};
+// 通过
+export const customPass = query => {
+    return request({
+        url: '/admin/roomBackground/custom/pass',
+        method: 'post',
+        params: query
+    });
+};
+// 拒绝
+export const customReject = query => {
+    return request({
+        url: '/admin/roomBackground/custom/reject',
+        method: 'post',
+        params: query
+    });
+};
+// 删除
+export const customDel = query => {
+    return request({
+        url: '/admin/roomBackground/custom/del',
+        method: 'post',
+        params: query
+    });
+};

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

@@ -3,52 +3,55 @@
     <div class="container">
       <div class="region-box">
         <el-radio-group v-model="region">
-          <el-radio
-            v-for="(item, index) in userAreaRegion"
-            :key="index"
-            :label="item.value"
-            >{{ item.name }}</el-radio
-          >
+          <el-radio v-for="(item, index) in userAreaRegion"
+                    :key="index"
+                    :label="item.value">{{ item.name }}</el-radio>
         </el-radio-group>
       </div>
       <div class="handle-box">
-        <el-form
-          ref="searchForm"
-          :model="searchForm"
-          label-width="90px"
-          :disabled="tableLoading"
-        >
+        <el-form ref="searchForm"
+                 :model="searchForm"
+                 label-width="90px"
+                 :disabled="tableLoading">
           <div class="search-line">
-            <el-form-item label="Shaker ID" prop="erbanNo">
-              <el-input
-                v-model.trim="searchForm.erbanNo"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="MoliStar ID"
+                          prop="erbanNo">
+              <el-input v-model.trim="searchForm.erbanNo"
+                        placeholder="Please enter"></el-input>
             </el-form-item>
-            <el-form-item label="UID" prop="uid">
-              <el-input
-                v-model.trim="searchForm.uid"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="UID"
+                          prop="uid">
+              <el-input v-model.trim="searchForm.uid"
+                        placeholder="Please enter"></el-input>
             </el-form-item>
-            <el-form-item label="SID" prop="sid">
-              <el-input
-                v-model.trim="searchForm.sid"
-                placeholder="Please enter"
-              ></el-input>
+            <el-form-item label="SID"
+                          prop="sid">
+              <el-input v-model.trim="searchForm.sid"
+                        placeholder="Please enter"></el-input>
+            </el-form-item>
+            <el-form-item label="Region"
+                          prop="partitionId">
+              <el-select v-model="searchForm.partitionId">
+                <el-option label="全部"
+                           value=""></el-option>
+                <el-option v-for="item in partitionInfoList"
+                           :key="item.id"
+                           :label="item.desc"
+                           :value="item.id"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label-width="40px">
-              <el-button type="primary" @click="handSearch">Search</el-button>
-              <el-button plain @click="resetSearchForm">Reset Search</el-button>
-              <el-upload
-                class="file-uploader"
-                action="#"
-                list-type="picture-card"
-                :show-file-list="false"
-                :on-change="handleExcel"
-                accept=".xls, .xlsx"
-                :auto-upload="false"
-              >
+              <el-button type="primary"
+                         @click="handSearch">Search</el-button>
+              <el-button plain
+                         @click="resetSearchForm">Reset Search</el-button>
+              <el-upload class="file-uploader"
+                         action="#"
+                         list-type="picture-card"
+                         :show-file-list="false"
+                         :on-change="handleExcel"
+                         accept=".xls, .xlsx"
+                         :auto-upload="false">
                 <el-button type="primary">Import</el-button>
               </el-upload>
             </el-form-item>
@@ -67,76 +70,93 @@
         </el-upload> -->
       </div>
       <div class="table">
-        <el-table
-          :data="tableData"
-          border
-          v-loading="tableLoading"
-          @header-click="headerCopy"
-          style="width: 100%"
-        >
-          <el-table-column align="center" prop="id" label="No.">
+        <el-table :data="tableData"
+                  border
+                  v-loading="tableLoading"
+                  @header-click="headerCopy"
+                  style="width: 100%">
+          <el-table-column align="center"
+                           prop="id"
+                           label="No.">
           </el-table-column>
-          <el-table-column align="center" prop="erbanNo" label="Shaker ID">
+          <el-table-column align="center"
+                           prop="erbanNo"
+                           label="MoliStar ID">
           </el-table-column>
-          <el-table-column align="center" prop="uid" label="UID">
+          <el-table-column align="center"
+                           prop="uid"
+                           label="UID">
           </el-table-column>
-          <el-table-column align="center" prop="level" label="SID Level">
+          <el-table-column align="center"
+                           prop="level"
+                           label="SID Level">
           </el-table-column>
-          <el-table-column align="center" prop="nick" label="Nickname">
+          <el-table-column align="center"
+                           prop="nick"
+                           label="Nickname">
           </el-table-column>
-          <el-table-column align="center" prop="createTime" label="Apply time">
+          <el-table-column align="center"
+                           prop="partitionInfo"
+                           label="Region">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="Apply time">
             <template v-slot="scope">{{
               convertTimestamp(scope.row.createTime)
             }}</template>
           </el-table-column>
-          <el-table-column align="center" prop="prettyNo" label="SID">
+          <el-table-column align="center"
+                           prop="prettyNo"
+                           label="SID">
           </el-table-column>
-          <el-table-column align="center" prop="status" label="State">
+          <el-table-column align="center"
+                           prop="status"
+                           label="State">
             <template v-slot="scope">
               <el-tag :type="applyStateTag(scope.row.status)">{{
                 applyStateText(scope.row.status)
               }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="updateTime" label="Review time">
+          <el-table-column align="center"
+                           prop="updateTime"
+                           label="Review time">
             <template v-slot="scope">{{
               convertTimestamp(scope.row.updateTime)
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="Operate">
+          <el-table-column align="center"
+                           prop="operater"
+                           label="Operator">
+          </el-table-column>
+          <el-table-column align="center"
+                           label="Operate">
             <template v-slot="scope">
-              <el-button
-                type="text"
-                v-if="scope.row.status == 0"
-                @click="handlePass(scope.$index, scope.row)"
-              >
+              <el-button type="text"
+                         v-if="scope.row.status == 0"
+                         @click="handlePass(scope.$index, scope.row)">
                 Pass
               </el-button>
-              <el-button
-                type="text"
-                v-if="scope.row.status == 0"
-                @click="handleReject(scope.$index, scope.row)"
-              >
+              <el-button type="text"
+                         v-if="scope.row.status == 0"
+                         @click="handleReject(scope.$index, scope.row)">
                 Reject
               </el-button>
-              <el-button
-                type="text"
-                v-if="scope.row.status == 1"
-                class="red"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
+              <el-button type="text"
+                         v-if="scope.row.status == 1"
+                         class="red"
+                         @click="handleDelete(scope.$index, scope.row)">
                 Delete
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-        <table-pagination
-          :pageParams="pageParams"
-          :pageTotal="pageTotal"
-          :ifShowSizes="true"
-          @handleSizeChange="handleSizeChange"
-          @handlePageChange="handlePageChange"
-        ></table-pagination>
+        <table-pagination :pageParams="pageParams"
+                          :pageTotal="pageTotal"
+                          :ifShowSizes="true"
+                          @handleSizeChange="handleSizeChange"
+                          @handlePageChange="handlePageChange"></table-pagination>
       </div>
     </div>
   </div>
@@ -150,6 +170,7 @@ import {
   prettyNumberExamineReject,
   erbanUpload,
 } from "@/api/relPrivilegeManage/relPrivilegeManage.js";
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate } from "@/utils/relDate";
 import { ElMessageBox, ElMessage } from "element-plus"; // 正确引入 ElM
@@ -160,16 +181,17 @@ export default {
   name: "accountApplyManage",
   // mixins: [Mixin],
   components: { TablePagination },
-  data() {
+  data () {
     return {
+      partitionInfoList: [],
       tableLoading: false, // 表格是否加载中
       tableData: [], // 接口返回的表格数据
       // 搜索表单相关
       searchForm: {
         erbanNo: null,
         uid: null,
-        level: null,
-        region: null,
+        sid: null,
+        partitionId: null,
       },
       pageTotal: 0, // 接口返回的表格总条数
       pageParams: {
@@ -178,11 +200,12 @@ export default {
       },
     };
   },
-  created() {
+  created () {
+    this.initPartition();
     this.getData();
   },
   methods: {
-    getData() {
+    getData () {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
@@ -209,7 +232,7 @@ export default {
       });
     },
     //导入表格
-    handleExcel(file) {
+    handleExcel (file) {
       let formData = new FormData(); //声明一个FormDate对象
       formData.append("file", file.raw); //把文件信息放入对象中
       console.log(file.raw);
@@ -228,7 +251,7 @@ export default {
         });
     },
     // 通过
-    handlePass(index, row) {
+    handlePass (index, row) {
       ElMessageBox.confirm("Are you sure you want to pass?", "Prompt", {
         type: "warning",
         confirmButtonText: "Sure",
@@ -252,10 +275,10 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 拒绝
-    handleReject(index, row) {
+    handleReject (index, row) {
       ElMessageBox.confirm("Are you sure you want to refuse?", "Prompt", {
         type: "warning",
         confirmButtonText: "Sure",
@@ -279,10 +302,10 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 删除操作
-    handleDelete(index, row) {
+    handleDelete (index, row) {
       // 二次确认删除
       ElMessageBox.confirm("Are you sure you want to delete?", "Prompt", {
         type: "warning",
@@ -307,10 +330,10 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 点击搜索
-    handSearch() {
+    handSearch () {
       this.$refs["searchForm"].validate((valid) => {
         if (valid) {
           this.pageParams.pageNo = 1;
@@ -319,27 +342,32 @@ export default {
       });
     },
     // 重置搜索表单
-    resetSearchForm() {
+    resetSearchForm () {
       this.$refs["searchForm"].resetFields();
       this.pageParams.pageNo = 1;
       this.getData();
     },
-
     // 分页导航
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageParams.pageNo = val;
       this.getData();
     },
-    handlePageChange(val) {
+    handlePageChange (val) {
       this.pageParams.pageNo = val;
       this.getData();
     },
-    headerCopy(column, e) {
+    headerCopy (column, e) {
       this.$copy(column.label);
     },
+    initPartition () {
+      getPartitionInfoList().then(res => {
+        let data = res.data;
+        this.partitionInfoList = data;
+      });
+    },
   },
   computed: {
-    applyStateTag() {
+    applyStateTag () {
       return function (val) {
         let text = "";
         switch (val) {
@@ -359,7 +387,7 @@ export default {
         return text;
       };
     },
-    applyStateText() {
+    applyStateText () {
       return function (val) {
         let text = "";
         switch (val) {
@@ -379,7 +407,7 @@ export default {
         return text;
       };
     },
-    convertTimestamp() {
+    convertTimestamp () {
       return function (time) {
         let date = new Date(time);
         return formatDate(date);

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');
@@ -1046,11 +1066,11 @@ export default {
                             $("#tipModal").modal('show');
                             return;
                         }
-                        if (!effect) {
-                            $("#tipMsg").text("请上传动画图片");
-                            $("#tipModal").modal('show');
-                            return;
-                        }
+                        // if (!effect) {
+                        //     $("#tipMsg").text("请上传动画图片");
+                        //     $("#tipModal").modal('show');
+                        //     return;
+                        // } 
                         if (!days || days <= 0) {
                             $("#tipMsg").text("请输入合理的购买天数");
                             $("#tipModal").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">
@@ -93,6 +94,12 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="tr_modal_name" class="col-sm-4 control-label">土耳其装扮名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name" id="tr_modal_name" placeholder="请输入气泡名称">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-4 control-label">安卓图片:</label>
                             <div class="col-sm-6">
@@ -216,12 +223,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 +385,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);
@@ -454,8 +469,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"
@@ -528,6 +545,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/dressShop/DressShopAdminView.vue

@@ -158,6 +158,7 @@ export default {
             { field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' },
             { field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%' },
             { field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%' },
+            { field: 'name.tr', title: '土耳其装扮名称', align: 'left', valign: 'middle', width: '10%' },
             {
               field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%',
               formatter: function (val, row, index) {

src/views/gamepartner/GameInfo.vue

@@ -48,7 +48,7 @@
           :src="scope.row.logo"
           :zoom-rate="1.1"
           :preview-src-list="scope.row.logo"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />
@@ -63,7 +63,7 @@
           :src="scope.row.background"
           :zoom-rate="1.1"
           :preview-src-list="scope.row.background"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />
@@ -78,7 +78,7 @@
           :src="scope.row.pic"
           :zoom-rate="1.1"
           :preview-src-list="scope.row.pic"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />

src/views/games/lingSmallGames.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>游戏</span>
+      <el-select v-model="inquire.gameArrVal" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.gamesArr"
+          :key="item.gameId"
+          :label="item.gameName"
+          :value="item.gameId"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <span class="demonstration">日期</span>
+      <el-date-picker
+        v-model="inquire.time"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
+      </el-date-picker>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        tableData = [];
+        currentPage = 1;
+        isFinished = false;
+        getData();
+      "
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="confirmExport2Excel()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="dateTime" align="center" label="日期" />
+      <el-table-column prop="userCount" align="center" label="人数" />
+      <el-table-column prop="consumeNum" align="center" label="货币消耗" />
+      <el-table-column prop="settleNum" align="center" label="结算总量" />
+      <el-table-column prop="platformNum" align="center" label="平台收入" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            class="primary"
+            type="primary"
+            @click="
+              detailPageFunArr = scope.row;
+              tableDataDetails = [];
+              currentPage2 = 1;
+              isFinished2 = false;
+              detailPageFun();
+            "
+            size="default"
+            >查看详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <!-- <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[1, 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 v-if="!isFinished" class="pagination">
+      <el-button
+        class="pagination_in"
+        @click="loadMore"
+        type="primary"
+        :loading="isLoading"
+        >加载更多</el-button
+      >
+    </div>
+    <div v-else class="pagination">
+      <span class="pagination_in">没有更多数据了</span>
+    </div>
+  </div>
+
+  <!-- 内嵌单个工会详情 -->
+  <el-dialog :title="detailsTitle" v-model="detailsDialog">
+    <el-table
+      v-loading="loading2"
+      :data="tableDataDetails"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用户平台ID" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="consumeNum" align="center" label="货币消耗" />
+      <el-table-column prop="settleNum" align="center" label="结算总量" />
+      <el-table-column prop="platformNum" align="center" label="平台收入" />
+    </el-table>
+    <!-- 分页 -->
+    <!-- <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage2"
+      v-model:page-size="pageSize2"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total2"
+      @size-change="handleSizeChange2"
+      @current-change="handleCurrentChange2"
+    /> -->
+    <!-- 加载更多按钮 -->
+    <div v-if="!isFinished2" class="pagination">
+      <el-button
+        class="pagination_in"
+        @click="loadMore2"
+        type="primary"
+        :loading="isLoading2"
+        >加载更多</el-button
+      >
+    </div>
+    <div v-else class="pagination">
+      <span class="pagination_in">没有更多数据了</span>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="detailsDialog = false">关闭</el-button>
+        <el-button type="primary" @click="confirmExport2Excel2()"
+          >导出</el-button
+        >
+      </div></template
+    >
+  </el-dialog>
+</template>
+<script>
+import {
+  statisPage,
+  sysConfKey,
+  detailPage,
+  exportForMiniGame,
+  statisExport,
+} from "@/api/lingSmallGames/lingSmallGames";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "lingSmallGames",
+  data() {
+    return {
+      loading: false,
+      loading2: false,
+      //查询所需条件对象
+      inquire: {
+        time: "",
+        gameArrVal: "",
+        gamesArr: [],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      isLoading: false, // 加载状态
+      isFinished: false, // 是否加载完成
+      //   弹窗
+      detailsDialog: false,
+      detailsTitle: "",
+      tableDataDetails: [],
+      dateTimePub: null,
+      detailPageFunArr: {},
+      // 分页
+      total2: 0, //总页数
+      currentPage2: 1, //页码
+      pageSize2: 10, //条数
+      isLoading2: false, // 加载状态
+      isFinished2: false, // 是否加载完成
+    };
+  },
+  created() {
+    sysConfKey({ configId: "leadercc_game" }).then((res) => {
+      this.inquire.gamesArr = JSON.parse(res.data.configValue);
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.isLoading = true;
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      statisPage({
+        gameId: this.inquire.gameArrVal,
+        startTime: startTime,
+        endTime: endTime,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          // 判断返回的记录是否为空数组
+          const records = res.data.records;
+          if (records.length > 0) {
+            // 如果有数据，追加到表格数据中
+            this.tableData = [...this.tableData, ...records];
+            this.currentPage++; // 更新当前页码
+          } else {
+            // 如果数据长度为 0，停止加载
+            this.isFinished = true;
+          }
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+        this.isLoading = false;
+      });
+    },
+    // 加载下一页数据
+    loadMore() {
+      if (!this.isFinished) {
+        this.currentPage = this.currentPage++;
+        this.getData(this.currentPage);
+      }
+    },
+    // 加载下一页数据
+    loadMore2() {
+      if (!this.isFinished2) {
+        this.currentPage2 = this.currentPage2++;
+        this.detailPageFun(this.currentPage2);
+      }
+    },
+    // 导出
+    confirmExport2Excel() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      exportForMiniGame({
+        gameId: this.inquire.gameArrVal,
+        startTime: startTime,
+        endTime: endTime,
+      }).then();
+    },
+    // 导出弹窗
+    confirmExport2Excel2() {
+      statisExport({
+        dateTime: this.dateTimePub,
+        gameId: this.inquire.gameArrVal,
+      }).then();
+    },
+    // 详情接口
+    detailPageFun() {
+      this.isLoading2 = true;
+      this.detailsDialog = true;
+      this.loading2 = true;
+      this.detailsTitle = this.dateTimePub = this.detailPageFunArr.dateTime;
+      detailPage({
+        gameId: this.detailPageFunArr.gameId,
+        dateTime: this.detailPageFunArr.dateTime,
+        pageNum: this.currentPage2,
+        pageSize: this.pageSize2,
+      }).then((res) => {
+        if (res.code == 200) {
+          // 判断返回的记录是否为空数组
+          const records2 = res.data.records;
+          if (records2.length > 0) {
+            // 如果有数据，追加到表格数据中
+            this.tableDataDetails = [...this.tableDataDetails, ...records2];
+            this.currentPage2++; // 更新当前页码
+          } else {
+            // 如果数据长度为 0，停止加载
+            this.isFinished2 = true;
+          }
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading2 = false;
+        this.isLoading2 = false;
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+    handleSizeChange2() {
+      this.detailPageFun();
+    },
+    handleCurrentChange2() {
+      this.detailPageFun();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
+</style>

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,14 +190,23 @@ export default {
   },
   created() {
     // this.getData();
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId=this.partitionArr[0].id;
+    });
   },
   methods: {
     getData() {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss');
-      searchForm.endTime = dateFormat(searchForm.endTime,'yyyy-MM-dd hh:mm:ss');
+      console.log(searchForm);
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -198,7 +226,7 @@ export default {
           let data = res.data;
           this.tableData = data.records;
           this.pageTotal = data.total;
-        }else {
+        } else {
           ElMessage({
             showClose: true,
             message: res.message,
@@ -209,7 +237,7 @@ export default {
       chargeAgentSum(pageParams).then((res) => {
         if (res.code == 200) {
           this.total = res.data;
-        }else {
+        } else {
           ElMessage({
             showClose: true,
             message: res.message,

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;

src/views/guildOperationManagement/diamondFlow.vue

@@ -0,0 +1,263 @@
+<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
+        v-model="inquire.guildId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会长ID</span>
+      <el-input
+        v-model="inquire.guildBoosId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 时间选择器 -->
+    <!-- <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div> -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">开始时间</span>
+        <el-date-picker
+          v-model="inquire.time[0]"
+          type="date"
+          placeholder="开始时间"
+          format="YYYY-MM-DD 00:00:00"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">结束时间</span>
+        <el-date-picker
+          v-model="inquire.time[1]"
+          type="date"
+          placeholder="结束时间"
+          format="YYYY-MM-DD 23:59:59"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+
+    <!-- 查询按钮 -->
+    <el-button class="primary but" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.guildId = '';
+        inquire.guildBoosId = '';
+        inquire.time = [];
+        getData();
+      "
+      >重置查询</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="diamondStatisticsExportFun()"
+      >导出</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column 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" />
+      <el-table-column prop="memberNum" align="center" label="主播人数" />
+      <el-table-column prop="diamondNum" 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 {
+  diamondStatistics,
+  diamondStatisticsExport,
+  listPartitionInfo,
+} from "@/api/relAgency/relAgency";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "diamondFlow",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        guildId: "",
+        guildBoosId: "",
+        time: [],
+        partitionId: "",
+        partitionArr: [],
+      },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 5, //条数
+    };
+  },
+  created() {
+    // this.getData();
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = null;
+      let endTime = null;
+      if (time.length > 0) {
+        startTime = this.inquire.time[0]
+          ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
+          : null;
+        endTime = this.inquire.time[1]
+          ? dateFormat(this.inquire.time[1], "yyyy-MM-dd")
+          : null;
+      }
+      diamondStatistics({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        partitionId: this.inquire.partitionId,
+        startTime: startTime,
+        endTime: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.records;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 导出
+    diamondStatisticsExportFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
+      }
+      diamondStatisticsExport({
+        guildId: this.inquire.guildId,
+        ownerErbanNo: this.inquire.guildBoosId,
+        startTime: startTime,
+        endTime: endTime,
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/guildOperationManagement/guildInfo.vue

@@ -3,9 +3,28 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input v-model="inquire.userId"
-                placeholder=""
-                class="input"></el-input>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.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,65 +49,72 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary"
-               type="primary"
-               @click="getData()">查询</el-button>
-    <el-button class="primary"
-               type="primary"
-               @click="addDialog = true">添加</el-button>
-    <el-button class="primary"
-               type="primary"
-               @click="exportInfoFun()">导出</el-button>
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="addDialog = true"
+      >添加</el-button
+    >
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
+      >导出</el-button
+    >
 
     <!-- 表格 -->
-    <el-table v-loading="loading"
-              :data="tableData"
-              border
-              style="width: 100%; margin-top: 25px">
-      <el-table-column prop="id"
-                       align="center"
-                       label="公会ID" />
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo"
-                       align="center"
-                       label="会长ID" />
-      <el-table-column prop="ownerNick"
-                       align="center"
-                       label="会长昵称" />
-      <el-table-column prop="ownerPartitionName"
-                       align="center"
-                       label="会长分区" />
-      <el-table-column prop="name"
-                       align="center"
-                       label="公会昵称" />
-      <el-table-column align="center"
-                       prop="giftInfo"
-                       label="公会背景图">
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
+      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
+      <el-table-column
+        prop="ownerPartitionName"
+        align="center"
+        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"
-                    :src="scope.row.backgroundUrl"
-                    :zoom-rate="1.1"
-                    :preview-src-list="[scope.row.backgroundUrl]"
-                    fit="cover"
-                    preview-teleported="true"
-                    hide-on-click-modal="true" />
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.avatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.avatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime"
-                       align="center"
-                       label="创建日期" />
+      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.backgroundUrl"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.backgroundUrl]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" align="center" label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center"
-                       label="成员数量/上限">
+      <el-table-column align="center" label="成员数量/上限">
         <template v-slot="scope">
-          <el-button @click="memberDialogFun(scope.row)"
-                     type="text"
-                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
+          <el-button
+            @click="memberDialogFun(scope.row)"
+            type="text"
+            size="default"
+            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column prop="adminName"
-                       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
@@ -127,37 +153,43 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center"
-                       label="操作"
-                       width="300">
+      <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
-          <el-button @click="ediClick(scope)"
-                     class="primary"
-                     type="primary"
-                     size="default"
-                     :disabled="!scope.row.enable">编辑</el-button>
-          <el-button @click="
+          <el-button
+            @click="ediClick(scope)"
+            class="primary"
+            type="primary"
+            size="default"
+            :disabled="!scope.row.enable"
+            >编辑</el-button
+          >
+          <el-button
+            @click="
               delDialog = true;
               delDialogData = scope.row;
             "
-                     :class="scope.row.enable ? 'danger' : 'info'"
-                     :type="scope.row.enable ? 'danger' : 'info'"
-                     size="default"
-                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
+            :class="scope.row.enable ? 'danger' : 'info'"
+            :type="scope.row.enable ? 'danger' : 'info'"
+            size="default"
+            :disabled="!scope.row.enable"
+            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog"
-               title="新增"
-               width="28%"
-               center>
+    <el-dialog v-model="addDialog" title="新增" width="28%" center>
       <div style="margin-bottom: 25px">
-        <span style="display: inline-block; margin-right: 20px; width: 100px"
-              class="col-sm-2 control-label">会长ID</span>
-        <el-input v-model="resource.id"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >会长ID</span
+        >
+        <el-input
+          v-model="resource.id"
+          style="width: 75%"
+          class="input"
+        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -186,173 +218,220 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary"
-                     @click="add()"> 确认 </el-button>
+          <el-button type="primary" @click="add()"> 确认 </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-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog"
-               title="编辑"
-               width="28%"
-               center>
+    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
       <!-- 公会ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
-              class="col-sm-2 control-label">公会ID</span>
-        <el-input v-model="ediObj.id"
-                  style="width: 75%"
-                  class="input"
-                  disabled></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >公会ID</span
+        >
+        <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"
-              class="col-sm-2 control-label">会长ID</span>
-        <el-input v-model="ediObj.leaderId"
-                  style="width: 75%"
-                  class="input"
-                  disabled></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >会长ID</span
+        >
+        <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"
-              class="col-sm-2 control-label">会长昵称</span>
-        <el-input v-model="ediObj.leaderNick"
-                  style="width: 75%"
-                  class="input"
-                  disabled></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >会长昵称</span
+        >
+        <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"
-              class="col-sm-2 control-label">公会昵称</span>
-        <el-input v-model="ediObj.guildNick"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >公会昵称</span
+        >
+        <el-input
+          v-model="ediObj.guildNick"
+          style="width: 75%"
+          class="input"
+        ></el-input>
+      </div>
+      <!-- 公会头像 -->
+      <div class="selectBox selectBoxImg">
+        <span class="left" style="margin-right: 20px">公会头像</span>
+        <!-- action="/admin/tencent/cos/upload/file" -->
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess2"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left"
-              style="margin-right: 20px">公会背景图</span>
+        <span class="left" style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <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="ediObj.imageUrl1"
-               :src="ediObj.imageUrl1"
-               class="avatar" />
-          <el-icon v-else
-                   class="avatar-uploader-icon">
+        <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="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
+          <el-icon v-else 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"
-              class="col-sm-2 control-label">成员数量上限</span>
-        <el-input v-model="ediObj.guildNumber"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >成员数量上限</span
+        >
+        <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"
-                     @click="editDialogClick()">
+          <el-button type="primary" @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog"
-               title="提示"
-               width="30%"
-               center>
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary"
-                     @click="delClick()"> 确认 </el-button>
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog v-model="payAccountDialog"
-               :title="payAccountTitle"
-               width="28%"
-               center>
+    <el-dialog
+      v-model="payAccountDialog"
+      :title="payAccountTitle"
+      width="28%"
+      center
+    >
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
-              class="col-sm-2 control-label">Payoneer</span>
-        <el-input v-model="payAccount.payoneer"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >Payoneer</span
+        >
+        <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"
-              class="col-sm-2 control-label">USDT-ERC20</span>
-        <el-input v-model="payAccount.usdt"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >USDT-ERC20</span
+        >
+        <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"
-              class="col-sm-2 control-label">PayPal</span>
-        <el-input v-model="payAccount.payPal"
-                  style="width: 75%"
-                  class="input"></el-input>
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >PayPal</span
+        >
+        <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"
-                     @click="payAccountClick()">
+          <el-button type="primary" @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog"
-               :title="memberTitle"
-               width="36%"
-               center>
+    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input v-model="member.userID"
-                  placeholder="请输入新增平台id"
-                  class="input"></el-input>
-        <el-button type="primary"
-                   @click="addMemberFun()"> 新增 </el-button>
+        <el-input
+          v-model="member.userID"
+          placeholder="请输入新增平台id"
+          class="input"
+        ></el-input>
+        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table v-loading="loading"
-                :data="member.tableData"
-                border
-                style="width: 100%; margin-top: 25px">
-        <el-table-column align="center"
-                         label="用户平台ID">
+      <el-table
+        v-loading="loading"
+        :data="member.tableData"
+        border
+        style="width: 100%; margin-top: 25px"
+      >
+        <el-table-column align="center" label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -365,61 +444,54 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick"
-                         align="center"
-                         label="用户昵称" />
-        <el-table-column prop="createTime"
-                         align="center"
-                         label="加入时间" />
-        <el-table-column prop="adminName"
-                         align="center"
-                         label="操作人" />
-        <el-table-column align="center"
-                         label="操作"
-                         width="300">
+        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="createTime" 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)"
-                       :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
-                       :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
-                       size="default"
-                       :disabled="scope.row.roleType == 1 ? true : false">{{
+            <el-button
+              @click="setMemberFun(scope.row)"
+              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+              size="default"
+              :disabled="scope.row.roleType == 1 ? true : false"
+              >{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button>
-            <el-button @click="
+              }}</el-button
+            >
+            <el-button
+              @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
-                       class="danger"
-                       type="danger"
-                       size="default"
-                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
+              class="danger"
+              type="danger"
+              size="default"
+              :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"
-                     @click="memberDialog = false">
+          <el-button type="primary" @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog"
-               title="提示"
-               width="30%"
-               center>
+    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary"
-                     @click="delmemberRemoveClick()">
+          <el-button type="primary" @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -439,6 +511,7 @@ import {
   addMember,
   setManager,
   removeMember,
+  listPartitionInfo,
 } from "@/api/noblemanNew/noblemanNew";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -446,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,
@@ -456,6 +529,8 @@ export default {
         userId: "",
         referrer: "",
         time: "",
+        partitionId: "",
+        partitionArr: [],
       },
       //新增所需对象
       resource: {
@@ -480,6 +555,7 @@ export default {
         guildNumber: "",
         id: "",
         imageUrl1: "",
+        imageUrl2: "",
       },
       // 收款账户弹窗
       payAccountDialog: false,
@@ -503,12 +579,16 @@ export default {
       memberRemoveObj: {},
     };
   },
-  created () {
-    this.getData();
+  created() {
+    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 = "";
@@ -521,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,
@@ -532,7 +613,7 @@ export default {
       });
     },
     // 打开成员信息弹窗
-    memberDialogFun (val) {
+    memberDialogFun(val) {
       var than = this;
       than.memberTitle = `【${val.name}】成员信息`;
       than.memberNew = val;
@@ -544,7 +625,7 @@ export default {
       });
     },
     // 二次确认删除成员
-    delmemberRemoveClick () {
+    delmemberRemoveClick() {
       removeMember({
         guildMemberId: this.memberRemoveObj.guildMemberId,
       }).then((res) => {
@@ -570,7 +651,7 @@ export default {
       });
     },
     // 设置管理员
-    setMemberFun (val) {
+    setMemberFun(val) {
       setManager({
         guildMemberId: val.guildMemberId,
         status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
@@ -597,7 +678,7 @@ export default {
       });
     },
     // 新增成员
-    addMemberFun () {
+    addMemberFun() {
       addMember({
         erbanNo: this.member.userID,
         guildId: this.memberNew.id,
@@ -624,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;
@@ -633,7 +714,7 @@ export default {
       this.payAccountNew = val;
     },
     // 保存收款账户
-    payAccountClick () {
+    payAccountClick() {
       savePayAccount({
         id: this.payAccountNew.payAccount.familyId,
         payPal: this.payAccount.payPal,
@@ -658,7 +739,7 @@ export default {
       });
     },
     // 导出
-    exportInfoFun () {
+    exportInfoFun() {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -672,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,
@@ -698,7 +779,7 @@ export default {
       });
     },
     // 编辑按钮
-    ediClick (res) {
+    ediClick(res) {
       var obj = res.row;
       this.ediObj.leaderId = obj.ownerErbanNo;
       this.ediObj.leaderNick = obj.ownerNick;
@@ -706,15 +787,17 @@ export default {
       this.ediObj.guildNumber = obj.memberNumLimit;
       this.ediObj.id = obj.id;
       this.ediObj.imageUrl1 = obj.backgroundUrl;
+      this.ediObj.imageUrl2 = obj.avatar;
       this.editDialog = true;
     },
     // 二次确认弹窗
-    editDialogClick () {
+    editDialogClick() {
       console.log(this.ediObj);
       update({
         id: this.ediObj.id,
         memberNumLimit: this.ediObj.guildNumber,
         backgroundUrl: this.ediObj.imageUrl1,
+        avatar: this.ediObj.imageUrl2,
         name: this.ediObj.guildNick,
       }).then((res) => {
         if (res.code == 200) {
@@ -736,7 +819,7 @@ export default {
       });
     },
     // 解散按钮
-    delClick () {
+    delClick() {
       console.log(this.delDialogData.id);
       var guildId = this.delDialogData.id;
       dismiss({ guildId }).then((res) => {
@@ -758,23 +841,22 @@ 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 = URL.createObjectURL();
       this.ediObj.imageUrl1 = file.response.data;
       ElMessage({
         showClose: true,
@@ -782,11 +864,20 @@ export default {
         type: "success",
       });
     },
+    handleAvatarSuccess2(res, file) {
+      console.log(file);
+      this.ediObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
     // 分页导航
-    handleSizeChange () {
+    handleSizeChange() {
       this.getData();
     },
-    handleCurrentChange () {
+    handleCurrentChange() {
       this.getData();
     },
   },

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -20,16 +20,47 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
-            <el-form-item label="公会长ID" prop="agencyOwnerErbanNo">
+            <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"
                 placeholder="请输入"
               ></el-input>
             </el-form-item>
-            <el-form-item label="状态" prop="status">
+            <el-form-item label="提现状态" prop="status">
               <el-select v-model="searchForm.status">
-                <el-option label="已结算" value="1"></el-option>
-                <el-option label="未结算" value="0"></el-option>
+                <el-option label="审核中" value="0"></el-option>
+                <el-option label="审核通过" value="1"></el-option>
+                <el-option label="未通过" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="提现账户" prop="accountType">
+              <el-select v-model="searchForm.accountType">
+                <el-option label="Vodafone" value="VODAFONE"></el-option>
+                <el-option label="Payonner" value="PAYONNER"></el-option>
+                <el-option label="USD" value="USDT"></el-option>
+                <el-option label="Bank" value="BANK"></el-option>
+                <el-option label="Other" value="OTHER"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="国家" prop="country">
+              <el-select v-model="searchForm.country">
+                <el-option
+                  v-for="(item, index) in adminCountryArr"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="时间" class="large">
@@ -52,17 +83,32 @@
 
             <el-form-item label-width="40px">
               <el-button type="primary" @click="handSearch">搜索</el-button>
-              <el-button plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button type="primary" plain @click="resetSearchForm"
+                >重置搜索</el-button
+              >
+              <el-button
+                type="primary"
+                class="exportBtn"
+                @click="confirmExport2Excel"
+                >导出</el-button
+              >
+              <el-button @click="handleChangeAll()" type="info" plain
+                >批量发放</el-button
+              >
+              <el-button
+                @click="
+                  centerDialogVisible = true;
+                  centerDialogVisibleType = 1;
+                "
+                type="info"
+                plain
+                >批量驳回</el-button
+              >
             </el-form-item>
           </div>
         </el-form>
-        <el-button type="primary" class="exportBtn" @click="confirmExport2Excel"
-          >导出</el-button
-        >
-        <el-button @click="handleChangeAll()" type="info" plain
-          >批量操作</el-button
-        >
       </div>
+      <!-- 表格 -->
       <div class="table">
         <el-table
           :data="tableData"
@@ -70,74 +116,94 @@
           v-loading="tableLoading"
           @header-click="headerCopy"
           @selection-change="handleSelectionChange"
-          style="width: 100%"
+          style="width: 100%; overflow-x: auto"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区服">
-            <template v-slot="scope">
-              {{ regionType(scope.row.region) }}
-            </template>
-          </el-table-column>-->
-          <el-table-column align="center" prop="agencyId" label="公会ID">
-          </el-table-column>
-          <el-table-column align="center" prop="erbanNo" label="公会长ID">
-          </el-table-column>
-          <el-table-column align="center" prop="nick" label="公会长昵称">
-          </el-table-column>
-          <!-- <el-table-column align="center" prop="region" label="区域">
-          </el-table-column>
-          <el-table-column align="center" prop="abbr" label="国家">
-          </el-table-column> -->
-          <el-table-column align="center" prop="guildUsdNum" label="提现薪资">
-            <template v-slot="scope">
-              {{ scope.row.guildUsdNum }}
-            </template>
-          </el-table-column>
+          <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
             align="center"
-            prop="createTime"
-            label="创建时间"
-            width="160"
+            prop="blocked"
+            label="用户当前账户状态"
           >
             <template v-slot="scope">
-              {{ convertTimestamp(scope.row.createTime) }}
+              {{ scope.row.blocked ? "封禁" : "正常" }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="status" label="状态">
-            <template v-slot="scope">
-              {{ scope.row.status == 0 ? "未结算" : "已结算" }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="hallSalary" label="操作">
-            <template v-slot="scope">
-              <el-button
-                v-if="scope.row.status == 0"
-                @click="handleChange(scope.row)"
-                type="text"
-                size="mini"
-              >
-                结算
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="updateTime"
-            label="操作时间"
-            width="160"
-          >
+          <el-table-column align="center" prop="status" label="申请状态">
             <template v-slot="scope">
               {{
-                scope.row.updateTime
-                  ? convertTimestamp(scope.row.updateTime)
-                  : ""
+                scope.row.status == 0
+                  ? "审核中"
+                  : scope.row.status == 1
+                  ? "通过"
+                  : "未通过"
               }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="operator" label="操作人">
+          <el-table-column align="center" prop="createTime" label="申请时间" />
+          <el-table-column
+            align="center"
+            prop="accountType"
+            label="提现类型  "
+          />
+          <el-table-column
+            align="center"
+            prop="guildUsdNum"
+            label="提现薪资US"
+          />
+          <el-table-column align="center" prop="currency" label="发放币种" />
+          <el-table-column align="center" prop="currencyNum" label="发放金额" />
+          <el-table-column align="center" prop="withdrawRate" label="手续费" />
+          <el-table-column align="center" prop="withdrawNum" label="核销薪资" />
+          <el-table-column align="center" prop="remark" label="驳回理由">
+            <template v-slot="scope">
+              {{ scope.row.remark ? scope.row.remark : "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="hallSalary"
+            label="操作"
+            width="150"
+          >
+            <template v-slot="scope">
+              <div v-if="scope.row.status == 0">
+                <el-button
+                  @click="handleChange(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  发放
+                </el-button>
+                <el-button
+                  @click="
+                    centerDialogVisible = true;
+                    centerDialogVisibleType = 2;
+                    centerDialogVisibleID = scope.row.id;
+                  "
+                  type="text"
+                  size="mini"
+                >
+                  驳回
+                </el-button>
+              </div>
+              <div>
+                <el-button
+                  @click="accountInfosFun(scope.row)"
+                  type="text"
+                  size="mini"
+                >
+                  查看详情
+                </el-button>
+              </div>
+            </template>
           </el-table-column>
         </el-table>
       </div>
+      <!-- 分页 -->
       <table-pagination
         :pageParams="pageParams"
         :pageTotal="pageTotal"
@@ -145,6 +211,46 @@
         @handleSizeChange="handleSizeChange"
         @handlePageChange="handlePageChange"
       ></table-pagination>
+      <!-- 驳回弹窗 -->
+      <el-dialog v-model="centerDialogVisible" title="提示" width="30%" center>
+        <span> 请选择驳回理由:</span>
+        <div class="boxs">
+          <el-radio class="radios" v-model="radio" label="用户消息提供不足"
+            >用户消息提供不足</el-radio
+          >
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="dialogClick()"> 确认 </el-button>
+          </span>
+        </template>
+      </el-dialog>
+      <!-- 提现详情弹窗 -->
+      <el-dialog v-model="centerDialogVisible2" title="提现详情">
+        <div class="boxs2">
+          <div>申请提现时间：{{ accountDetails.createTime }}</div>
+          <div>申请ID：{{ accountDetails.erbanNo }}</div>
+          <div>country：{{ accountDetails.country }}</div>
+          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
+          <div>Bank Name：{{ accountDetails.bank_name }}</div>
+          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
+          <div>payeeName:：{{ accountDetails.full_name }}</div>
+          <div>address：{{ accountDetails.address }}</div>
+          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
+          <div>
+            发放金额：{{ accountDetails.currency }}
+            {{ accountDetails.currencyNum }}
+          </div>
+          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
+          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible2 = false">确认</el-button>
+          </span>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -155,12 +261,15 @@ import {
   agencyWithdrawExamineExport,
   agencyWithdrawSet,
   agencyWithdrawBatchSet,
+  batchReject,
+  adminCountry,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
 import { dateFormat } from "@/utils/system-helper";
 import { ElMessage } from "element-plus";
-import { ElMessageBox } from 'element-plus'; // 正确引入 ElM
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
 // 混入
 // import Mixin from '../../mixin/mixRegion.js';
 
@@ -174,19 +283,29 @@ export default {
       btnLoading: false, // 导出弹出框(dialog)的确认按钮
       tableLoading: false, // 表格是否加载中
 
-      tableData: [], // 接口返回的表格数据
+      tableData: [], // 接口  返回的表格数据
       pageTotal: 0, // 接口返回的表格总条数
       pageParams: {
         pageNo: 1,
         pageSize: 20,
       },
+      centerDialogVisible: false, //驳回弹窗
+      centerDialogVisibleType: null, //驳回弹窗
+      centerDialogVisibleID: null, //驳回弹窗
+      centerDialogVisible2: false, //操作弹窗
+      radio: "用户消息提供不足", //驳回原因
       // 搜索表单相关
       searchForm: {
         agencyOwnerErbanNo: null,
         status: null,
         startTime: null,
         endTime: null,
+        adminCountry: null,
+        country: null,
+        partitionId: null,
       },
+      partitionArr: [],
+      adminCountryArr: [],
       searchRule: {
         startTime: [
           {
@@ -216,18 +335,45 @@ export default {
         ],
       },
       idStr: [], //批量删除ID
+      // 查看薪资弹窗数据存储
+      accountDetails: {
+        createTime: null,
+        erbanNo: null,
+        country: null,
+        bank_account: null,
+        bank_name: null,
+        swift_code: null,
+        full_name: null,
+        address: null,
+        guildUsdNum: null,
+        currency: null,
+        currencyNum: null,
+        withdrawRate: null,
+        withdrawNum: null,
+      },
     };
   },
   created() {
-    // this.getData();
+    adminCountry().then((res) => {
+      this.adminCountryArr = res.data;
+    });
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+      this.searchForm.partitionId = this.partitionArr[0].id;
+      this.getData();
+    });
   },
   methods: {
     getData() {
       this.tableLoading = true;
 
       let { pageParams, searchForm } = this;
-      searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss');
-      searchForm.endTime = dateFormat(searchForm.endTime,'yyyy-MM-dd hh:mm:ss');
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
       searchForm = JSON.parse(JSON.stringify(searchForm));
       pageParams = JSON.parse(JSON.stringify(pageParams));
       Object.keys(searchForm).forEach((item) => {
@@ -239,7 +385,8 @@ export default {
         }
       });
       Object.assign(pageParams, searchForm);
-
+      console.log(pageParams);
+      console.log(searchForm);
       agencyWithdrawList(pageParams).then((res) => {
         this.tableLoading = false;
         if (res.code == 200) {
@@ -284,6 +431,61 @@ export default {
           });
         });
     },
+    // 查看详情处理函数
+    accountInfosFun(res) {
+      var obj = JSON.parse(res.accountInfos);
+      console.log(obj);
+      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
+      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
+      this.accountDetails.country = obj.country ? obj.country : "-";
+      this.accountDetails.bank_account = obj.bank_account
+        ? obj.bank_account
+        : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.address = obj.address ? obj.address : "-";
+      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
+      this.accountDetails.currency = res.currency ? res.currency : "-";
+      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
+      this.accountDetails.withdrawRate = res.withdrawRate
+        ? res.withdrawRate
+        : "-";
+      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
+      this.centerDialogVisible2 = true;
+    },
+    // 批量驳回
+    dialogClick() {
+      batchReject({
+        ids:
+          this.centerDialogVisibleType == 1
+            ? this.idStr
+            : this.centerDialogVisibleID,
+        remark: this.radio,
+      })
+        .then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.getData();
+            this.centerDialogVisible = false;
+            this.idStr = null;
+          } else {
+            ElMessage({
+              type: "error",
+              message: res.message,
+            });
+          }
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
     handleChange(row) {
       ElMessageBox.confirm("确定要结算吗", "提示", {
         confirmButtonText: "确定",
@@ -291,7 +493,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          agencyWithdrawSet({ id: row.id }).then((res) => {
+          agencyWithdrawSet({ ids: row.id }).then((res) => {
             if (res.success === true) {
               ElMessage({
                 type: "success",
@@ -405,13 +607,34 @@ export default {
 
 <style scope>
 .exportBtn {
-  margin-bottom: 20px;
+  margin-bottom: 0;
+}
+.text {
+  margin-left: 20px;
 }
-
 .container {
   width: 100%;
 }
 .search-line {
   width: 38%;
 }
+.boxs {
+  margin-top: 10px;
+  width: 100%;
+  word-wrap: break-word; /* 允许在单词内换行 */
+  overflow-wrap: break-word; /* 同上，现代浏览器推荐使用 */
+  white-space: normal; /* 允许换行 */
+}
+.radios {
+  display: block !important;
+  width: 100% !important;
+  word-wrap: break-word !important; /* 允许在单词内换行 */
+  overflow-wrap: break-word !important; /* 同上，现代浏览器推荐使用 */
+  white-space: normal !important; /* 允许换行 */
+  height: auto !important;
+}
+.boxs2 div {
+  margin-bottom: 10px;
+  font-size: 16px;
+}
 </style>

src/views/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/login/index.vue

@@ -72,7 +72,7 @@ export default {
   name: "LoginView",
   data () {
     return {
-      smsSwitch: true,
+      smsSwitch: false,
     };
   },
   setup () {

src/views/luckGift/arrange.vue

@@ -0,0 +1,232 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>奖池</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          >
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+
+    <!-- 总分组 -->
+    <div class="allArr">
+      目前数组 <span>{{ allArr.length }} </span> 组:
+      <span class="span" v-for="(item, index) in allArr" :key="index">
+        {{ item.expect }},
+      </span>
+    </div>
+
+    <!-- 数组设置 -->
+    <div class="arrSet">数组设置：</div>
+
+    <!-- 数组内容 -->
+    <div class="boxs">
+      <div class="arrContent" v-for="(item, index) in arr" :key="index">
+        <div class="arrBox">
+          <div class="left">
+            <div class="left_in1">
+              期望: <b class="b1">{{ item.expect }}</b> ,
+            </div>
+            <div class="left_in2">
+              得到率: <b class="b2">{{ (item.winRate * 100).toFixed(2) }}%</b> ,
+            </div>
+          </div>
+          <div class="right" v-for="(arrInItem, i) in item.itemList" :key="i">
+            <span>{{ arrInItem.multi }}</span>
+            <el-input
+              @input="handleInput(index, i, $event)"
+              v-model="arrInItem.num"
+              placeholder=""
+              class="input"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="saveFun()"
+        >保存
+      </el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { listType, list, save } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftArrange",
+  data() {
+    return {
+      //查询所需条件对象
+      inquire: {
+        value: "",
+        options: [],
+      },
+      allArr: [], //总数组
+      arr: [], //处理下面总数组
+    };
+  },
+  created() {
+    listType().then((res) => {
+      this.inquire.options = res.data;
+      this.inquire.value = res.data[0].type;
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      list({ type: this.inquire.value }).then((res) => {
+        this.allArr = res.data;
+        this.arr = res.data;
+      });
+    },
+    handleInput(index, i, val) {
+      // 期望值 expectedvalue = 倍数 * 5 * num / 2500
+      // 中奖率 winRate =不为θ的倍数的num / 500
+      this.arr[index].expect = this.calculationFun(index, i, val).expect;
+      this.arr[index].winRate = this.calculationFun(index, i, val).winRate;
+    },
+    // 计算函数
+    calculationFun(index, i, val) {
+      var expectNum = 0;
+      var winRate = 0;
+      this.arr[index].itemList.forEach((res) => {
+        expectNum += res.multi * res.num;
+        winRate += Number(res.num);
+      });
+      console.log(winRate);
+      return {
+        expect: (expectNum / 500).toFixed(2),
+        winRate: (winRate / 500).toFixed(4),
+      };
+    },
+    // 保存
+    saveFun() {
+      //
+      save(
+        JSON.stringify({ poolList: this.arr, type: this.inquire.value })
+      ).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "保存成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 监听类型
+    handleChange(value) {
+      this.inquire.value = value;
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  font-size: 18px;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+  .allArr {
+    margin: 20px 0 10px 0;
+    span {
+      color: red;
+    }
+    .span {
+      margin: 0 10px;
+    }
+  }
+  .arrSet {
+    margin-bottom: 0px;
+  }
+  .boxs {
+    display: flex;
+    // justify-content: space-between;
+    flex-wrap: wrap;
+    .arrContent {
+      // margin-bottom: 20px;
+      width: 190px;
+      height: 395px;
+      line-height: 30px;
+      margin-bottom: 20px;
+      .arrBox {
+        .left {
+          // float: left;
+          div {
+            min-width: 100px;
+            display: block;
+            // margin-bottom: -25px;
+            .b1 {
+              color: red;
+            }
+            .b2 {
+              color: blue;
+            }
+          }
+          .left_in2 {
+            margin-bottom: 10px
+          }
+        }
+        .right {
+          float: left;
+          margin-bottom: 15px;
+          span {
+            display: inline-block;
+            width: 45px;
+          }
+          .input {
+            display: inline-block;
+            width: 100px;
+            margin-right: 10px;
+            font-size: 16px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/luckGift/luckGiftData.vue

@@ -0,0 +1,281 @@
+<template>
+  <div class="box">
+    <!-- ID -->
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="inquire">
+        <span>MoliStar ID</span>
+        <el-input v-model="inquire.userId" placeholder="" class="input">
+        </el-input>
+      </div>
+      <!-- 送出时间 -->
+      <div class="inquire">
+        <span>送出时间</span>
+        <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
+        </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()"
+        >查询
+      </el-button>
+      <el-button
+        @click="
+          inquire.userId = '';
+          inquire.time = '';
+        "
+        >重置筛选
+      </el-button>
+      <el-button
+        class="primary"
+        type="primary"
+        style="margin-left=20px;"
+        :disabled="butClick"
+        @click="
+          editDialog = true;
+          type = 12;
+          editDialogTitle = '赠送1000倍奖励';
+          value = inquire.x;
+        "
+      >
+        赠送</el-button
+      >
+    </div>
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="date" align="center" label="日期" />
+      <el-table-column prop="uid" align="center" label="uid" />
+      <el-table-column prop="erbanNo" align="center" label="平台id" />
+      <el-table-column prop="totalInput" align="center" label="进入" />
+      <el-table-column prop="totalOutput" align="center" label="退出" />
+      <el-table-column prop="production" align="center" label="剩余" />
+      <el-table-column
+        prop="productionRatio"
+        align="center"
+        label="退出/进入"
+      />
+      <el-table-column prop="avgInput" align="center" label="每次进入" />
+      <el-table-column prop="num" align="center" label="总次数" />
+      <el-table-column prop="winNum" align="center" label="得到次数" />
+      <el-table-column prop="winRate" align="center" label="得到率" />
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入用户ID"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { personal, updateUserMulti } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftData",
+  data() {
+    return {
+      loading: false,
+      totalInput: 0,
+      totalOutput: 0,
+      totalProductionRatio: 0,
+      //查询所需条件对象
+      inquire: {
+        userId: "",
+        time: "",
+        value: 2,
+        options: [
+          {
+            name: "阿拉伯区",
+            type: 2,
+          },
+          {
+            name: "英语区",
+            type: 1,
+          },
+          {
+            name: "华语区",
+            type: 4,
+          },
+          {
+            value: 8,
+            label: "土耳其区",
+          },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
+      if (!this.inquire.time && this.inquire.userId == '') {
+        ElMessage({
+          showClose: true,
+          message: "时间和ID至少填一项",
+          type: "error",
+        });
+        return;
+      }
+      this.loading = true;
+      personal({
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        date: this.inquire.time
+          ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+          : null,
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.total = res.data.dataPage.total;
+        this.tableData = res.data.dataPage.rows;
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.loading = false;
+      });
+    },
+    // 确认保存
+    editDialogClick() {
+      this.butClick = true;
+      updateUserMulti({ erbanNo: this.value }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+          setTimeout(() => {
+            this.butClick = false;
+          }, 3000);
+          this.editDialog = false;
+          this.getData();
+        } else {
+          this.butClick = false;
+          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;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/luckGift/luckGiftDataAll.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select v-model="inquire.value" placeholder="请选择">
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <!-- 时间 -->
+      <!-- <div class="inquire">
+        <span>时间</span>
+        <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
+        </el-date-picker>
+      </div> -->
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+      <el-button class="primary" type="primary" @click="getData()"
+        >查询
+      </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"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <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="productionRatio"
+        align="center"
+        label="退出/进入比例"
+      />
+      <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>
+  </div>
+</template>
+<script>
+import { platform } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftDataAll",
+  data() {
+    return {
+      loading: false,
+      totalInput: "0",
+      totalOutput: "0",
+      totalProductionRatio: "0",
+      //查询所需条件对象
+      inquire: {
+        value: 2,
+        options: [
+          {
+            value: 2,
+            label: "阿拉伯区",
+          },
+          {
+            value: 1,
+            label: "英语区",
+          },
+          {
+            value: 4,
+            label: "华语区",
+          },
+          {
+            value: 8,
+            label: "土耳其区",
+          },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    // this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      platform({
+        partitionId: this.inquire.value,
+      }).then((res) => {
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.tableData = res.data.dataList;
+        this.loading = false;
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      display: inline-block;
+      margin-right: 20px;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/luckGift/luckGiftSet.vue

@@ -0,0 +1,504 @@
+<template>
+  <div class="box">
+    <div class="condition">
+      <!-- 分区 -->
+      <div class="inquire">
+        <span>分区</span>
+        <el-select
+          v-model="inquire.value"
+          placeholder="请选择"
+          @change="handleChange"
+        >
+          <el-option
+            v-for="item in inquire.options"
+            :key="item.type"
+            :label="item.name"
+            :value="item.type"
+          >
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="inquire">
+        <span>对比值N</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.comparisonValue"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 1;
+            editDialogTitle = '对比值N';
+            value = inquire.comparisonValue;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>对比值M</span>
+        <el-input
+          v-model="inquire.supplement.supplementRatio"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 5;
+            editDialogTitle = '对比值M';
+            value = inquire.supplement.supplementRatio;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>金币对比值A</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.supplement.conditionInput"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 6;
+            editDialogTitle = '金币对比值A';
+            value = inquire.supplement.conditionInput;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>奖励金币倍数</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.supplement.supplementMulti"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 7;
+            editDialogTitle = '奖励金币倍数';
+            value = inquire.supplement.supplementMulti;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>幸运24金币库存</span>
+        <el-input
+          v-model="inquire.goldInventory"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 2;
+            editDialogTitle = '幸运24金币库存';
+            value = inquire.goldInventory;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <!-- <div class="inquire">  
+        <span>幸运礼物ID</span>
+        <el-input
+          v-model="inquire.x"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 8;
+            editDialogTitle = '幸运礼物ID';
+            value = inquire.x;
+          "
+        >
+          编辑</el-button
+        >
+      </div> -->
+
+      <div class="inquire">
+        <span>平台抽成</span>
+        <el-input
+          v-model="inquire.platformCommission"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 3;
+            editDialogTitle = '平台抽成';
+            value = inquire.platformCommission;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>用户收益比例</span>
+        <el-input
+          v-model="inquire.userRevenueRatio"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 4;
+            editDialogTitle = '用户收益比例';
+            value = inquire.userRevenueRatio;
+          "
+          >编辑</el-button
+        >
+      </div>
+
+      <div class="inquire">
+        <span>通知制定金额</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.warnMulti"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 9;
+            editDialogTitle = '通知制定金额';
+            value = inquire.warnMulti;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+
+      <!-- <div class="inquire">
+        <span>库存告急通知</span>
+        <el-input
+          v-model="inquire.x"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 10;
+            editDialogTitle = '库存告急通知';
+            value = inquire.x;
+          "
+        >
+          编辑</el-button
+        >
+      </div> -->
+
+      <div class="inquire">
+        <span>用户上线列表</span>
+        <!-- @input="handleInput" -->
+        <el-input
+          v-model="inquire.followErbanNoList"
+          placeholder=""
+          class="input"
+          disabled
+        ></el-input>
+        <el-button
+          class="primary"
+          type="primary"
+          @click="
+            editDialog = true;
+            butClick = false;
+            type = 11;
+            editDialogTitle = '用户上线列表';
+            value = inquire.followErbanNoList;
+          "
+        >
+          编辑</el-button
+        >
+      </div>
+      <div class="inquire">
+        <span>赠送1000倍奖励</span>
+        <el-button
+          class="primary"
+          type="primary"
+          :disabled="butClick"
+          @click="
+            editDialog = true;
+            type = 12;
+            editDialogTitle = '赠送1000倍奖励';
+            value = inquire.x;
+          "
+        >
+          赠送</el-button
+        >
+      </div>
+    </div>
+    <!-- 编辑弹窗 -->
+    <el-dialog v-model="editDialog" :title="editDialogTitle" width="36%" center>
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span
+          style="display: inline-block; margin-right: 20px"
+          class="col-sm-2 control-label"
+          >{{ editDialogTitle }}</span
+        >
+        <el-input
+          v-model="value"
+          style="width: 75%"
+          class="input"
+          placeholder="请输入"
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              editDialog = false;
+              butClick = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            :disabled="butClick"
+            @click="editDialogClick()"
+          >
+            保存
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getConfig, updateSet, updateUserMulti } from "@/api/luckGift/luckGift";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import moment from "moment-timezone";
+export default {
+  name: "luckGiftSet",
+  data() {
+    return {
+      loading: false,
+      butClick: false,
+      butClickTime: null,
+      //查询所需条件对象
+      inquire: {
+        value: 2,
+        options: [
+          {
+            name: "阿拉伯区",
+            type: 2,
+          },
+          {
+            name: "英语区",
+            type: 1,
+          },
+          {
+            name: "华语区",
+            type: 4,
+          },
+          {
+            name: "土耳其区",
+            type: 8,
+          },
+        ],
+        comparisonValue: "",
+        goldInventory: "",
+        giftId: "",
+        platformCommission: "",
+        userRevenueRatio: "",
+        supplement: {
+          conditionInput: "",
+          conditionNum: "",
+          supplementMulti: "",
+          supplementNum: "",
+          supplementRatio: "",
+        },
+        warnMulti: "",
+        followErbanNoList: "",
+      },
+      editDialog: false,
+      editDialogTitle: "",
+      value: "",
+      type: null,
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      getConfig({ partitionId: this.inquire.value }).then((res) => {
+        this.inquire.comparisonValue = res.data.productionRatio;
+        this.inquire.goldInventory = res.data.stock;
+        this.inquire.platformCommission = res.data.platformRatio;
+        this.inquire.userRevenueRatio = res.data.receiverRatio;
+        this.inquire.supplement = res.data.supplement;
+        this.inquire.warnMulti = res.data.warnMulti;
+        this.inquire.followErbanNoList = res.data.followErbanNoList.join();
+      });
+    },
+    // 确认保存
+    editDialogClick() {
+      var obj = {};
+      obj.partitionId = this.inquire.value;
+      if (this.type == 12) {
+        this.butClick = true;
+        updateUserMulti({ erbanNo: this.value }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message:'赠送成功',
+              type: "success",
+            });
+            setTimeout(() => {
+              this.butClick = false;
+            }, 3000);
+            this.editDialog = false;
+            this.getData();
+          } else {
+            this.butClick = false;
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else {
+        if (this.type == 1) {
+          obj.productionRatio = this.value;
+        } else if (this.type == 2) {
+          obj.stock = this.value;
+        } else if (this.type == 3) {
+          obj.platformRatio = this.value;
+        } else if (this.type == 4) {
+          obj.receiverRatio = this.value;
+        }else if (this.type == 5) {
+          obj.supplement = this.inquire.supplement;
+          obj.supplement.supplementRatio = this.value;
+        } else if (this.type == 6) {
+          obj.supplement = this.inquire.supplement;
+          obj.supplement.conditionInput = this.value;
+        } else if (this.type == 7) {
+          obj.supplement = this.inquire.supplement;
+          obj.supplement.supplementMulti = this.value;
+        } else if (this.type == 9) {
+          obj.warnMulti = this.value;
+        } else if (this.type == 11) {
+          obj.followErbanNoList = this.value.split(",");
+        }
+        updateSet(obj).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: "保存成功",
+              type: "success",
+            });
+            this.editDialog = false;
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+    },
+    // 监听类型
+    handleChange(value) {
+      this.inquire.value = value;
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .condition {
+    margin-bottom: 20px;
+    .inquire {
+      margin-right: 20px;
+      margin-bottom: 20px;
+      span {
+        display: inline-block;
+        width: 110px;
+        margin-right: 10px;
+        // text-align: right;
+      }
+      .input {
+        width: 180px;
+        margin-right: 10px;
+      }
+    }
+  }
+  .but {
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/lucky/LuckyGiftRangeView.vue

@@ -306,7 +306,8 @@ export default {
       this.inquire.value1 = e;
       luckyGiftRangeConfigList({ giftId: this.inquire.value1 }).then((res) => {
         this.inquire.giftsNum = res.data;
-        // this.inquire.value2 = res.data[0].id;
+      // this.inquire.value2 = "";
+        this.inquire.value2 = res.data[0].id;
         // this.loading = true;
         // luckyGiftRewardList({
         //   giftId: e,

src/views/luckyTycoon/luckyTycoonCollectSet.vue

@@ -72,7 +72,7 @@
           :src="imgFun(JsonFunc(scope.row.rewardJson))[0]"
           :zoom-rate="1.1"
           :preview-src-list="imgFun(JsonFunc(scope.row.rewardJson))"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />

src/views/luckyTycoon/luckyTycoonOnePlusOne.vue

@@ -26,7 +26,7 @@
           :src="scope.row.luckyBagPic"
           :zoom-rate="1.1"
           :preview-src-list="[scope.row.luckyBagPic]"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />
@@ -46,7 +46,7 @@
           :src="scope.row.destGiftPic"
           :zoom-rate="1.1"
           :preview-src-list="[scope.row.destGiftPic]"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />
@@ -70,7 +70,7 @@
           :src="scope.row.rewardGiftPic"
           :zoom-rate="1.1"
           :preview-src-list="[scope.row.rewardGiftPic]"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />

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"
@@ -60,7 +63,7 @@
             :src="scope.row.picUrl"
             :zoom-rate="1.1"
             :preview-src-list="scope.row.picUrl"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />
@@ -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
-            :src="controlsObj.imageUrl1"
-            class="avatar"
-          />
+          <img :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) {
-          val = [4, 1, 2];
+        if (num == 0 || num == 15) {
+          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) {
-          val = "华语区、英语区、阿语区";
+        if (num == 0 || num == 15) {
+          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/medal/MedalRecord.vue

@@ -43,7 +43,7 @@
             :src="scope.row.picUrl"
             :zoom-rate="1.1"
             :preview-src-list="scope.row.picUrl"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />

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 == '')) {
-                        let jsonFixedWord = {'zh': zhFixedWord, 'ar': arFixedWord, 'en': enFixedWord};
+                    if (!(zhFixedWord == '' && arFixedWord == '' && enFixedWord == '' && trFixedWord=="")) {
+                        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/nobleman/GuildInfo.vue

@@ -58,6 +58,19 @@
         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"
+            :src="scope.row.avatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.avatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="giftInfo" label="公会背景图">
         <template v-slot="scope">
           <el-image
@@ -65,7 +78,7 @@
             :src="scope.row.backgroundUrl"
             :zoom-rate="1.1"
             :preview-src-list="[scope.row.backgroundUrl]"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />
@@ -245,6 +258,22 @@
           class="input"
         ></el-input>
       </div>
+      <!-- 公会头像 -->
+      <div class="selectBox selectBoxImg">
+        <span class="left" style="margin-right: 20px">公会头像</span>
+        <!-- action="/admin/tencent/cos/upload/file" -->
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess2"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
         <span class="left" style="margin-right: 20px">公会背景图</span>
@@ -487,6 +516,7 @@ export default {
         guildNumber: "",
         id: "",
         imageUrl1: "",
+        imageUrl2: "",
       },
       // 收款账户弹窗
       payAccountDialog: false,
@@ -700,6 +730,7 @@ export default {
       this.ediObj.guildNumber = obj.memberNumLimit;
       this.ediObj.id = obj.id;
       this.ediObj.imageUrl1 = obj.backgroundUrl;
+      this.ediObj.imageUrl2 = obj.avatar;
       this.editDialog = true;
     },
     // 二次确认弹窗
@@ -709,6 +740,7 @@ export default {
         id: this.ediObj.id,
         memberNumLimit: this.ediObj.guildNumber,
         backgroundUrl: this.ediObj.imageUrl1,
+        avatar: this.ediObj.imageUrl2,
         name: this.ediObj.guildNick,
       }).then((res) => {
         if (res.code == 200) {
@@ -766,6 +798,16 @@ export default {
         type: "error",
       });
     },
+    handleAvatarSuccess2(res, file) {
+      console.log(file);
+      // this.ediObj.imageUrl1 = URL.createObjectURL();
+      this.ediObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
     handleAvatarSuccess(res, file) {
       console.log(file);
       // this.ediObj.imageUrl1 = URL.createObjectURL();

src/views/nobleman/GuildInfoSearch.vue

@@ -50,6 +50,19 @@
       <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
       <el-table-column prop="ownerNick" align="center" 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"
+            :src="scope.row.avatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.avatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="giftInfo" label="公会背景图">
         <template v-slot="scope">
           <el-image
@@ -57,7 +70,7 @@
             :src="scope.row.backgroundUrl"
             :zoom-rate="1.1"
             :preview-src-list="[scope.row.backgroundUrl]"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />

src/views/pretty/PrettyNoRecordAdminView.vue

@@ -1,155 +1,163 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </div>
-                <div class="content">
-                    <div id="table"></div>
-                    <div id="toolbar">
-                        <label for="prettyNo" class="control-label">目标平台号：</label>
-                        <input type="text" name="goodNum" id="targetPrettyNo">
-                        <label for="prettyNo" class="control-label">原平台号：</label>
-                        <input type="text" id="currentPrettyNo">
-                        <label for="operator" class="control-label">操作类型:</label>
-                        <select name="status" id="operator" class="input-m">
-                            <option value="">全部</option>
-                            <option value="1">绑定</option>
-                            <option value="2">解绑</option>
-                        </select>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                    </div>
-                </div>
-            </div>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="content-header">
+          <h1 id="itemTitle"></h1>
         </div>
-    </section>
+        <div class="content">
+          <div id="table"></div>
+          <div id="toolbar">
+            <label for="prettyNo"
+                   class="control-label">目标平台号：</label>
+            <input type="text"
+                   name="goodNum"
+                   id="targetPrettyNo">
+            <label for="prettyNo"
+                   class="control-label">原平台号：</label>
+            <input type="text"
+                   id="currentPrettyNo">
+            <label for="operator"
+                   class="control-label">操作类型:</label>
+            <select name="status"
+                    id="operator"
+                    class="input-m">
+              <option value="">全部</option>
+              <option value="1">绑定</option>
+              <option value="2">解绑</option>
+            </select>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrettyNoRecordAdminView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
-        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '5%' },
-                        { field: 'currentErbanNo', title: '原平台号', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'operator',
-                            title: '操作',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                switch (val) {
-                                    case 1:
-                                        return '绑定';
-                                 
-                                    case 2:
-                                        return '解绑';
-                            
-                                }
-                            }
-                        },
-                        { field: 'targetErbanNo', title: '目标平台号', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'prettyRecordDesc', title: '备注', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'startTime',
-                            title: '开始时间(绑定时显示)',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        {
-                            field: 'endTime',
-                            title: '结束时间(绑定时显示)',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        {
-                            field: 'createTime',
-                            title: '创建时间',
-                            align: 'center',
-                            width: '10%',
-                            valign: 'middle',
-                            formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format("yyyy-MM-dd hh:mm:ss");
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        { field: 'createdBy', title: '操作者', align: 'center', width: '10%', valign: 'middle' }
+  name: "PrettyNoRecordAdminView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'currentErbanNo', title: '原平台号', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'operator',
+              title: '操作',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                switch (val) {
+                  case 1:
+                    return '绑定';
 
-                    ],
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 10,
-                    pagination: true,
-                    pageList: [10, 20, 30, 50],
-                    sidePagination: "server", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageSize: params.pageSize,
-                            pageNumber: params.pageNumber,
-                            targetPrettyNo: $('#targetPrettyNo').val(),
-                            currentPrettyNo: $('#currentPrettyNo').val(),
-                            operator: $('#operator').val()
-                        };
-                        return param;
-                    },
-                    uniqueId: 'id',
-                    toolbar: '#toolbar',
-                    url: '/admin/pretty/record/getList',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                })
+                  case 2:
+                    return '解绑';
 
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                })
-            })
-        }
-    },
+                }
+              }
+            },
+            { field: 'targetErbanNo', title: '目标平台号', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'prettyRecordDesc', title: '备注', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'startTime',
+              title: '开始时间(绑定时显示)',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            {
+              field: 'endTime',
+              title: '结束时间(绑定时显示)',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            {
+              field: 'createTime',
+              title: '创建时间',
+              align: 'center',
+              width: '10%',
+              valign: 'middle',
+              formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format("yyyy-MM-dd hh:mm:ss");
+                } else {
+                  return '-';
+                }
+              }
+            },
+            { field: 'createdBy', title: '操作者', align: 'center', width: '10%', valign: 'middle' }
+
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 10,
+          pagination: true,
+          pageList: [10, 20, 30, 50],
+          sidePagination: "server", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageSize: params.pageSize,
+              pageNumber: params.pageNumber,
+              targetPrettyNo: $('#targetPrettyNo').val(),
+              currentPrettyNo: $('#currentPrettyNo').val(),
+              operator: $('#operator').val()
+            };
+            return param;
+          },
+          uniqueId: 'id',
+          toolbar: '#toolbar',
+          url: '/admin/prettyNumber/record/getList',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
+        })
+
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        })
+      })
+    }
+  },
 
 };
 </script>

src/views/prize/DeviateRangeManageAdminView.vue

@@ -1,84 +1,128 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <!-- .content -->
-                <section class="content">
-                    <div id="table"></div>
-                    <div id="toolbar">
-                        <form action="" id="searchForm" method="POST">
-                            <select name="search-type" id="search-type">
-                                <option value="0">请选择</option>
-                                <option value="1">幸运许愿池偏差类型</option>
-                                <option value="4">梦幻许愿池池偏差类型</option>
-                            </select>
-                        </form>
-                        <button class="btn btn-primary" id="searchBtn">搜索</button>
-                        <button id="add" class="btn btn-default">
-                            <i class="glyphicon glyphicon-plus"></i>新增
-                        </button>
-                    </div>
-                </section>
-            </div>
-        </div>
-    </section>
-    <div class="modal fade" id="deviateRangeModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title" id="modalLabel">偏差范围</h4>
-                </div>
-                <div class="modal-body">
-                    <form class="form-horizontal" id="deviateRangeForm">
-                        <input id="deviateRangeId" type="hidden" name="id" />
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">下限：</label>
-                            <div class="col-sm-8">
-                                <input type="number" id="deviateLowerLimit" name="lowerLimit" class=" validate[required]"
-                                    placeholder="单行输入">
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">上限：</label>
-                            <div class="col-sm-8">
-                                <input type="number" id="deviateUpperLimit" name="upperLimit" class=" validate[required]"
-                                    placeholder="单行输入">
-                            </div>
-                        </div>
-
-                        <div class="form-group type">
-                            <label for="type" class="col-sm-3 control-label">选择类型：</label>
-                            <div class="col-sm-8">
-                                <select name="type" id="type" data-btn-class="btn btn-warning">
-                                    <option value="1">幸运许愿池偏差类型</option>
-                                    <option value="4">梦幻许愿池池偏差类型</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <label class="col-sm-3 control-label">创建者：</label>
-
-                            <div class="col-sm-8">
-                                <input type="text" id="creator" name="creator" class="validate[required]" placeholder="必填项">
-                            </div>
-                        </div>
-                    </form>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                    <button type="button" class="btn btn-primary" id="save">保存</button>
-                </div>
-            </div>
-        </div>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <!-- .content -->
+        <section class="content">
+          <div id="table"></div>
+          <div id="toolbar">
+            <form action=""
+                  id="searchForm"
+                  method="POST">
+              <select name="search-type"
+                      id="search-type">
+                <option value="1">幸运许愿池偏差类型</option>
+                <option value="4">梦幻许愿池池偏差类型</option>
+              </select>
+              <select id="partitionId"></select>
+            </form>
+            <button class="btn btn-primary"
+                    id="searchBtn">搜索</button>
+            <button id="add"
+                    class="btn btn-default">
+              <i class="glyphicon glyphicon-plus"></i>新增
+            </button>
+          </div>
+        </section>
+      </div>
     </div>
+  </section>
+  <div class="modal fade"
+       id="deviateRangeModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title"
+              id="modalLabel">偏差范围</h4>
+        </div>
+        <div class="modal-body">
+          <form class="form-horizontal"
+                id="deviateRangeForm">
+            <input id="deviateRangeId"
+                   type="hidden"
+                   name="id" />
+            <div class="form-group">
+              <label class="col-sm-3 control-label">下限：</label>
+              <div class="col-sm-8">
+                <input type="number"
+                       id="deviateLowerLimit"
+                       name="lowerLimit"
+                       class=" validate[required]"
+                       placeholder="单行输入">
+              </div>
+            </div>
+
+            <div class="form-group">
+              <label class="col-sm-3 control-label">上限：</label>
+              <div class="col-sm-8">
+                <input type="number"
+                       id="deviateUpperLimit"
+                       name="upperLimit"
+                       class=" validate[required]"
+                       placeholder="单行输入">
+              </div>
+            </div>
+
+            <div class="form-group type">
+              <label for="type"
+                     class="col-sm-3 control-label">选择类型：</label>
+              <div class="col-sm-8">
+                <select name="type"
+                        id="type"
+                        data-btn-class="btn btn-warning">
+                  <option value="1">幸运许愿池偏差类型</option>
+                  <option value="4">梦幻许愿池池偏差类型</option>
+                </select>
+              </div>
+            </div>
+
+            <div class="form-group deviatePartitionId">
+              <label for="type"
+                     class="col-sm-3 control-label">选择分区：</label>
+              <div class="col-sm-8">
+                <select name="partitionId"
+                        id="deviatePartitionId"
+                        data-btn-class="btn btn-warning">
+                </select>
+              </div>
+            </div>
+
+            <div class="form-group">
+              <label class="col-sm-3 control-label">创建者：</label>
+
+              <div class="col-sm-8">
+                <input type="text"
+                       id="creator"
+                       name="creator"
+                       class="validate[required]"
+                       placeholder="必填项">
+              </div>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">关闭</button>
+          <button type="button"
+                  class="btn btn-primary"
+                  id="save">保存</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -86,160 +130,190 @@ import TableHelper from '@/utils/bootstrap-table-helper';
 import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
 
 export default {
-    name: "DeviateRangeManageAdminView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
-        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'id', title: 'id', align: 'center', width: '15%' },
-                        { field: 'lowerLimit', title: '下限', align: 'center', width: '15%' },
-                        { field: 'upperLimit', title: '上限', width: '20%' },
-                        { field: 'creator', title: '创建人', align: 'center', width: '5%' },
-                        {
-                            field: 'tmp', title: '操作', align: 'center', width: '20%', formatter: function (val, row, index) {
-                                var key = row.id;
-                                return "<button class='btn btn-sm btn-success opt-edit' data-id=" + key + ">编辑</button>&nbsp;&nbsp;" +
-                                    "<button class='btn btn-sm btn-danger opt-del' data-id=" + key + ">删除</button>";
-                            }
-                        }
-                    ],
-                    cache: false,
-                    striped: true,
-                    showRefresh: true,
-                    pageSize: 10,
-                    pagination: true,
-                    pageList: [10, 20, 30, 50],
-                    sidePagination: "server", //表示服务端请求
-                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-                    //设置为limit可以获取limit, offset, search, sort, order
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNumber: params.pageNumber,
-                            pageSize: params.pageSize,
-                            type: parseInt($("#search-type").val())
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/deviateRange/list',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
+  name: "DeviateRangeManageAdminView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $.ajax({
+        type: 'get',
+        url: '/partition/listPartitionInfo',
+        dataType: 'json',
+        success: function (json) {
+          if (json.code == 200) {
+            var deviatePartitionId = $("#deviatePartitionId");
+            deviatePartitionId.empty();
 
+            var partitionId = $("#partitionId");
+            partitionId.empty();
 
-                // 构建下拉组合框
-                ComboboxHelper.build(null, '#status');
-                ComboboxHelper.build(null, '#type');
-                $("#deviateRangeForm").validationEngine();
+            // 遍历数据并添加 option
+            $.each(json.data, function (index, item) {
+              // 创建新的 option 元素
+              var option = $('<option></option>')
+                .attr('value', item.id)  // 设置 value 属性
+                .text(item.desc);           // 设置文本内容
 
-                $("#add").click(function () {
-                    // 打开编辑弹窗
-                    $('#deviateRangeId').val('');
-                    $("#deviateRangeModal").modal('show');
-                    $("#deviateRangeForm")[0].reset();
-                });
-
-                $("#table").on("click", '.opt-del', function () {
-                    if (confirm("你确认删除该记录吗?" +
-                        "\r\n删除偏差范围，会一起删除偏差奖池对应的配置，请谨慎操作！")) {
-                        var id = $(this).attr("data-id");
-                        $.ajax({
-                            type: 'post',
-                            url: "/admin/deviateRange/del",
-                            data: { 'deviateRangeId': id },
-                            dataType: "json",
-                            success: function (res) {
-                                if (res.code == 200) {
-                                    $("#tipMsg").text("删除成功");
-                                    $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                } else {
-                                    $("#tipMsg").text("删除失败，错误信息：" + res.message);
-                                    $("#tipModal").modal('show');
-                                }
-                            }
-                        });
-                    }
-                });
-
-                $("#table").on("click", '.opt-edit', function () {
-                    var id = $(this).attr("data-id");
-                    $.ajax({
-                        type: "post",
-                        url: "/admin/deviateRange/one",
-                        data: { 'deviateRangeId': id },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data) {
-                                $("#deviateRangeId").val(data.id);
-                                $("#deviateLowerLimit").val(data.lowerLimit);
-                                $("#deviateUpperLimit").val(data.upperLimit);
-                                $("#creator").val(data.creator);
-                                ComboboxHelper.setDef("#type", data.type);
-                                // 打开编辑弹窗
-                                $("#deviateRangeModal").modal('show');
-                            } else {
-                                $("#tipMsg").text("获取偏差范围出错");
-                                $("#tipModal").modal('show');
-                            }
-                        }
-                    });
-                });
-
-                $("#save").click(function () {
-                    if ($("#deviateRangeForm").validationEngine('validate')) {
-                        var lowerLimit = parseInt($('#deviateLowerLimit').val());
-                        var upperLimit = parseInt($('#deviateUpperLimit').val());
-                        if (lowerLimit > upperLimit) {
-                            $("#tipMsg").text("偏差下限不能大于上限");
-                            $("#tipModal").modal('show');
-                            return;
-                        }
-                        $("#save").prop('disabled', true);
-                        $.ajax({
-                            type: "post",
-                            url: "/admin/deviateRange/save",
-                            data: $('#deviateRangeForm').serialize(),
-                            dataType: "json",
-                            success: function (res) {
-                                $("#save").prop('disabled', false);
-                                if (res.code == 200) {
-                                    $("#deviateRangeModal").modal('hide');
-                                    $("#tipMsg").text("保存成功");
-                                    $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                } else {
-                                    $("#tipMsg").text("保存失败，错误信息：" + res.message);
-                                    $("#tipModal").modal('show');
-                                }
-                            }
-                        });
-                    }
-                });
-
-                // 筛选按钮点击事件
-                $('#searchBtn').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
+              // 追加到 select 元素
+              partitionId.append(option.clone());
 
+              deviatePartitionId.append(option.clone());
             });
+          }
         }
-    },
+      });
+
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'id', title: 'id', align: 'center', width: '15%' },
+            { field: 'lowerLimit', title: '下限', align: 'center', width: '15%' },
+            { field: 'upperLimit', title: '上限', width: '20%' },
+            { field: 'creator', title: '创建人', align: 'center', width: '5%' },
+            {
+              field: 'tmp', title: '操作', align: 'center', width: '20%', formatter: function (val, row, index) {
+                var key = row.id;
+                return "<button class='btn btn-sm btn-success opt-edit' data-id=" + key + ">编辑</button>&nbsp;&nbsp;" +
+                  "<button class='btn btn-sm btn-danger opt-del' data-id=" + key + ">删除</button>";
+              }
+            }
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: true,
+          pageSize: 10,
+          pagination: true,
+          pageList: [10, 20, 30, 50],
+          sidePagination: "server", //表示服务端请求
+          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+          //设置为limit可以获取limit, offset, search, sort, order
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNumber: params.pageNumber,
+              pageSize: params.pageSize,
+              type: parseInt($("#search-type").val()),
+              partitionId: parseInt($("#partitionId").val())
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/deviateRange/list',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
+        });
+
+
+        // 构建下拉组合框
+        ComboboxHelper.build(null, '#status');
+        ComboboxHelper.build(null, '#type');
+        $("#deviateRangeForm").validationEngine();
+
+        $("#add").click(function () {
+          // 打开编辑弹窗
+          $('#deviateRangeId').val('');
+          $("#deviateRangeModal").modal('show');
+          $("#deviateRangeForm")[0].reset();
+        });
+
+        $("#table").on("click", '.opt-del', function () {
+          if (confirm("你确认删除该记录吗?" +
+            "\r\n删除偏差范围，会一起删除偏差奖池对应的配置，请谨慎操作！")) {
+            var id = $(this).attr("data-id");
+            $.ajax({
+              type: 'post',
+              url: "/admin/deviateRange/del",
+              data: { 'deviateRangeId': id },
+              dataType: "json",
+              success: function (res) {
+                if (res.code == 200) {
+                  $("#tipMsg").text("删除成功");
+                  $("#tipModal").modal('show');
+                  TableHelper.doRefresh("#table");
+                } else {
+                  $("#tipMsg").text("删除失败，错误信息：" + res.message);
+                  $("#tipModal").modal('show');
+                }
+              }
+            });
+          }
+        });
+
+        $("#table").on("click", '.opt-edit', function () {
+          var id = $(this).attr("data-id");
+          $.ajax({
+            type: "post",
+            url: "/admin/deviateRange/one",
+            data: { 'deviateRangeId': id },
+            dataType: "json",
+            success: function (data) {
+              if (data) {
+                $("#deviateRangeId").val(data.id);
+                $("#deviateLowerLimit").val(data.lowerLimit);
+                $("#deviateUpperLimit").val(data.upperLimit);
+                $("#deviatePartitionId").val(data.partitionId);
+                $("#creator").val(data.creator);
+                ComboboxHelper.setDef("#type", data.type);
+                // 打开编辑弹窗
+                $("#deviateRangeModal").modal('show');
+              } else {
+                $("#tipMsg").text("获取偏差范围出错");
+                $("#tipModal").modal('show');
+              }
+            }
+          });
+        });
+
+        $("#save").click(function () {
+          if ($("#deviateRangeForm").validationEngine('validate')) {
+            var lowerLimit = parseInt($('#deviateLowerLimit').val());
+            var upperLimit = parseInt($('#deviateUpperLimit').val());
+            if (lowerLimit > upperLimit) {
+              $("#tipMsg").text("偏差下限不能大于上限");
+              $("#tipModal").modal('show');
+              return;
+            }
+            $("#save").prop('disabled', true);
+            $.ajax({
+              type: "post",
+              url: "/admin/deviateRange/save",
+              data: $('#deviateRangeForm').serialize(),
+              dataType: "json",
+              success: function (res) {
+                $("#save").prop('disabled', false);
+                if (res.code == 200) {
+                  $("#deviateRangeModal").modal('hide');
+                  $("#tipMsg").text("保存成功");
+                  $("#tipModal").modal('show');
+                  TableHelper.doRefresh("#table");
+                } else {
+                  $("#tipMsg").text("保存失败，错误信息：" + res.message);
+                  $("#tipModal").modal('show');
+                }
+              }
+            });
+          }
+        });
+
+        // 筛选按钮点击事件
+        $('#searchBtn').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });
+
+      });
+    }
+  },
 
 };
 </script>

src/views/prize/PrizeDataAdminNewView.vue

@@ -1,332 +1,400 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <section class="content-header">
-                <h1 id="itemTitle"></h1>
-            </section>
+  <section class="content">
+    <div class="box box-primary">
+      <section class="content-header">
+        <h1 id="itemTitle"></h1>
+      </section>
 
-            <section class="content">
+      <section class="content">
 
-                <div id="toolbar">
-                    <form action="" id="searchForm" method="POST">
-                        <div class="col-sm-12">
-                            <div class="col-sm-4">
-                                <label for="timeBegin" class="qry_col control-label">日期：</label>
-                                <input type="text" name="timeBegin" id="timeBegin" class="input-sm" placeholder="起始时间">
-                                - <input type="text" name="timeEnd" id="timeEnd" class="input-sm" placeholder="结束时间">
-                            </div>
-                            <label for="erbanNo" class="qry_col control-label">平台号：</label>
-                            <div class="col-sm-2">
-                                <input type="text" name="erbanNo" id="erbanNo" class="input-sm" placeholder="">
-                            </div>
-                        </div>
-                        <div class="col-sm-12">
-                            <label for="boxType" class="qry_col control-label">许愿池类型:</label>
-                            <div class="col-sm-2">
-                                <select name="boxType" id="boxType" class="col-sm-2 form-control"
-                                    data-btn-class="btn-warning">
-                                    <option value="" selected="selected">全部</option>
-                                    <option value="1">幸运许愿池</option>
-                                    <option value="2">梦幻许愿池</option>
-                                </select>
-                            </div>
-                            <label for="poolType" class="qry_col control-label">奖池类型:</label>
-                            <div class="col-sm-2">
-                                <select name="poolType" id="poolType" class="col-sm-2 form-control"
-                                    data-btn-class="btn-warning">
-                                    <option value="" selected="selected">全部</option>
-                                    <option value="1">幸运新人奖池</option>
-                                    <option value="2">幸运普通奖池</option>
-                                    <option value="3">幸运白名单奖池</option>
-                                    <option value="4">幸运偏差奖池</option>
-                                    <option value="12">幸运次数奖池</option>
-                                    <option value="7">梦幻普通奖池</option>
-                                    <option value="9">梦幻偏差奖池</option>
-                                    <option value="10">梦幻新人奖池</option>
-                                    <option value="11">梦幻白名单奖池</option>
-                                </select>
-                            </div>
-                            <label for="dataType" class="qry_col control-label">数据类型:</label>
-                            <div class="col-sm-2">
-                                <select name="dataType" id="dataType" class="col-sm-2 form-control"
-                                    data-btn-class="btn-warning">
-                                    <option value="1" selected="selected">普通用户数据</option>
-                                    <option value="2">被排除用户的数据</option>
-                                </select>
-                            </div>
-                        </div>
-                    </form>
-                    <button class="btn btn-primary" id="searchBtn">筛选</button>
-                    <div class="tips">因数据量庞大，默认不会显示每天的结果，默认只展示平台总收益情况，请先选择时间范围再搜索</div>
-                    <div class="dataCount">
-                        <p>
-                            <span>抽奖记录总数：</span>
-                            <span id="countNum"></span>
-                        </p>
-                        <p>
-                            <span>用户投入钻石总数：</span>
-                            <span id="userPay"></span>
-                        </p>
-                        <p>
-                            <span>总平台总价值：</span>
-                            <span id="platformNum"></span>
-                        </p>
-                        <p>
-                            <span>总实际总价值：</span>
-                            <span id="actualNum"></span>
-                        </p>
-                        <p>
-                            <span>用户获得礼物中钻石数：</span>
-                            <span id="giftNum"></span>
-                        </p>
-                        <p>
-                            <span>用户获得非礼物总钻石数：</span>
-                            <span id="notGiftNum"></span>
-                        </p>
-                        <p>
-                            <span>用户获得实物总数：</span>
-                            <span id="realGiftNum"></span>
-                        </p>
-                    </div>
-                </div>
-
-
-                <div id="table"></div>
-            </section>
+        <div id="toolbar">
+          <form action=""
+                id="searchForm"
+                method="POST">
+            <div class="col-sm-12">
+              <label for="partitionId"
+                     class="qry_col control-label">分区：</label>
+              <div class="col-sm-2">
+                <select id="partitionId"
+                        class="input-sm"></select>
+              </div>
+              <div class="col-sm-4">
+                <label for="timeBegin"
+                       class="qry_col control-label">日期：</label>
+                <input type="text"
+                       name="timeBegin"
+                       id="timeBegin"
+                       class="input-sm"
+                       placeholder="起始时间">
+                - <input type="text"
+                       name="timeEnd"
+                       id="timeEnd"
+                       class="input-sm"
+                       placeholder="结束时间">
+              </div>
+              <label for="erbanNo"
+                     class="qry_col control-label">平台号：</label>
+              <div class="col-sm-2">
+                <input type="text"
+                       name="erbanNo"
+                       id="erbanNo"
+                       class="input-sm"
+                       placeholder="">
+              </div>
+            </div>
+            <div class="col-sm-12">
+              <label for="boxType"
+                     class="qry_col control-label">许愿池类型:</label>
+              <div class="col-sm-2">
+                <select name="boxType"
+                        id="boxType"
+                        class="col-sm-2 form-control"
+                        data-btn-class="btn-warning">
+                  <option value=""
+                          selected="selected">全部</option>
+                  <option value="1">幸运许愿池</option>
+                  <option value="2">梦幻许愿池</option>
+                </select>
+              </div>
+              <label for="poolType"
+                     class="qry_col control-label">奖池类型:</label>
+              <div class="col-sm-2">
+                <select name="poolType"
+                        id="poolType"
+                        class="col-sm-2 form-control"
+                        data-btn-class="btn-warning">
+                  <option value=""
+                          selected="selected">全部</option>
+                  <option value="1">幸运新人奖池</option>
+                  <option value="2">幸运普通奖池</option>
+                  <option value="3">幸运白名单奖池</option>
+                  <option value="4">幸运偏差奖池</option>
+                  <option value="12">幸运次数奖池</option>
+                  <option value="7">梦幻普通奖池</option>
+                  <option value="9">梦幻偏差奖池</option>
+                  <option value="10">梦幻新人奖池</option>
+                  <option value="11">梦幻白名单奖池</option>
+                </select>
+              </div>
+              <label for="dataType"
+                     class="qry_col control-label">数据类型:</label>
+              <div class="col-sm-2">
+                <select name="dataType"
+                        id="dataType"
+                        class="col-sm-2 form-control"
+                        data-btn-class="btn-warning">
+                  <option value="1"
+                          selected="selected">普通用户数据</option>
+                  <option value="2">被排除用户的数据</option>
+                </select>
+              </div>
+            </div>
+          </form>
+          <button class="btn btn-primary"
+                  id="searchBtn">筛选</button>
+          <div class="tips">因数据量庞大，默认不会显示每天的结果，默认只展示平台总收益情况，请先选择时间范围再搜索</div>
+          <div class="dataCount">
+            <p>
+              <span>抽奖记录总数：</span>
+              <span id="countNum"></span>
+            </p>
+            <p>
+              <span>用户投入钻石总数：</span>
+              <span id="userPay"></span>
+            </p>
+            <p>
+              <span>总平台总价值：</span>
+              <span id="platformNum"></span>
+            </p>
+            <p>
+              <span>总实际总价值：</span>
+              <span id="actualNum"></span>
+            </p>
+            <p>
+              <span>用户获得礼物中钻石数：</span>
+              <span id="giftNum"></span>
+            </p>
+            <p>
+              <span>用户获得非礼物总钻石数：</span>
+              <span id="notGiftNum"></span>
+            </p>
+            <p>
+              <span>用户获得实物总数：</span>
+              <span id="realGiftNum"></span>
+            </p>
+          </div>
         </div>
-    </section>
+
+        <div id="table"></div>
+      </section>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrizeDataAdminNewView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "PrizeDataAdminNewView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $.ajax({
+          type: 'get',
+          url: '/partition/listPartitionInfo',
+          dataType: 'json',
+          success: function (json) {
+            if (json.code == 200) {
+              //var deviatePartitionId = $("#deviatePartitionId");
+              //deviatePartitionId.empty();
+
+              var partitionId = $("#partitionId");
+              partitionId.empty();
+
+              var defaultOption = $('<option></option>').attr('value', '').text("全部");
+              partitionId.append(defaultOption);
+
+              // 遍历数据并添加 option
+              $.each(json.data, function (index, item) {
+                // 创建新的 option 元素
+                var option = $('<option></option>')
+                  .attr('value', item.id)  // 设置 value 属性
+                  .text(item.desc);           // 设置文本内容
+
+                // 追加到 select 元素
+                partitionId.append(option.clone());
+
+                //deviatePartitionId.append(option.clone());
+              });
+            }
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                var picker1 = $('#timeBegin').datetimepicker({
-                    format: 'yyyy-mm-dd',
-                    todayBtn: true,
-                    autoclose: true,
-                    minView: 'month',
-                    endDate: new Date()
-                });
 
-                var picker2 = $('#timeEnd').datetimepicker({
-                    format: 'yyyy-mm-dd',
-                    todayBtn: true,
-                    autoclose: true,
-                    minView: 'month',
-                    endDate: new Date()
-                });
+        var picker1 = $('#timeBegin').datetimepicker({
+          format: 'yyyy-mm-dd',
+          todayBtn: true,
+          autoclose: true,
+          minView: 'month',
+          endDate: new Date()
+        });
 
-                var $timeBegin = '', $timeEnd = '';
-                var main = {
-                    init: function () {
-                        this.eventRegister();
-                        this.valueChange();
-                    },
+        var picker2 = $('#timeEnd').datetimepicker({
+          format: 'yyyy-mm-dd',
+          todayBtn: true,
+          autoclose: true,
+          minView: 'month',
+          endDate: new Date()
+        });
 
-                    eventRegister: function () {
-                        picker1.on('changeDate', function () {
-                            var date = $('#timeBegin').datetimepicker('getDate');
-                            picker2.datetimepicker('setStartDate', date);
-                        });
-                        picker2.on('changeDate', function () {
-                            var date = $('#timeEnd').datetimepicker('getDate');
-                            picker1.datetimepicker('setEndDate', date);
-                        });
+        var $timeBegin = '', $timeEnd = '';
+        var main = {
+          init: function () {
+            this.eventRegister();
+            this.valueChange();
+          },
 
-                        $('#searchBtn').on('click', function () {
-                            var $dataCount = $('.dataCount');
-                            // var $startDate = $('#timeBegin').val().replace(/\//g,'-');
-                            var $startDate;
-                            if ($('#timeBegin').val() == "" || $('#timeBegin').val() == 'undefined') {
-                                $startDate = '';
-                            } else {
-                                /*var arr = $('#timeBegin').val().split('/');
-                                var length = arr.length;
-                                var $startDate = arr[length-1] +'-' + arr[0] + '-' + arr[length - 2];*/
-                                $startDate = $('#timeBegin').val();
-                            }
-                            var $endDate;
-                            if ($('#timeEnd').val() == '' || $('#timeEnd').val() == 'undefined') {
-                                $endDate = $startDate;
-                            } else {
-                                /*var arr2 = $('#timeEnd').val().split('/');
-                                var length2 = arr2.length;
-                                var $endDate = arr2[length2-1] + '-' + arr2[0]  + '-' + arr2[length2-2];*/
-                                $endDate = $('#timeEnd').val();
-                            }
+          eventRegister: function () {
+            picker1.on('changeDate', function () {
+              var date = $('#timeBegin').datetimepicker('getDate');
+              picker2.datetimepicker('setStartDate', date);
+            });
+            picker2.on('changeDate', function () {
+              var date = $('#timeEnd').datetimepicker('getDate');
+              picker1.datetimepicker('setEndDate', date);
+            });
 
-                            if ($startDate == '') {
-                                $timeBegin = '';
-                                $timeEnd = '';
-                            } else {
-                                $timeBegin = $startDate + ' 00:00:00';
-                                $timeEnd = $endDate + ' 23:59:59';
-                            }
+            $('#searchBtn').on('click', function () {
+              var $dataCount = $('.dataCount');
+              // var $startDate = $('#timeBegin').val().replace(/\//g,'-');
+              var $startDate;
+              if ($('#timeBegin').val() == "" || $('#timeBegin').val() == 'undefined') {
+                $startDate = '';
+              } else {
+                /*var arr = $('#timeBegin').val().split('/');
+                var length = arr.length;
+                var $startDate = arr[length-1] +'-' + arr[0] + '-' + arr[length - 2];*/
+                $startDate = $('#timeBegin').val();
+              }
+              var $endDate;
+              if ($('#timeEnd').val() == '' || $('#timeEnd').val() == 'undefined') {
+                $endDate = $startDate;
+              } else {
+                /*var arr2 = $('#timeEnd').val().split('/');
+                var length2 = arr2.length;
+                var $endDate = arr2[length2-1] + '-' + arr2[0]  + '-' + arr2[length2-2];*/
+                $endDate = $('#timeEnd').val();
+              }
 
-                            $.post('/admin/drawlottery/record/totalNew', {
-                                erbanNo: $('#erbanNo').val(),
-                                startDate: $timeBegin,
-                                endDate: $timeEnd,
-                                boxType: $('#boxType').val(),
-                                poolType: $('#poolType').val(),
-                                dataType: $('#dataType').val()
-                            }, function (res) {
-                                console.log(res);
+              if ($startDate == '') {
+                $timeBegin = '';
+                $timeEnd = '';
+              } else {
+                $timeBegin = $startDate + ' 00:00:00';
+                $timeEnd = $endDate + ' 23:59:59';
+              }
 
-                                if (res.code == 200) {
-                                    var data = res.data;
-                                    $dataCount.find('#countNum').html(data.countNum);
-                                    $dataCount.find('#userPay').html(data.userTotalPay);
-                                    $dataCount.find('#platformNum').html(data.totalPlatformValue);
-                                    $dataCount.find('#actualNum').html(data.totalActualValue);
-                                    $dataCount.find('#giftNum').html(data.totalGiftActualValue);
-                                    $dataCount.find('#notGiftNum').html(data.totalNotGiftActualValue);
-                                    $dataCount.find('#realGiftNum').html(data.totalRealGiftActualValue);
-                                    //                            TableHelper.doRefresh('#table');
-                                    tableRefresh();
-                                } else {
-                                    console.log('数据错误,导致加载失败,' + res.code);
-                                }
-                            })
-                        });
+              $.post('/admin/drawlottery/record/totalNew', {
+                erbanNo: $('#erbanNo').val(),
+                startDate: $timeBegin,
+                endDate: $timeEnd,
+                boxType: $('#boxType').val(),
+                poolType: $('#poolType').val(),
+                dataType: $('#dataType').val(),
+                partitionId: $("#partitionId").val(),
+              }, function (res) {
+                console.log(res);
 
-                        $('#table').on('click', '#details', function () {
-                            console.log($(this).data('id'));
-                        });
-
-
-                    },
-
-                    valueChange: function () {
-                        var $dataCount = $('.dataCount');
-                        $.post('/admin/drawlottery/record/totalNew', {
-                            erbanNo: $('#erbanNo').val(),
-                            startDate: $timeBegin,
-                            endDate: $timeEnd,
-                            boxType: $('#boxType').val(),
-                            poolType: $('#poolType').val(),
-                            dataType: $('#dataType').val()
-                        }, function (res) {
-                            console.log(res);
-
-                            if (res.code == 200) {
-                                var data = res.data;
-                                $dataCount.find('#countNum').html(data.countNum);
-                                $dataCount.find('#userPay').html(data.userTotalPay);
-                                $dataCount.find('#platformNum').html(data.totalPlatformValue);
-                                $dataCount.find('#actualNum').html(data.totalActualValue);
-                                $dataCount.find('#giftNum').html(data.totalGiftActualValue);
-                                $dataCount.find('#notGiftNum').html(data.totalNotGiftActualValue);
-                                $dataCount.find('#realGiftNum').html(data.totalRealGiftActualValue);
-                                TableHelper.doRefresh('#table');
-                            } else {
-                                console.log('数据错误,导致加载失败,' + res.code);
-                            }
-                        })
-                    }
-                };
-                main.init();
-
-                function tableRefresh() {
-                    $('#table').bootstrapTable('destroy');
-                    $('#table').bootstrapTable({
-                        columns: [
-                            {
-                                field: 'createTime', title: '日期', align: 'center', valign: 'middle', width: '20%', formatter: function (val, rows, index) {
-                                    if (val) {
-                                        var date = new Date(val);
-                                        return date.format('yyyy-MM-dd')
-                                    } else {
-                                        return '-';
-                                    }
-                                }
-                            },
-                            { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
-                            // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
-                            //     var key = row.createTime;
-                            //     return '<button class="btn btn-primary btn-sm" id="details" data-id="' + key + '">查看详情</button>';
-                            // }}
-                        ],
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 10,
-                        pagination: true,
-                        pageList: [10, 20, 30, 50],
-                        sidePagination: 'server',
-                        queryParamsType: 'undefined',
-                        queryParams: function queryParams(params) {
-                            var param = {
-                                pageSize: params.pageSize,
-                                pageNumber: params.pageNumber,
-                                startDate: $timeBegin,
-                                endDate: $timeEnd,
-                                boxType: $('#boxType').val(),
-                                poolType: $('#poolType').val(),
-                                erbanNo: $('#erbanNo').val(),
-                                dataType: $('#dataType').val(),
-                            };
-                            return param;
-                        },
-                        uniqueId: 'id',
-                        toolbar: '#toolbar',
-                        url: '/admin/drawlottery/record/listNew',
-                        onLoadSuccess: function () {
-                            console.log('load success');
-                        },
-                        onLOadError: function () {
-                            console.log('load fail');
-                        }
-                    });
+                if (res.code == 200) {
+                  var data = res.data;
+                  $dataCount.find('#countNum').html(data.countNum);
+                  $dataCount.find('#userPay').html(data.userTotalPay);
+                  $dataCount.find('#platformNum').html(data.totalPlatformValue);
+                  $dataCount.find('#actualNum').html(data.totalActualValue);
+                  $dataCount.find('#giftNum').html(data.totalGiftActualValue);
+                  $dataCount.find('#notGiftNum').html(data.totalNotGiftActualValue);
+                  $dataCount.find('#realGiftNum').html(data.totalRealGiftActualValue);
+                  //                            TableHelper.doRefresh('#table');
+                  tableRefresh();
+                } else {
+                  console.log('数据错误,导致加载失败,' + res.code);
                 }
+              })
+            });
+
+            $('#table').on('click', '#details', function () {
+              console.log($(this).data('id'));
+            });
 
 
+          },
+
+          valueChange: function () {
+            var $dataCount = $('.dataCount');
+            $.post('/admin/drawlottery/record/totalNew', {
+              erbanNo: $('#erbanNo').val(),
+              startDate: $timeBegin,
+              endDate: $timeEnd,
+              boxType: $('#boxType').val(),
+              poolType: $('#poolType').val(),
+              dataType: $('#dataType').val()
+            }, function (res) {
+              console.log(res);
+
+              if (res.code == 200) {
+                var data = res.data;
+                $dataCount.find('#countNum').html(data.countNum);
+                $dataCount.find('#userPay').html(data.userTotalPay);
+                $dataCount.find('#platformNum').html(data.totalPlatformValue);
+                $dataCount.find('#actualNum').html(data.totalActualValue);
+                $dataCount.find('#giftNum').html(data.totalGiftActualValue);
+                $dataCount.find('#notGiftNum').html(data.totalNotGiftActualValue);
+                $dataCount.find('#realGiftNum').html(data.totalRealGiftActualValue);
+                TableHelper.doRefresh('#table');
+              } else {
+                console.log('数据错误,导致加载失败,' + res.code);
+              }
             })
+          }
+        };
+        main.init();
+
+        function tableRefresh () {
+          $('#table').bootstrapTable('destroy');
+          $('#table').bootstrapTable({
+            columns: [
+              {
+                field: 'createTime', title: '日期', align: 'center', valign: 'middle', width: '20%', formatter: function (val, rows, index) {
+                  if (val) {
+                    var date = new Date(val);
+                    return date.format('yyyy-MM-dd')
+                  } else {
+                    return '-';
+                  }
+                }
+              },
+              { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
+              // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
+              //     var key = row.createTime;
+              //     return '<button class="btn btn-primary btn-sm" id="details" data-id="' + key + '">查看详情</button>';
+              // }}
+            ],
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 10,
+            pagination: true,
+            pageList: [10, 20, 30, 50],
+            sidePagination: 'server',
+            queryParamsType: 'undefined',
+            queryParams: function queryParams (params) {
+              var param = {
+                pageSize: params.pageSize,
+                pageNumber: params.pageNumber,
+                startDate: $timeBegin,
+                endDate: $timeEnd,
+                boxType: $('#boxType').val(),
+                poolType: $('#poolType').val(),
+                erbanNo: $('#erbanNo').val(),
+                dataType: $('#dataType').val(),
+                partitionId: $('#partitionId').val(),
+              };
+              return param;
+            },
+            uniqueId: 'id',
+            toolbar: '#toolbar',
+            url: '/admin/drawlottery/record/listNew',
+            onLoadSuccess: function () {
+              console.log('load success');
+            },
+            onLOadError: function () {
+              console.log('load fail');
+            }
+          });
         }
-    },
+
+
+      })
+    }
+  },
 
 };
 </script>
 
 <style scoped>
 .dataCount {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-top: 10px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-top: 10px;
 }
 
-.dataCount>p {
-    padding: 5px;
-    border-radius: 5px;
-    background: #ccc;
-    margin-right: 10px;
+.dataCount > p {
+  padding: 5px;
+  border-radius: 5px;
+  background: #ccc;
+  margin-right: 10px;
 }
 
 .tips {
-    color: red;
-    font-size: 14px;
+  color: red;
+  font-size: 14px;
 }
 
 .qry_col {
-    float: left;
-}</style>
+  float: left;
+}
+</style>

src/views/prize/PrizeManageAdminView.vue

@@ -12,9 +12,14 @@
         <div id="toolbar">
 
           <div class="col-sm-12">
-            <form action="" id="searchForm" method="POST">
-
-              转盘分类：<select name="jackpotType" id="jackpotType" data-btn-class="btn btn-warning">
+            <form action=""
+                  id="searchForm"
+                  method="POST">
+              分区：<select id="partitionId"
+                      class="input-sm"></select>
+              转盘分类：<select name="jackpotType"
+                      class="input-sm"
+                      id="jackpotType">
                 <option value="1">幸运新人奖池</option>
                 <option value="2">幸运普通奖池</option>
                 <option value="3">幸运白名单奖池</option>
@@ -29,17 +34,23 @@
               </select>
               <label class="deviateRange">
                 偏差范围：
-                <select name="deviateRange" id="deviateRange" data-btn-class="btn btn-warning">
+                <select name="deviateRange"
+                        id="deviateRange"
+                        data-btn-class="btn btn-warning">
                 </select>
               </label>
               <label class="diamondDeviateRange">
                 偏差范围：
-                <select name="diamondDeviateRange" id="diamondDeviateRange" data-btn-class="btn btn-warning">
+                <select name="diamondDeviateRange"
+                        id="diamondDeviateRange"
+                        data-btn-class="btn btn-warning">
                 </select>
               </label>
             </form>
-            <button class="btn btn-primary" id="searchBtn">搜索</button>
-            <button class="btn btn-primary" id="add">添加奖品</button>
+            <button class="btn btn-primary"
+                    id="searchBtn">搜索</button>
+            <button class="btn btn-primary"
+                    id="add">添加奖品</button>
           </div>
 
           <div class="col-sm-12 jackpot">
@@ -51,10 +62,14 @@
             </p>
 
             <p class="col-sm-12">
-              <span class="col-sm-3" id="jackpotName"></span>
-              <span class="col-sm-3" id="jackpotNum"></span>
-              <span class="col-sm-3" id="prizeNum"></span>
-              <span class="col-sm-3" id="expectNum"></span>
+              <span class="col-sm-3"
+                    id="jackpotName"></span>
+              <span class="col-sm-3"
+                    id="jackpotNum"></span>
+              <span class="col-sm-3"
+                    id="prizeNum"></span>
+              <span class="col-sm-3"
+                    id="expectNum"></span>
             </p>
           </div>
 
@@ -65,31 +80,47 @@
   </section>
 
   <!-- 添加弹窗 -->
-  <div class="modal fade" id="addModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+  <div class="modal fade"
+       id="addModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
 
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
 
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close">
             <span aria-hidden="true">x</span>
           </button>
 
-          <h4 class="modal-title" id="addModalLabel">添加奖品</h4>
+          <h4 class="modal-title"
+              id="addModalLabel">添加奖品</h4>
         </div>
 
         <div class="modal-body">
-          <form action="" class="form-horizontal" id="addForm">
+          <form action=""
+                class="form-horizontal"
+                id="addForm">
 
             <!-- 选择奖品 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">选择奖品：</label>
+              <label for=""
+                     class="col-sm-3 control-label">选择奖品：</label>
               <div class="col-sm-8">
-                <select name="awardType" id="awardType" data-btn-class="btn btn-warning">
+                <select name="awardType"
+                        id="awardType"
+                        data-btn-class="btn btn-warning">
                   <!-- <option value=""></option> -->
                 </select>
 
-                <select name="awardChoose" id="awardChoose" data-btn-class="btn btn-warning">
+                <select name="awardChoose"
+                        id="awardChoose"
+                        data-btn-class="btn btn-warning">
                   <!-- <option value=""></option> -->
                 </select>
               </div>
@@ -97,19 +128,29 @@
 
             <!-- 奖品个数 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">奖品个数：</label>
+              <label for=""
+                     class="col-sm-3 control-label">奖品个数：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="jackpotNumber" name="jackpotNumber" class=" validate[required]" placeholder="单行输入">
+                <input type="text"
+                       id="jackpotNumber"
+                       name="jackpotNumber"
+                       class=" validate[required]"
+                       placeholder="单行输入">
               </div>
             </div>
 
             <!-- 中奖率 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">实际中奖率：</label>
+              <label for=""
+                     class="col-sm-3 control-label">实际中奖率：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="winningRate" name="winningRate" class=" validate[required]" placeholder="单行输入">%
+                <input type="text"
+                       id="winningRate"
+                       name="winningRate"
+                       class=" validate[required]"
+                       placeholder="单行输入">%
                 <br />
                 <div class="tips">
                   <i class="glyphicon glyphicon-info-sign"></i>中奖率综合为100，当前概率不得超过100
@@ -119,10 +160,15 @@
 
             <!-- 展示中奖率 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">展示中奖率：</label>
+              <label for=""
+                     class="col-sm-3 control-label">展示中奖率：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="showRate" name="showRate" class=" validate[required]" placeholder="单行输入">%
+                <input type="text"
+                       id="showRate"
+                       name="showRate"
+                       class=" validate[required]"
+                       placeholder="单行输入">%
                 <br />
                 <div class="tips">
                   <i class="glyphicon glyphicon-info-sign"></i>中奖率综合为100，当前概率不得超过100
@@ -131,21 +177,41 @@
             </div>
 
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">是否默认奖品：</label>
+              <label for=""
+                     class="col-sm-3 control-label">是否默认奖品：</label>
               <div class="col-sm-8">
-                <select name="itemType" id="itemType" data-btn-class="btn btn-warning">
+                <select name="itemType"
+                        id="itemType"
+                        data-btn-class="btn btn-warning">
                   <option value="1"> 默认奖品 </option>
                   <option value="2"> 普通奖品 </option>
                 </select>
               </div>
             </div>
 
-            <!-- 创建者 -->
-            <div class="form-group">
-              <label for="" class="col-sm-3 control-label">创建者：</label>
+            <!-- 分区 -->
+            <div class="form-group awardPartitionId">
+              <label for="awardPartitionId"
+                     class="col-sm-3 control-label">分区：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="creator" name="creator" class="validate[required]" placeholder="必填项">
+                <select name="awardPartitionId"
+                        id="awardPartitionId">
+                </select>
+              </div>
+            </div>
+
+            <!-- 创建者 -->
+            <div class="form-group">
+              <label for=""
+                     class="col-sm-3 control-label">创建者：</label>
+
+              <div class="col-sm-8">
+                <input type="text"
+                       id="creator"
+                       name="creator"
+                       class="validate[required]"
+                       placeholder="必填项">
               </div>
             </div>
 
@@ -153,8 +219,12 @@
         </div>
 
         <div class="modal-footer">
-          <button class="btn btn-default" type="button" id="addReset">重置</button>
-          <button class="btn btn-primary" type="button" id="addSave">保存</button>
+          <button class="btn btn-default"
+                  type="button"
+                  id="addReset">重置</button>
+          <button class="btn btn-primary"
+                  type="button"
+                  id="addSave">保存</button>
         </div>
       </div>
     </div>
@@ -162,35 +232,56 @@
   </div>
 
   <!-- 编辑弹窗 -->
-  <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-    <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="editModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close">
             <span aria-hidden="true">x</span>
           </button>
-          <h4 class="modal-title" id="editModalLabel">编辑奖品</h4>
+          <h4 class="modal-title"
+              id="editModalLabel">编辑奖品</h4>
         </div>
 
         <div class="modal-body">
-          <form action="" class="form-horizontal" id="editForm">
-            <input type="hidden" id="editId">
+          <form action=""
+                class="form-horizontal"
+                id="editForm">
+            <input type="hidden"
+                   id="editId">
             <!-- 奖品个数 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">奖品个数：</label>
+              <label for=""
+                     class="col-sm-3 control-label">奖品个数：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="jackpotNumber2" name="jackpotNumber2" class=" validate[required]"
-                  placeholder="单行输入">
+                <input type="text"
+                       id="jackpotNumber2"
+                       name="jackpotNumber2"
+                       class=" validate[required]"
+                       placeholder="单行输入">
               </div>
             </div>
 
             <!-- 中奖率 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">实际中奖率：</label>
+              <label for=""
+                     class="col-sm-3 control-label">实际中奖率：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="winningRate2" name="winningRate2" class=" validate[required]" placeholder="单行输入">%
+                <input type="text"
+                       id="winningRate2"
+                       name="winningRate2"
+                       class=" validate[required]"
+                       placeholder="单行输入">%
                 <br />
                 <div class="tips">
                   <i class="glyphicon glyphicon-info-sign"></i>中奖率综合为100，当前概率不得超过100
@@ -200,10 +291,15 @@
 
             <!-- 展示给用户看的中奖率 -->
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">展示中奖率：</label>
+              <label for=""
+                     class="col-sm-3 control-label">展示中奖率：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="showRate2" name="showRate2" class=" validate[required]" placeholder="单行输入">%
+                <input type="text"
+                       id="showRate2"
+                       name="showRate2"
+                       class=" validate[required]"
+                       placeholder="单行输入">%
                 <br />
                 <div class="tips">
                   <i class="glyphicon glyphicon-info-sign"></i>中奖率综合为100，当前概率不得超过100
@@ -211,29 +307,52 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="" class="col-sm-3 control-label">是否默认奖品：</label>
+              <label for=""
+                     class="col-sm-3 control-label">是否默认奖品：</label>
               <div class="col-sm-8">
-                <select name="itemType" id="itemType2" data-btn-class="btn btn-warning">
+                <select name="itemType"
+                        id="itemType2"
+                        data-btn-class="btn btn-warning">
                   <option value="1"> 默认奖品 </option>
                   <option value="2"> 普通奖品 </option>
                 </select>
               </div>
             </div>
 
-            <!-- 创建者 -->
-            <div class="form-group">
-              <label for="" class="col-sm-3 control-label">创建者：</label>
+            <!-- 分区 -->
+            <div class="form-group awardPartitionId">
+              <label for="awardPartitionId2"
+                     class="col-sm-3 control-label">分区：</label>
 
               <div class="col-sm-8">
-                <input type="text" id="creator2" name="creator2" class="validate[required]">
+                <select name="awardPartitionId2"
+                        id="awardPartitionId2">
+                </select>
+              </div>
+            </div>
+
+            <!-- 创建者 -->
+            <div class="form-group">
+              <label for=""
+                     class="col-sm-3 control-label">创建者：</label>
+
+              <div class="col-sm-8">
+                <input type="text"
+                       id="creator2"
+                       name="creator2"
+                       class="validate[required]">
               </div>
             </div>
           </form>
         </div>
 
         <div class="modal-footer">
-          <button class="btn btn-default" type="button" id="editReset">重置</button>
-          <button class="btn btn-primary" type="button" id="editSave">保存</button>
+          <button class="btn btn-default"
+                  type="button"
+                  id="editReset">重置</button>
+          <button class="btn btn-primary"
+                  type="button"
+                  id="editSave">保存</button>
         </div>
       </div>
     </div>
@@ -243,6 +362,7 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
+var partitionInfo = {}
 var idObj = {};
 var typeObj = {};
 var pId = '', saveId = '';
@@ -251,32 +371,85 @@ var ACCURACY = 1000; // 小数点精度
 var RATIO_PART = 100000; // 概率换算单位
 export default {
   name: "PrizeManageAdminView",
-  setup() {
+  setup () {
     return {};
   },
-  created() {
+  created () {
     this.initData();
 
   },
-  mounted() {
+  mounted () {
 
   },
   methods: {
-    initData() {
+    initData () {
       this.$nextTick(function () {
         var main = {
           init: function () {
+            this.initPartitionIdSelect();
+
             $('.deviateRange').hide();
             $('.chargeDeviateRange').hide();
             $('.diamondDeviateRange').hide();
+
             this.eventRegister();
             this.getDataFormBack();
+
             this.initDeviateRangeSelect();
             this.initDiamondDeviateRangeSelect();
             //$('#selectReplacePrize').hide();
             //this.initReplacePrizeSelect();
           },
 
+          initPartitionIdSelect: function () {
+            $.ajax({
+              type: 'get',
+              url: '/partition/listPartitionInfo',
+              dataType: 'json',
+              success: function (json) {
+                if (json.code == 200) {
+                  var awardPartitionId = $("#awardPartitionId");
+                  awardPartitionId.empty();
+
+                  var awardPartitionId2 = $("#awardPartitionId2");
+                  awardPartitionId2.empty();
+
+                  var partitionId = $("#partitionId");
+                  partitionId.empty();
+
+                  var defaultOption = $('<option></option>').attr('value', '').text("全部");
+                  partitionId.append(defaultOption);
+
+                  // 遍历数据并添加 option
+                  $.each(json.data, function (index, item) {
+                    // 创建新的 option 元素
+                    var option = $('<option></option>')
+                      .attr('value', item.id)  // 设置 value 属性
+                      .text(item.desc);           // 设置文本内容
+
+                    // 追加到 select 元素
+                    partitionId.append(option.clone());
+
+                    awardPartitionId.append(option.clone());
+
+                    awardPartitionId2.append(option.clone());
+                  });
+
+                  partitionInfo = json.data.reduce((acc, item) => {
+                    acc[item.id] = item.desc;
+                    return acc;
+                  }, {});
+                }
+              }
+            });
+
+            $('#partitionId').change(function () {
+              const partitionId = $(this).val();
+              main.initDeviateRangeSelect(partitionId);
+              main.initDiamondDeviateRangeSelect(partitionId);
+            });
+          },
+
           eventRegister: function () {
 
           },
@@ -306,36 +479,38 @@ export default {
             });
           },
 
-          initDeviateRangeSelect: function () {
-            let options = $('#deviateRange').children();
-            if (options.length <= 0) {
-              $.get('/admin/deviateRange/list?type=1', {}, function (res) {
-                if (res.total > 0) {
-                  var rows = res.rows;
-                  for (var i = 0; i < rows.length; i++) {
-                    var deviateRange = rows[i];
-                    var str = '<option value=' + deviateRange.id + '>' + deviateRange.lowerLimit + '~' + deviateRange.upperLimit + '</option>';
+          initDeviateRangeSelect: function (partitionId) {
+            $('#deviateRange').empty();
+
+            $.get('/admin/deviateRange/list?type=1', {}, function (res) {
+              if (res.total > 0) {
+                var rows = res.rows;
+                for (var i = 0; i < rows.length; i++) {
+                  var deviateRange = rows[i];
+                  if (undefined != partitionId && '' != partitionId && deviateRange.partitionId == partitionId) {
+                    var str = '<option partitionId = ' + deviateRange.partitionId + ' value=' + deviateRange.id + '>' + deviateRange.lowerLimit + '~' + deviateRange.upperLimit + '</option>';
                     $('#deviateRange').append(str);
                   }
                 }
-              });
-            }
+              }
+            });
           },
 
-          initDiamondDeviateRangeSelect: function () {
-            let options = $('#diamondDeviateRange').children();
-            if (options.length <= 0) {
-              $.get('/admin/deviateRange/list?type=4', {}, function (res) {
-                if (res.total > 0) {
-                  var rows = res.rows;
-                  for (var i = 0; i < rows.length; i++) {
-                    var deviateRange = rows[i];
-                    var str = '<option value=' + deviateRange.id + '>' + deviateRange.lowerLimit + '~' + deviateRange.upperLimit + '</option>';
+          initDiamondDeviateRangeSelect: function (partitionId) {
+            $('#diamondDeviateRange').empty();
+
+            $.get('/admin/deviateRange/list?type=4', {}, function (res) {
+              if (res.total > 0) {
+                var rows = res.rows;
+                for (var i = 0; i < rows.length; i++) {
+                  var deviateRange = rows[i];
+                  if (undefined != partitionId && '' != partitionId && deviateRange.partitionId == partitionId) {
+                    var str = '<option partitionId = ' + deviateRange.partitionId + ' value=' + deviateRange.id + '>' + deviateRange.lowerLimit + '~' + deviateRange.upperLimit + '</option>';
                     $('#diamondDeviateRange').append(str);
                   }
                 }
-              });
-            }
+              }
+            });
           },
 
           initReplacePrizeSelect: function () {
@@ -358,7 +533,7 @@ export default {
         $('#table').bootstrapTable('destroy');
         $('#table').bootstrapTable({
           columns: [
-            { field: 'id', title: '奖品编号', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'id', title: '奖品编号', align: 'center', valign: 'middle', width: '3%' },
             {
               field: 'prizeName', title: '奖品名称', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                 var key = row.prizeId;
@@ -448,6 +623,11 @@ export default {
               }
             },
             { field: 'usePrizeNum', title: '被抽中数量', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'partitionId', title: '分区', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+                return partitionInfo[val] || val;
+              }
+            },
             {
               field: '', title: '操作', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                 var key = row.id;
@@ -463,13 +643,14 @@ export default {
           pageList: [10, 20, 30, 50],
           sidePagination: 'server',
           queryParamsType: 'undefined',
-          queryParams: function queryParams(params) {
+          queryParams: function queryParams (params) {
 
             var param = {
               pageSize: params.pageSize,
               pageNumber: params.pageNumber,
               poolType: parseInt($('#jackpotType').val()),
-              deviateRangeId: getDeviateRangeId()
+              deviateRangeId: getDeviateRangeId(),
+              partitionId: $('#partitionId').val(),
             };
 
             return param;
@@ -479,7 +660,6 @@ export default {
           url: '/admin/prizePoolItem/list',
           onLoadSuccess: function (res) {
             console.log('load success');
-            console.log(res.rows);
             var arr = [];
             var Num = 0;
             var expectNum = 0;
@@ -587,7 +767,6 @@ export default {
         $('#addModal').find('#awardType').on('change', function () {
           $('#awardChoose').find('option').remove();
           var key = $(this).val();
-          console.log(key);
           // var str = '<option></option>';
           // $('#awardChoose').append(str);
           var str;
@@ -605,12 +784,12 @@ export default {
           var id = $(this).data('id');
           var data = $('#table').bootstrapTable('getRowByUniqueId', id);
 
-          console.log(data);
           $('#editModal').find('#jackpotNumber2').val(data.prizeNum);
           $('#editModal').find('#winningRate2').val(data.occupationRatio / ACCURACY);
           $('#editModal').find('#showRate2').val(data.showRatio / ACCURACY);
           $('#editModal').find('#creator2').val(data.creator);
           $('#editModal').find('#itemType2').val(data.itemType);
+          $('#editModal').find('#awardPartitionId2').val(data.partitionId);
           pId = data.prizeId;
           saveId = id;
         });
@@ -660,7 +839,8 @@ export default {
             occupationRatio: $('#winningRate').val() * ACCURACY,
             showRatio: $('#showRate').val() * ACCURACY,
             creator: $('#creator').val(),
-            itemType: $('#itemType').val()
+            itemType: $('#itemType').val(),
+            partitionId: $('#awardPartitionId').val(),
           }, function (res) {
             if (res.code == 200) {
               $('#addModal').modal('hide');
@@ -715,7 +895,8 @@ export default {
             occupationRatio: $('#winningRate2').val() * ACCURACY,
             showRatio: $('#showRate2').val() * ACCURACY,
             creator: $('#creator2').val(),
-            itemType: $('#itemType2').val()
+            itemType: $('#itemType2').val(),
+            partitionId: $('#awardPartitionId2').val(),
           }, function (res) {
             if (res.code == 200) {
               // console.log(res);
@@ -774,7 +955,7 @@ export default {
 
 };
 
-function clearModal() {
+function clearModal () {
   $('#addForm').find('input[type=text],select,input[type=hidden]').each(function () {
     $(this).val('');
   });
@@ -783,7 +964,7 @@ function clearModal() {
   });
 }
 
-function getDeviateRangeId() {
+function getDeviateRangeId () {
   if ($('#deviateRange').val()) {
     var jackpotType = $('#jackpotType').val();
     if (jackpotType == '4') {
@@ -814,7 +995,7 @@ function getDeviateRangeId() {
   align-items: center;
 }
 
-#toolbar>div:first-child {
+#toolbar > div:first-child {
   margin-right: 10px;
 }
 </style>

src/views/prize/PrizeRecordAdminView.vue

@@ -1,179 +1,197 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <section class="content-header">
-                <h1 id="itemTitle"></h1>
-            </section>
+  <section class="content">
+    <div class="box box-primary">
+      <section class="content-header">
+        <h1 id="itemTitle"></h1>
+      </section>
 
-            <section class="content">
-                <div id="table"></div>
-                <div id="toolbar">
-                    <div class="col-sm-12">
-                        <div class="pull-left">
-                            <form action="/admin/box/record/export" id="searchForm" method="POST">
-                                平台号：<input type="text" id="msNo" name="msNo" class="input-sm" placeholder="请输入平台号">
+      <section class="content">
+        <div id="table"></div>
+        <div id="toolbar">
+          <div class="col-sm-12">
+            <div class="pull-left">
+              <form action="/admin/box/record/export"
+                    id="searchForm"
+                    method="POST">
+                平台号：<input type="text"
+                       id="msNo"
+                       name="msNo"
+                       class="input-sm"
+                       placeholder="请输入平台号">
 
-                                奖品名称：<input type="text" id="prizeName" name="prizeName" class="input-sm"
-                                    placeholder="请输入奖品名称">
+                奖品名称：<input type="text"
+                       id="prizeName"
+                       name="prizeName"
+                       class="input-sm"
+                       placeholder="请输入奖品名称">
 
-                                日期：<input type="text" name="startDate" id="timeBegin" class="input-sm datetime"
-                                    placeholder="起始时间">
-                                - <input type="text" name="endDate" id="timeEnd" class="input-sm datetime"
-                                    placeholder="结束时间">
+                日期：<input type="text"
+                       name="startDate"
+                       id="timeBegin"
+                       class="input-sm datetime"
+                       placeholder="起始时间">
+                - <input type="text"
+                       name="endDate"
+                       id="timeEnd"
+                       class="input-sm datetime"
+                       placeholder="结束时间">
 
-                            </form>
-                        </div>
+              </form>
+            </div>
 
-                        <div class="pull-right">
-                            &nbsp;&nbsp;&nbsp;&nbsp;<button id="searchBtn" class="btn btn-primary">筛选</button>
-                            <button id="exportBtn" class="btn btn-primary">导出</button>
-                        </div>
-                    </div>
+            <div class="pull-right">
+              &nbsp;&nbsp;&nbsp;&nbsp;<button id="searchBtn"
+                      class="btn btn-primary">筛选</button>
+              <button id="exportBtn"
+                      class="btn btn-primary">导出</button>
+            </div>
+          </div>
 
-                </div>
-            </section>
         </div>
-    </section>
+      </section>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrizeRecordAdminView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "PrizeRecordAdminView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+
+        $('.datetime').datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
 
-                $('.datetime').datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true
-                });
+        var main = {
+          init: function () {
+            this.eventRegister();
+            this.getDataFromBack();
+          },
 
-                var main = {
-                    init: function () {
-                        this.eventRegister();
-                        this.getDataFromBack();
-                    },
+          eventRegister: function () {
 
-                    eventRegister: function () {
-                        
-                    },
+          },
 
-                    getDataFromBack: function () {
+          getDataFromBack: function () {
 
-                    }
-                };
-                main.init();
+          }
+        };
+        main.init();
 
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'id', title: 'id', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'nick', title: '用户昵称', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'prizeName', title: '奖品名称', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'createTime', title: '抽奖时间', align: 'center', valign: 'middle', width: '20%', formatter: function (val, row, index) {
-                                if (val) {
-                                    var date = new Date(val);
-                                    return date.format('yyyy-MM-dd hh:mm:ss');
-                                } else {
-                                    return '-';
-                                }
-                            }
-                        },
-                        { field: 'platformValue', title: '平台价值', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'actualValue', title: '实际价值', align: 'center', valign: 'middle', width: '10%' },
-                        {
-                            field: 'prizePoolType', title: '转盘类型', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
-                                switch (row.prizePoolType) {
-                                    case 1:
-                                        return '幸运新人奖池';
-                                
-                                    case 2:
-                                        return '幸运普通奖池';
-                                   
-                                    case 3:
-                                        return '幸运白名单奖池';
-                                   
-                                    case 4:
-                                        return '幸运偏差奖池';
-                                     
-                                    case 12:
-                                        return '幸运次数奖池';
-                                      
-                                    case 7:
-                                        return '梦幻普通奖池';
-                                    
-                                    case 9:
-                                        return '梦幻偏差奖池';
-                                    
-                                    case 10:
-                                        return '梦幻新人奖池';
-                                   
-                                    case 11:
-                                        return '梦幻白名单奖池';
-                                   
-                                    case 13:
-                                        return '普通管理奖池';
-                                      
-                                    case 14:
-                                        return '梦幻管理奖池';
-                                   
-                                }
-                            }
-                        }
-                    ],
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 10,
-                    pagination: true,
-                    pageList: [10, 20, 30, 50],
-                    sidePagination: 'server',
-                    queryParamsType: 'undefined',
-                    queryParams: function queryParams(params) {
-                        var param = {
-                            pageSize: params.pageSize,
-                            pageNumber: params.pageNumber,
-                            startDate: $('#timeBegin').val(),
-                            endDate: $('#timeEnd').val(),
-                            msNo: $('#msNo').val(),
-                            prizeName: $("#prizeName").val()
-                        };
-                        return param;
-                    },
-                    uniqueId: 'id',
-                    toolbar: '#toolbar',
-                    url: '/admin/box/record/list',
-                    onLOadSuccess: function () {
-                        console.log('load success');
-                    },
-                    onLoadError: function () {
-                        console.log('load fail');
-                    }
-                });
-                // 筛选按钮点击事件
-                $('#searchBtn').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'id', title: 'id', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'nick', title: '用户昵称', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'partition', title: '分区', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'prizeName', title: '奖品名称', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'createTime', title: '抽奖时间', align: 'center', valign: 'middle', width: '20%', formatter: function (val, row, index) {
+                if (val) {
+                  var date = new Date(val);
+                  return date.format('yyyy-MM-dd hh:mm:ss');
+                } else {
+                  return '-';
+                }
+              }
+            },
+            { field: 'platformValue', title: '平台价值', align: 'center', valign: 'middle', width: '10%' },
+            { field: 'actualValue', title: '实际价值', align: 'center', valign: 'middle', width: '10%' },
+            {
+              field: 'prizePoolType', title: '转盘类型', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+                switch (row.prizePoolType) {
+                  case 1:
+                    return '幸运新人奖池';
 
-                $("#exportBtn").on('click', function () {
-                    $("#searchForm").submit();
-                })
-            })
-        }
-    },
+                  case 2:
+                    return '幸运普通奖池';
+
+                  case 3:
+                    return '幸运白名单奖池';
+
+                  case 4:
+                    return '幸运偏差奖池';
+
+                  case 12:
+                    return '幸运次数奖池';
+
+                  case 7:
+                    return '梦幻普通奖池';
+
+                  case 9:
+                    return '梦幻偏差奖池';
+
+                  case 10:
+                    return '梦幻新人奖池';
+
+                  case 11:
+                    return '梦幻白名单奖池';
+
+                  case 13:
+                    return '普通管理奖池';
+
+                  case 14:
+                    return '梦幻管理奖池';
+
+                }
+              }
+            }
+          ],
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 10,
+          pagination: true,
+          pageList: [10, 20, 30, 50],
+          sidePagination: 'server',
+          queryParamsType: 'undefined',
+          queryParams: function queryParams (params) {
+            var param = {
+              pageSize: params.pageSize,
+              pageNumber: params.pageNumber,
+              startDate: $('#timeBegin').val(),
+              endDate: $('#timeEnd').val(),
+              msNo: $('#msNo').val(),
+              prizeName: $("#prizeName").val()
+            };
+            return param;
+          },
+          uniqueId: 'id',
+          toolbar: '#toolbar',
+          url: '/admin/box/record/list',
+          onLOadSuccess: function () {
+            console.log('load success');
+          },
+          onLoadError: function () {
+            console.log('load fail');
+          }
+        });
+        // 筛选按钮点击事件
+        $('#searchBtn').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });
+
+        $("#exportBtn").on('click', function () {
+          $("#searchForm").submit();
+        })
+      })
+    }
+  },
 
 };
 </script>

src/views/prize/PrizeStatisAdminNewView.vue

@@ -1,296 +1,315 @@
 <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">
-                    <div id="table"></div>
-                    <div id="toolbar">
-                        <label class="source">
-                            选择时间: <input type="text" name="startTime" id="startTime" class="input-sm">
-                            至 <input type="text" id="endTime" name="endTime" class="input-sm">
-                        </label>
-                        <label class="source">
-                            宝箱类型: <select name="boxType" id="boxType" class="input-sm">
-                                <option value="0">全部</option>
-                                <option value="1">幸运许愿池</option>
-                                <option value="2">梦幻许愿池</option>
-                            </select>
-                        </label>
-                        <label class="source">
-                            查询凭据：<select name="source" id="source" class="input-sm">
-                                <option value="1">平台号</option>
-                                <option value="2">偏差范围</option>
-                            </select>
-                        </label>
-                        <label class="msNo">
-                            平台号：<input type="text" placeholder="请输入草莓号" id="msNo" class="input-sm">
-                        </label>
-                        <label class="deviation">
-                            偏差值： <input type="text" id="minDis" class="input-m"> - <input type="text" id="maxDis"
-                                class="input-m">
-                        </label>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                    </div>
-                </section>
-            </div>
-        </div>
-    </section>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <section class="content">
+          <div id="table"></div>
+          <div id="toolbar">
+            <label class="source">
+              选择时间: <input type="text"
+                     name="startTime"
+                     id="startTime"
+                     class="input-sm">
+              至 <input type="text"
+                     id="endTime"
+                     name="endTime"
+                     class="input-sm">
+            </label>
+            <label class="source">
+              宝箱类型: <select name="boxType"
+                      id="boxType"
+                      class="input-sm">
+                <option value="0">全部</option>
+                <option value="1">幸运许愿池</option>
+                <option value="2">梦幻许愿池</option>
+              </select>
+            </label>
+            <label class="source">
+              查询凭据：<select name="source"
+                      id="source"
+                      class="input-sm">
+                <option value="1">平台号</option>
+                <option value="2">偏差范围</option>
+              </select>
+            </label>
+            <label class="msNo">
+              平台号：<input type="text"
+                     placeholder="请输入草莓号"
+                     id="msNo"
+                     class="input-sm">
+            </label>
+            <label class="deviation">
+              偏差值： <input type="text"
+                     id="minDis"
+                     class="input-m"> - <input type="text"
+                     id="maxDis"
+                     class="input-m">
+            </label>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
+          </div>
+        </section>
+      </div>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrizeStatisAdminNewView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
-        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                //searchHistory();
-                var whiteList = {};
-                requestWhiteList(searchHistory());
-                function searchHistory() {
-                    $('#table').bootstrapTable('destroy');
-                    $('#table').bootstrapTable({
-                        columns: [
-                            { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalPurchaseMoney', title: '历史抽奖充值总额', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalDrawMoney', title: '历史抽奖总额', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalPlatformValue', title: '历史获奖平台价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalActualValue', title: '历史获奖实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            {
-                                field: 'deviation', title: '偏差值', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
-                                    if (val > 0) {
-                                        return '<span style="color:red">+' + val + '</span>';
-                                    } else {
-                                        return '<span style="color:green">' + val + '</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'useNum', title: '历史白名单次数', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid]) {
-                                        return whiteList[uid].useNum;
-                                    } else {
-                                        return 0;
-                                    }
-                                }
-                            },
-                            {
-                                field: 'whiteStatus', title: '白名单状态', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableNum > 0) {
-                                        return '<span style="color:red">待抽奖</span>';
-                                    } else {
-                                        return '<span style="color:green">未设置</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'diamondUseNum',
-                                title: '梦幻白名单次数',
-                                align: 'center',
-                                valign: 'middle',
-                                width: '5%',
-                                formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid]) {
-                                        return whiteList[uid].useDiamondNum;
-                                    } else {
-                                        return 0;
-                                    }
-                                }
-                            },
-                            {
-                                field: 'diamondWhiteStatus',
-                                title: '梦幻白名单状态',
-                                align: 'center',
-                                valign: 'middle',
-                                width: '5%',
-                                formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
-                                        return '<span style="color:red">待抽奖</span>';
-                                    } else {
-                                        return '<span style="color:green">未设置</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'tmp',
-                                title: '操作',
-                                align: 'center',
-                                width: '10%',
-                                valign: 'middle',
-                                formatter: function (val, row, index) {
-                                    var btnStr = "";
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableNum > 0) {
-                                        btnStr += "<button class='btn btn-sm btn-warning opt-del normal-box-del' data-id=" + uid + ">移除普通白名单</button>";
-                                    } else {
-                                        btnStr += "<button class='btn btn-sm btn-success opt-set normal-box-set' data-id=" + uid + ">设置普通白名单</button>";
-                                    }
-                                    if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
-                                        btnStr += "<button class='btn btn-sm btn-warning opt-del diamond-box-del' data-id=" + uid + ">移除梦幻白名单</button>";
-                                    } else {
-                                        btnStr += "<button class='btn btn-sm btn-success opt-set diamond-box-set' data-id=" + uid + ">设置梦幻白名单</button>";
-                                    }
-                                    return btnStr;
-                                }
-                            }
-                        ],
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 10,
-                        pagination: true,
-                        pageList: [10, 20, 30, 50],
-                        sidePagination: "server", //表示服务端请求
-                        //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-                        //设置为limit可以获取limit, offset, search, sort, order
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageSize: params.pageSize,
-                                pageNumber: params.pageNumber,
-                                msNo: $('#msNo').val(),
-                                boxType: $("#boxType").val(),
-                                minDis: $('#minDis').val(),
-                                maxDis: $('#maxDis').val(),
-                                source: $('#source').val(),
-                                startTime: $("#startTime").val(),
-                                endTime: $("#endTime").val()
-                            };
-                            console.log(param);
-                            return param;
-                        },
-                        uniqueId: 'uid',
-                        toolbar: '#toolbar',
-                        url: '/admin/box/record/statis/list',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    })
+  name: "PrizeStatisAdminNewView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        //searchHistory();
+        var whiteList = {};
+        requestWhiteList(searchHistory());
+        function searchHistory () {
+          $('#table').bootstrapTable('destroy');
+          $('#table').bootstrapTable({
+            columns: [
+              { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'partition', title: '分区', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalPurchaseMoney', title: '历史抽奖充值总额', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalDrawMoney', title: '历史抽奖总额', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalPlatformValue', title: '历史获奖平台价值', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalActualValue', title: '历史获奖实际价值', align: 'center', valign: 'middle', width: '10%' },
+              {
+                field: 'deviation', title: '偏差值', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+                  if (val > 0) {
+                    return '<span style="color:red">+' + val + '</span>';
+                  } else {
+                    return '<span style="color:green">' + val + '</span>';
+                  }
                 }
-
-                $('#source').on('change', function () {
-                    var source = parseInt($(this).val());
-                    if (source == 1) {
-                        $('.msNo').show();
-                        $('.deviation').hide();
-                    } else {
-                        $('.msNo').hide();
-                        $('.deviation').show();
-                    }
-                });
-
-                $('#table').on('click', '.normal-box-set', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 1, 1);
-                });
-
-                $('#table').on('click', '.diamond-box-set', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 1, 2);
-                });
-
-                $('#table').on('click', '.normal-box-del', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 0, 1);
-                });
-
-                $('#table').on('click', '.diamond-box-del', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 0, 2);
-                });
-                $('#btnSearch').on('click', function () {
-                    var source = $('#source').val();
-                    var msNo = $('#msNo').val();
-                    var minDis = $('#minDis').val();
-                    var maxDis = $('#maxDis').val();
-                    if (source == 1 && msNo == '') {
-                        $("#tipMsg").text("请输入平台号");
-                        $("#tipModal").modal('show');
-                        return;
-                    } else if (source == 2 && (minDis == '' || maxDis == '')) {
-                        $("#tipMsg").text("请输入偏差值");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    requestWhiteList(searchHistory());
-                });
-
-                function editWhiteList(uid, availableNum, boxType) {
-                    $.post("/admin/prizeWhiteUser/save", { uid: uid, availableNum: availableNum, boxType: boxType }, function (res) {
-                        if (res.code == 200) {
-                            if (availableNum > 0) {
-                                $("#tipMsg").text("设置成功");
-                            } else {
-                                $("#tipMsg").text("移除成功");
-                            }
-                            $("#tipModal").modal('show');
-
-                            requestWhiteList(function () {
-                                TableHelper.doRefresh('#table');
-                            })
-                        } else {
-                            $("#tipMsg").text("设置失败");
-                            $("#tipModal").modal('show');
-                        }
-                    })
+              },
+              {
+                field: 'useNum', title: '历史白名单次数', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid]) {
+                    return whiteList[uid].useNum;
+                  } else {
+                    return 0;
+                  }
                 }
-
-                function requestWhiteList(callback) {
-                    $.ajax({
-                        url: '/admin/prizeWhiteUser/list',
-                        success: function (res) {
-                            console.log(res);
-                            if (res.code == 200) {
-                                whiteList = res.data;
-                                typeof callback === 'function' && callback();
-                            }
-
-                        }
-                    })
+              },
+              {
+                field: 'whiteStatus', title: '白名单状态', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableNum > 0) {
+                    return '<span style="color:red">待抽奖</span>';
+                  } else {
+                    return '<span style="color:green">未设置</span>';
+                  }
                 }
-
-                // 初始化时间选择器
-                $('#startTime').datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true
-                })
-                $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true
-                });
-            })
+              },
+              {
+                field: 'diamondUseNum',
+                title: '梦幻白名单次数',
+                align: 'center',
+                valign: 'middle',
+                width: '5%',
+                formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid]) {
+                    return whiteList[uid].useDiamondNum;
+                  } else {
+                    return 0;
+                  }
+                }
+              },
+              {
+                field: 'diamondWhiteStatus',
+                title: '梦幻白名单状态',
+                align: 'center',
+                valign: 'middle',
+                width: '5%',
+                formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
+                    return '<span style="color:red">待抽奖</span>';
+                  } else {
+                    return '<span style="color:green">未设置</span>';
+                  }
+                }
+              },
+              {
+                field: 'tmp',
+                title: '操作',
+                align: 'center',
+                width: '10%',
+                valign: 'middle',
+                formatter: function (val, row, index) {
+                  var btnStr = "";
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableNum > 0) {
+                    btnStr += "<button class='btn btn-sm btn-warning opt-del normal-box-del' data-id=" + uid + ">移除普通白名单</button>";
+                  } else {
+                    btnStr += "<button class='btn btn-sm btn-success opt-set normal-box-set' data-id=" + uid + ">设置普通白名单</button>";
+                  }
+                  if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
+                    btnStr += "<button class='btn btn-sm btn-warning opt-del diamond-box-del' data-id=" + uid + ">移除梦幻白名单</button>";
+                  } else {
+                    btnStr += "<button class='btn btn-sm btn-success opt-set diamond-box-set' data-id=" + uid + ">设置梦幻白名单</button>";
+                  }
+                  return btnStr;
+                }
+              }
+            ],
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 10,
+            pagination: true,
+            pageList: [10, 20, 30, 50],
+            sidePagination: "server", //表示服务端请求
+            //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+            //设置为limit可以获取limit, offset, search, sort, order
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageSize: params.pageSize,
+                pageNumber: params.pageNumber,
+                msNo: $('#msNo').val(),
+                boxType: $("#boxType").val(),
+                minDis: $('#minDis').val(),
+                maxDis: $('#maxDis').val(),
+                source: $('#source').val(),
+                startTime: $("#startTime").val(),
+                endTime: $("#endTime").val()
+              };
+              console.log(param);
+              return param;
+            },
+            uniqueId: 'uid',
+            toolbar: '#toolbar',
+            url: '/admin/box/record/statis/list',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          })
         }
-    },
+
+        $('#source').on('change', function () {
+          var source = parseInt($(this).val());
+          if (source == 1) {
+            $('.msNo').show();
+            $('.deviation').hide();
+          } else {
+            $('.msNo').hide();
+            $('.deviation').show();
+          }
+        });
+
+        $('#table').on('click', '.normal-box-set', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 1, 1);
+        });
+
+        $('#table').on('click', '.diamond-box-set', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 1, 2);
+        });
+
+        $('#table').on('click', '.normal-box-del', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 0, 1);
+        });
+
+        $('#table').on('click', '.diamond-box-del', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 0, 2);
+        });
+        $('#btnSearch').on('click', function () {
+          var source = $('#source').val();
+          var msNo = $('#msNo').val();
+          var minDis = $('#minDis').val();
+          var maxDis = $('#maxDis').val();
+          if (source == 1 && msNo == '') {
+            $("#tipMsg").text("请输入平台号");
+            $("#tipModal").modal('show');
+            return;
+          } else if (source == 2 && (minDis == '' || maxDis == '')) {
+            $("#tipMsg").text("请输入偏差值");
+            $("#tipModal").modal('show');
+            return;
+          }
+          requestWhiteList(searchHistory());
+        });
+
+        function editWhiteList (uid, availableNum, boxType) {
+          $.post("/admin/prizeWhiteUser/save", { uid: uid, availableNum: availableNum, boxType: boxType }, function (res) {
+            if (res.code == 200) {
+              if (availableNum > 0) {
+                $("#tipMsg").text("设置成功");
+              } else {
+                $("#tipMsg").text("移除成功");
+              }
+              $("#tipModal").modal('show');
+
+              requestWhiteList(function () {
+                TableHelper.doRefresh('#table');
+              })
+            } else {
+              $("#tipMsg").text("设置失败");
+              $("#tipModal").modal('show');
+            }
+          })
+        }
+
+        function requestWhiteList (callback) {
+          $.ajax({
+            url: '/admin/prizeWhiteUser/list',
+            success: function (res) {
+              console.log(res);
+              if (res.code == 200) {
+                whiteList = res.data;
+                typeof callback === 'function' && callback();
+              }
+
+            }
+          })
+        }
+
+        // 初始化时间选择器
+        $('#startTime').datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        })
+        $("#endTime").datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        });
+      })
+    }
+  },
 
 };
 </script>
 
 <style scoped>
 .deviation {
-    display: none;
+  display: none;
 }
 
 #toolbar label {
-    margin-right: 6px;
-}</style>
+  margin-right: 6px;
+}
+</style>

src/views/prize/PrizeStatisAdminView.vue

@@ -1,296 +1,315 @@
 <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">
-                    <div id="table"></div>
-                    <div id="toolbar">
-                        <label class="source">
-                            选择时间: <input type="text" name="startTime" id="startTime" class="input-sm">
-                            至 <input type="text" id="endTime" name="endTime" class="input-sm">
-                        </label>
-                        <label class="source">
-                            宝箱类型: <select name="boxType" id="boxType" class="input-sm">
-                                <option value="0">全部</option>
-                                <option value="1">幸运许愿池</option>
-                                <option value="2">梦幻许愿池</option>
-                            </select>
-                        </label>
-                        <label class="source">
-                            查询凭据：<select name="source" id="source" class="input-sm">
-                                <option value="1">平台号</option>
-                                <option value="2">偏差范围</option>
-                            </select>
-                        </label>
-                        <label class="msNo">
-                            平台号：<input type="text" placeholder="请输入草莓号" id="msNo" class="input-sm">
-                        </label>
-                        <label class="deviation">
-                            偏差值： <input type="text" id="minDis" class="input-m"> - <input type="text" id="maxDis"
-                                class="input-m">
-                        </label>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                    </div>
-                </section>
-            </div>
-        </div>
-    </section>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <section class="content">
+          <div id="table"></div>
+          <div id="toolbar">
+            <label class="source">
+              选择时间: <input type="text"
+                     name="startTime"
+                     id="startTime"
+                     class="input-sm">
+              至 <input type="text"
+                     id="endTime"
+                     name="endTime"
+                     class="input-sm">
+            </label>
+            <label class="source">
+              宝箱类型: <select name="boxType"
+                      id="boxType"
+                      class="input-sm">
+                <option value="0">全部</option>
+                <option value="1">幸运许愿池</option>
+                <option value="2">梦幻许愿池</option>
+              </select>
+            </label>
+            <label class="source">
+              查询凭据：<select name="source"
+                      id="source"
+                      class="input-sm">
+                <option value="1">平台号</option>
+                <option value="2">偏差范围</option>
+              </select>
+            </label>
+            <label class="msNo">
+              平台号：<input type="text"
+                     placeholder="请输入草莓号"
+                     id="msNo"
+                     class="input-sm">
+            </label>
+            <label class="deviation">
+              偏差值： <input type="text"
+                     id="minDis"
+                     class="input-m"> - <input type="text"
+                     id="maxDis"
+                     class="input-m">
+            </label>
+            <button id="btnSearch"
+                    class="btn btn-sm btn-primary">查询</button>
+          </div>
+        </section>
+      </div>
+    </div>
+  </section>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "PrizeStatisAdminView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
-        });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                //searchHistory();
-                var whiteList = {};
-                requestWhiteList(searchHistory());
-                function searchHistory() {
-                    $('#table').bootstrapTable('destroy');
-                    $('#table').bootstrapTable({
-                        columns: [
-                            { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalPurchaseMoney', title: '历史抽奖充值总额', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalDrawMoney', title: '历史抽奖总额', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalPlatformValue', title: '历史获奖平台价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalActualValue', title: '历史获奖实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            {
-                                field: 'deviation', title: '偏差值', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
-                                    if (val > 0) {
-                                        return '<span style="color:red">+' + val + '</span>';
-                                    } else {
-                                        return '<span style="color:green">' + val + '</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'useNum', title: '历史白名单次数', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid]) {
-                                        return whiteList[uid].useNum;
-                                    } else {
-                                        return 0;
-                                    }
-                                }
-                            },
-                            {
-                                field: 'whiteStatus', title: '白名单状态', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableNum > 0) {
-                                        return '<span style="color:red">待抽奖</span>';
-                                    } else {
-                                        return '<span style="color:green">未设置</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'diamondUseNum',
-                                title: '梦幻白名单次数',
-                                align: 'center',
-                                valign: 'middle',
-                                width: '5%',
-                                formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid]) {
-                                        return whiteList[uid].useDiamondNum;
-                                    } else {
-                                        return 0;
-                                    }
-                                }
-                            },
-                            {
-                                field: 'diamondWhiteStatus',
-                                title: '梦幻白名单状态',
-                                align: 'center',
-                                valign: 'middle',
-                                width: '5%',
-                                formatter: function (val, row, index) {
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
-                                        return '<span style="color:red">待抽奖</span>';
-                                    } else {
-                                        return '<span style="color:green">未设置</span>';
-                                    }
-                                }
-                            },
-                            {
-                                field: 'tmp',
-                                title: '操作',
-                                align: 'center',
-                                width: '10%',
-                                valign: 'middle',
-                                formatter: function (val, row, index) {
-                                    var btnStr = "";
-                                    var uid = row.uid;
-                                    if (whiteList[uid] && whiteList[uid].availableNum > 0) {
-                                        btnStr += "<button class='btn btn-sm btn-warning opt-del normal-box-del' data-id=" + uid + ">移除普通白名单</button>";
-                                    } else {
-                                        btnStr += "<button class='btn btn-sm btn-success opt-set normal-box-set' data-id=" + uid + ">设置普通白名单</button>";
-                                    }
-                                    if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
-                                        btnStr += "<button class='btn btn-sm btn-warning opt-del diamond-box-del' data-id=" + uid + ">移除梦幻白名单</button>";
-                                    } else {
-                                        btnStr += "<button class='btn btn-sm btn-success opt-set diamond-box-set' data-id=" + uid + ">设置梦幻白名单</button>";
-                                    }
-                                    return btnStr;
-                                }
-                            }
-                        ],
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 10,
-                        pagination: true,
-                        pageList: [10, 20, 30, 50],
-                        sidePagination: "server", //表示服务端请求
-                        //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-                        //设置为limit可以获取limit, offset, search, sort, order
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageSize: params.pageSize,
-                                pageNumber: params.pageNumber,
-                                msNo: $('#msNo').val(),
-                                boxType: $("#boxType").val(),
-                                minDis: $('#minDis').val(),
-                                maxDis: $('#maxDis').val(),
-                                source: $('#source').val(),
-                                startTime: $("#startTime").val(),
-                                endTime: $("#endTime").val()
-                            };
-                            console.log(param);
-                            return param;
-                        },
-                        uniqueId: 'uid',
-                        toolbar: '#toolbar',
-                        url: '/admin/box/record/statis/list',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    })
+  name: "PrizeStatisAdminView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        //searchHistory();
+        var whiteList = {};
+        requestWhiteList(searchHistory());
+        function searchHistory () {
+          $('#table').bootstrapTable('destroy');
+          $('#table').bootstrapTable({
+            columns: [
+              { field: 'uid', title: 'uid', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'partition', title: '分区', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalPurchaseMoney', title: '历史抽奖充值总额', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalDrawMoney', title: '历史抽奖总额', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalPlatformValue', title: '历史获奖平台价值', align: 'center', valign: 'middle', width: '10%' },
+              { field: 'totalActualValue', title: '历史获奖实际价值', align: 'center', valign: 'middle', width: '10%' },
+              {
+                field: 'deviation', title: '偏差值', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+                  if (val > 0) {
+                    return '<span style="color:red">+' + val + '</span>';
+                  } else {
+                    return '<span style="color:green">' + val + '</span>';
+                  }
                 }
-
-                $('#source').on('change', function () {
-                    var source = parseInt($(this).val());
-                    if (source == 1) {
-                        $('.msNo').show();
-                        $('.deviation').hide();
-                    } else {
-                        $('.msNo').hide();
-                        $('.deviation').show();
-                    }
-                });
-
-                $('#table').on('click', '.normal-box-set', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 1, 1);
-                });
-
-                $('#table').on('click', '.diamond-box-set', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 1, 2);
-                });
-
-                $('#table').on('click', '.normal-box-del', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 0, 1);
-                });
-
-                $('#table').on('click', '.diamond-box-del', function () {
-                    var uid = $(this).data('id');
-                    editWhiteList(uid, 0, 2);
-                });
-                $('#btnSearch').on('click', function () {
-                    var source = $('#source').val();
-                    var msNo = $('#msNo').val();
-                    var minDis = $('#minDis').val();
-                    var maxDis = $('#maxDis').val();
-                    if (source == 1 && msNo == '') {
-                        $("#tipMsg").text("请输入平台号");
-                        $("#tipModal").modal('show');
-                        return;
-                    } else if (source == 2 && (minDis == '' || maxDis == '')) {
-                        $("#tipMsg").text("请输入偏差值");
-                        $("#tipModal").modal('show');
-                        return;
-                    }
-                    requestWhiteList(searchHistory());
-                });
-
-                function editWhiteList(uid, availableNum, boxType) {
-                    $.post("/admin/prizeWhiteUser/save", { uid: uid, availableNum: availableNum, boxType: boxType }, function (res) {
-                        if (res.code == 200) {
-                            if (availableNum > 0) {
-                                $("#tipMsg").text("设置成功");
-                            } else {
-                                $("#tipMsg").text("移除成功");
-                            }
-                            $("#tipModal").modal('show');
-
-                            requestWhiteList(function () {
-                                TableHelper.doRefresh('#table');
-                            })
-                        } else {
-                            $("#tipMsg").text("设置失败");
-                            $("#tipModal").modal('show');
-                        }
-                    })
+              },
+              {
+                field: 'useNum', title: '历史白名单次数', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid]) {
+                    return whiteList[uid].useNum;
+                  } else {
+                    return 0;
+                  }
                 }
-
-                function requestWhiteList(callback) {
-                    $.ajax({
-                        url: '/admin/prizeWhiteUser/list',
-                        success: function (res) {
-                            console.log(res);
-                            if (res.code == 200) {
-                                whiteList = res.data;
-                                typeof callback === 'function' && callback();
-                            }
-
-                        }
-                    })
+              },
+              {
+                field: 'whiteStatus', title: '白名单状态', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableNum > 0) {
+                    return '<span style="color:red">待抽奖</span>';
+                  } else {
+                    return '<span style="color:green">未设置</span>';
+                  }
                 }
-
-                // 初始化时间选择器
-                $('#startTime').datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true
-                })
-                $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    autoclose: true
-                });
-            })
+              },
+              {
+                field: 'diamondUseNum',
+                title: '梦幻白名单次数',
+                align: 'center',
+                valign: 'middle',
+                width: '5%',
+                formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid]) {
+                    return whiteList[uid].useDiamondNum;
+                  } else {
+                    return 0;
+                  }
+                }
+              },
+              {
+                field: 'diamondWhiteStatus',
+                title: '梦幻白名单状态',
+                align: 'center',
+                valign: 'middle',
+                width: '5%',
+                formatter: function (val, row, index) {
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
+                    return '<span style="color:red">待抽奖</span>';
+                  } else {
+                    return '<span style="color:green">未设置</span>';
+                  }
+                }
+              },
+              {
+                field: 'tmp',
+                title: '操作',
+                align: 'center',
+                width: '10%',
+                valign: 'middle',
+                formatter: function (val, row, index) {
+                  var btnStr = "";
+                  var uid = row.uid;
+                  if (whiteList[uid] && whiteList[uid].availableNum > 0) {
+                    btnStr += "<button class='btn btn-sm btn-warning opt-del normal-box-del' data-id=" + uid + ">移除普通白名单</button>";
+                  } else {
+                    btnStr += "<button class='btn btn-sm btn-success opt-set normal-box-set' data-id=" + uid + ">设置普通白名单</button>";
+                  }
+                  if (whiteList[uid] && whiteList[uid].availableDiamondNum > 0) {
+                    btnStr += "<button class='btn btn-sm btn-warning opt-del diamond-box-del' data-id=" + uid + ">移除梦幻白名单</button>";
+                  } else {
+                    btnStr += "<button class='btn btn-sm btn-success opt-set diamond-box-set' data-id=" + uid + ">设置梦幻白名单</button>";
+                  }
+                  return btnStr;
+                }
+              }
+            ],
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 10,
+            pagination: true,
+            pageList: [10, 20, 30, 50],
+            sidePagination: "server", //表示服务端请求
+            //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+            //设置为limit可以获取limit, offset, search, sort, order
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageSize: params.pageSize,
+                pageNumber: params.pageNumber,
+                msNo: $('#msNo').val(),
+                boxType: $("#boxType").val(),
+                minDis: $('#minDis').val(),
+                maxDis: $('#maxDis').val(),
+                source: $('#source').val(),
+                startTime: $("#startTime").val(),
+                endTime: $("#endTime").val()
+              };
+              console.log(param);
+              return param;
+            },
+            uniqueId: 'uid',
+            toolbar: '#toolbar',
+            url: '/admin/box/record/statis/list',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          })
         }
-    },
+
+        $('#source').on('change', function () {
+          var source = parseInt($(this).val());
+          if (source == 1) {
+            $('.msNo').show();
+            $('.deviation').hide();
+          } else {
+            $('.msNo').hide();
+            $('.deviation').show();
+          }
+        });
+
+        $('#table').on('click', '.normal-box-set', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 1, 1);
+        });
+
+        $('#table').on('click', '.diamond-box-set', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 1, 2);
+        });
+
+        $('#table').on('click', '.normal-box-del', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 0, 1);
+        });
+
+        $('#table').on('click', '.diamond-box-del', function () {
+          var uid = $(this).data('id');
+          editWhiteList(uid, 0, 2);
+        });
+        $('#btnSearch').on('click', function () {
+          var source = $('#source').val();
+          var msNo = $('#msNo').val();
+          var minDis = $('#minDis').val();
+          var maxDis = $('#maxDis').val();
+          if (source == 1 && msNo == '') {
+            $("#tipMsg").text("请输入平台号");
+            $("#tipModal").modal('show');
+            return;
+          } else if (source == 2 && (minDis == '' || maxDis == '')) {
+            $("#tipMsg").text("请输入偏差值");
+            $("#tipModal").modal('show');
+            return;
+          }
+          requestWhiteList(searchHistory());
+        });
+
+        function editWhiteList (uid, availableNum, boxType) {
+          $.post("/admin/prizeWhiteUser/save", { uid: uid, availableNum: availableNum, boxType: boxType }, function (res) {
+            if (res.code == 200) {
+              if (availableNum > 0) {
+                $("#tipMsg").text("设置成功");
+              } else {
+                $("#tipMsg").text("移除成功");
+              }
+              $("#tipModal").modal('show');
+
+              requestWhiteList(function () {
+                TableHelper.doRefresh('#table');
+              })
+            } else {
+              $("#tipMsg").text("设置失败");
+              $("#tipModal").modal('show');
+            }
+          })
+        }
+
+        function requestWhiteList (callback) {
+          $.ajax({
+            url: '/admin/prizeWhiteUser/list',
+            success: function (res) {
+              console.log(res);
+              if (res.code == 200) {
+                whiteList = res.data;
+                typeof callback === 'function' && callback();
+              }
+
+            }
+          })
+        }
+
+        // 初始化时间选择器
+        $('#startTime').datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        })
+        $("#endTime").datetimepicker({
+          format: 'yyyy-mm-dd hh:ii:00',
+          autoclose: true
+        });
+      })
+    }
+  },
 
 };
 </script>
 
 <style scoped>
 .deviation {
-    display: none;
+  display: none;
 }
 
 #toolbar label {
-    margin-right: 6px;
-}</style>
+  margin-right: 6px;
+}
+</style>

src/views/resource/GamePlayView.vue

@@ -33,7 +33,7 @@
             <el-table-column align="center" prop="icon" label="入口icon">
                 <template v-slot="scope">
                     <el-image style="width: 100px; height: 100px" :src="scope.row.icon" :zoom-rate="1.1"
-                        :preview-src-list="[scope.row.icon]" fit="cover" preview-teleported="true"
+                        :preview-src-list="[scope.row.icon]" fit="scale-down" preview-teleported="true"
                         hide-on-click-modal="true" />
                 </template>
             </el-table-column>

src/views/resource/ResourceView.vue

@@ -33,7 +33,7 @@
             <el-table-column align="center" prop="icon" label="入口icon">
                 <template v-slot="scope">
                     <el-image style="width: 100px; height: 100px" :src="scope.row.icon" :zoom-rate="1.1"
-                        :preview-src-list="[scope.row.icon]" fit="cover" preview-teleported="true"
+                        :preview-src-list="[scope.row.icon]" fit="scale-down" preview-teleported="true"
                         hide-on-click-modal="true" />
                 </template>
             </el-table-column>

src/views/resource/SplashView.vue

@@ -33,7 +33,7 @@
             <el-table-column align="center" prop="url" label="开屏页" width="200">
                 <template v-slot="scope">
                     <el-image style="width: 100%; height: 100px" :src="scope.row.url" :zoom-rate="1.1"
-                        :preview-src-list="[scope.row.url]" fit="cover" preview-teleported="true"
+                        :preview-src-list="[scope.row.url]" fit="scale-down" preview-teleported="true"
                         hide-on-click-modal="true" />
                 </template>
             </el-table-column>

src/views/room/RoomAlbums.vue

@@ -41,7 +41,7 @@
             :src="scope.row.photoUrl"
             :zoom-rate="1.1"
             :preview-src-list="[scope.row.photoUrl]"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
         /></template>
@@ -58,7 +58,7 @@
             style="width: 30px; height: 30px; vertical-align: middle; margin-right: 6px"
             :src="scope.row.picUrl"
             :zoom-rate="1"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
           />
           <img

src/views/room/RoomSerialView.vue

@@ -10,15 +10,30 @@
         <div class="big-tips">
           数据量过大，不再默认加载所有的数据，请先选择时间后，再点查询按钮
         </div>
-        <form id="searchForm" action="/admin/roomSerial/export" method="POST">
+        <form id="searchForm"
+              action="/admin/roomSerial/export"
+              method="POST">
           房主平台号(多个查询以英文逗号分隔):
-          <input type="text" name="erbanNos" id="erbanNos" class="input-sm"  style="margin-right: 40px;display: inline-block;"/> 选择时间:
-          <input type="text" name="startTime" id="startTime" class="input-sm" /> 至
-          <input type="text" id="endTime" name="endTime" class="input-sm" />
+          <input type="text"
+                 name="erbanNos"
+                 id="erbanNos"
+                 class="input-sm"
+                 style="margin-right: 40px;display: inline-block;" /> 选择时间:
+          <input type="text"
+                 name="startTime"
+                 id="startTime"
+                 class="input-sm" /> 至
+          <input type="text"
+                 id="endTime"
+                 name="endTime"
+                 class="input-sm" />
           <br />
           <div style="width: 60%">
             房间类型:
-            <select name="isPermit" id="isPermit" class="input-sm" style="width: 30%;display: inline-block;">
+            <select name="isPermit"
+                    id="isPermit"
+                    class="input-sm"
+                    style="width: 30%;display: inline-block;">
               <option value="0">全部</option>
               <option value="1">牌照房</option>
               <option value="3">新秀房</option>
@@ -29,10 +44,12 @@
         </form>
       </div>
       <div class="col-sm-8">
-        <button id="room-serial-refresh" class="btn btn-default">
+        <button id="room-serial-refresh"
+                class="btn btn-default">
           <i class="glyphicon glyphicon-wrench"></i>查询
         </button>
-        <button id="room-serial-export" class="btn btn-default">
+        <button id="room-serial-export"
+                class="btn btn-default">
           <i class="glyphicon glyphicon-plus"></i>导出
         </button>
       </div>
@@ -40,37 +57,40 @@
   </section>
   <!-- .content -->
 
-  <div
-    class="modal fade"
-    id="tipModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabel"
-  >
-    <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="tipModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
           <h4 class="modal-title">提示信息</h4>
         </div>
-        <div class="modal-body" id="tipMsg"></div>
+        <div class="modal-body"
+             id="tipMsg"></div>
       </div>
     </div>
   </div>
 
-  <div
-    class="modal fade"
-    id="roomGiftSerialDetailModal"
-    tabindex="-1"
-    role="dialog"
-    aria-labelledby="modalLabel"
-  >
-    <div class="modal-dialog" role="document">
+  <div class="modal fade"
+       id="roomGiftSerialDetailModal"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
-          <h4 class="modal-title" id="roomGiftSerialDetailModalTitle">房间明细</h4>
+          <h4 class="modal-title"
+              id="roomGiftSerialDetailModalTitle">房间明细</h4>
         </div>
         <div class="modal-body">
           <div class="summary col-sm-12">
@@ -95,7 +115,9 @@
         </div>
         <div class="modal-footer">
           <h4 id="roundDetailModalFooter"></h4>
-          <button type="button" class="btn btn-default" data-dismiss="modal">确定</button>
+          <button type="button"
+                  class="btn btn-default"
+                  data-dismiss="modal">确定</button>
         </div>
       </div>
     </div>
@@ -109,16 +131,16 @@ import { serverError } from "@/utils/maintainer";
 
 export default {
   name: "RoomSerialView",
-  setup() {
+  setup () {
     return {};
   },
-  created() {
+  created () {
     this.$nextTick(function () {
       this.initData();
     });
   },
   methods: {
-    initData() {
+    initData () {
       // ComboboxHelper.build(null, '#isPermit');
       $(function () {
         $("#table").bootstrapTable("destroy");
@@ -140,11 +162,10 @@ export default {
               align: "center",
               width: "10%",
             },
-            { field: "totalRadish", title: "萝卜流水", align: "center", width: "10%" },
+            // { field: "totalRadish", title: "萝卜流水", align: "center", width: "10%" },
             { field: "roomTitle", title: "房间标题", align: "center", width: "10%" },
             { field: "clanName", title: "公会名称", align: "center", width: "10%" },
             { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
-            { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
             {
               field: "id",
               title: "操作",
@@ -169,15 +190,11 @@ export default {
           cache: false,
           striped: true,
           showRefresh: false,
-          pageSize: 10,
-          pagination: true,
-          pageList: [1, 10, 20, 30, 50],
+          pagination: false,
           search: false,
-          sidePagination: "server", //表示服务端请求
-          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
           //设置为limit可以获取limit, offset, search, sort, order
           queryParamsType: "undefined",
-          queryParams: function queryParams(params) {
+          queryParams: function queryParams (params) {
             //设置查询参数
             var param = {
               pageNumber: params.pageNumber,
@@ -200,6 +217,7 @@ export default {
           onLoadError: function () {
             //加载失败时执行
             console.log("load fail");
+            enableRefreshBtn();
           },
         });
 
@@ -219,7 +237,7 @@ export default {
 
         $("#room-serial-refresh").click(function () {
           disableRefreshBtn();
-          $("#table").bootstrapTable("refresh", { url: "/admin/roomSerial/listByPage" });
+          $("#table").bootstrapTable("refresh", { url: "/admin/roomSerial/list" });
         });
 
         $("#room-serial-export").click(function () {
@@ -235,11 +253,11 @@ export default {
           }
         });
 
-        function disableRefreshBtn() {
+        function disableRefreshBtn () {
           $("#room-serial-refresh").attr("disabled", "true");
         }
 
-        function enableRefreshBtn() {
+        function enableRefreshBtn () {
           $("#room-serial-refresh").removeAttr("disabled");
         }
 
@@ -282,7 +300,7 @@ export default {
             search: false,
             sidePagination: "server", //表示服务端请求
             queryParamsType: "undefined",
-            queryParams: function queryParams(params) {
+            queryParams: function queryParams (params) {
               //设置查询参数
               var param = {
                 page: params.pageNumber,
@@ -330,7 +348,7 @@ export default {
           });
         });
 
-        function apiResult(json) {
+        function apiResult (json) {
           if (json.code == 200 && json.message == "success") {
             return true;
           }

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

@@ -0,0 +1,573 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>说明:</span>
+    </div>
+    <div class="inquire">
+      <span>头图尺寸:</span>
+      <div class="text">750*280</div>
+    </div>
+    <div class="inquire">
+      <span>icon尺寸:</span>
+      <div class="text">80*80</div>
+    </div>
+    <div class="inquireBox">
+      <span>首页头图:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess1"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl1" :src="inquire.imageUrl1" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(1)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>首页底图:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess2"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl2" :src="inquire.imageUrl2" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(2)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>首页icon选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess3"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl3" :src="inquire.imageUrl3" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(3)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>首页icon未选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess4"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl4" :src="inquire.imageUrl4" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(4)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>游戏icon选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess5"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl5" :src="inquire.imageUrl5" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(5)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>游戏icon未选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess6"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl6" :src="inquire.imageUrl6" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(6)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>动态icon选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess7"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl7" :src="inquire.imageUrl7" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(7)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>动态icon未选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess8"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl8" :src="inquire.imageUrl8" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(8)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>消息icon选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess9"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img v-if="inquire.imageUrl9" :src="inquire.imageUrl9" class="avatar" />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(9)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>消息icon未选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess10"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="inquire.imageUrl10"
+          :src="inquire.imageUrl10"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(10)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>我的icon选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess11"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="inquire.imageUrl11"
+          :src="inquire.imageUrl11"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(11)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>我的icon未选中状态:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess12"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="inquire.imageUrl12"
+          :src="inquire.imageUrl12"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(12)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>横条icon:</span>
+      <el-upload
+        class="avatar-uploader"
+        action="/admin/tencent/cos/upload/file"
+        :show-file-list="false"
+        :on-success="handleAvatarSuccess13"
+        :before-upload="beforeAvatarUpload"
+        :on-error="handleAvatarError"
+      >
+        <img
+          v-if="inquire.imageUrl13"
+          :src="inquire.imageUrl13"
+          class="avatar"
+        />
+        <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+      </el-upload>
+      <el-button class="primary but" type="primary" @click="defaultFun(13)"
+        >恢复默认</el-button
+      >
+    </div>
+    <div class="inquireBox">
+      <span>背景颜色:</span>
+      <el-input
+        v-model="inquire.color"
+        placeholder="例如:#FFFFFF"
+        class="input"
+      ></el-input>
+    </div>
+    <el-button
+      style="margin-bottom: 20px"
+      class="primary but"
+      type="primary"
+      @click="seave()"
+      >保存设置</el-button
+    >
+  </div>
+</template>
+<script>
+import {
+  appUiSetting,
+  appUiSettingSave,
+} from "@/api/roomBackground/roomBackground";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "appUiSet",
+  data() {
+    return {
+      inquire: {
+        imageUrl1: "",
+        imageUrl2: "",
+        imageUrl3: "",
+        imageUrl4: "",
+        imageUrl5: "",
+        imageUrl6: "",
+        imageUrl7: "",
+        imageUrl8: "",
+        imageUrl9: "",
+        imageUrl10: "",
+        imageUrl11: "",
+        imageUrl12: "",
+        imageUrl13: "",
+        color: "",
+      },
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      appUiSetting().then((res) => {
+        if (res.code == 200) {
+          console.log(res.data);
+          this.inquire.imageUrl1 = res.data.headIcon;
+          this.inquire.imageUrl2 = res.data.navbar;
+          this.inquire.imageUrl3 = res.data.homeSelectIcon;
+          this.inquire.imageUrl4 = res.data.homeUnSelectIcon;
+          this.inquire.imageUrl5 = res.data.gameSelectIcon;
+          this.inquire.imageUrl6 = res.data.gameUnSelectIcon;
+          this.inquire.imageUrl7 = res.data.dynamicSelectIcon;
+          this.inquire.imageUrl8 = res.data.dynamicUnSelectIcon;
+          this.inquire.imageUrl9 = res.data.msgSelectIcon;
+          this.inquire.imageUrl10 = res.data.msgUnSelectIcon;
+          this.inquire.imageUrl11 = res.data.mineSelectIcon;
+          this.inquire.imageUrl12 = res.data.mineUnSelectIcon;
+          this.inquire.imageUrl13 = res.data.selectBar;
+          this.inquire.color = res.data.backgroundColor;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    seave() {
+      var obj = {
+        headIcon: this.inquire.imageUrl1,
+        navbar: this.inquire.imageUrl2,
+        homeSelectIcon: this.inquire.imageUrl3,
+        homeUnSelectIcon: this.inquire.imageUrl4,
+        gameSelectIcon: this.inquire.imageUrl5,
+        gameUnSelectIcon: this.inquire.imageUrl6,
+        dynamicSelectIcon: this.inquire.imageUrl7,
+        dynamicUnSelectIcon: this.inquire.imageUrl8,
+        msgSelectIcon: this.inquire.imageUrl9,
+        msgUnSelectIcon: this.inquire.imageUrl10,
+        mineSelectIcon: this.inquire.imageUrl11,
+        mineUnSelectIcon: this.inquire.imageUrl12,
+        selectBar: this.inquire.imageUrl13,
+        backgroundColor: this.inquire.color,
+      };
+      // obj = JSON.stringify(obj);
+      appUiSettingSave(obj).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "保存成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    defaultFun(num){
+      console.log(this.inquire);
+      console.log(this.inquire[`imageUrl${num}`]);
+      this.inquire[`imageUrl${num}`] = '';
+      console.log(this.inquire);
+    },
+    handleAvatarSuccess1(res, file) {
+      this.inquire.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      this.inquire.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess3(res, file) {
+      this.inquire.imageUrl3 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess4(res, file) {
+      this.inquire.imageUrl4 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess5(res, file) {
+      this.inquire.imageUrl5 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess6(res, file) {
+      this.inquire.imageUrl6 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess7(res, file) {
+      this.inquire.imageUrl7 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess8(res, file) {
+      this.inquire.imageUrl8 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess9(res, file) {
+      this.inquire.imageUrl9 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess10(res, file) {
+      this.inquire.imageUrl10 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess11(res, file) {
+      this.inquire.imageUrl11 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess12(res, file) {
+      this.inquire.imageUrl12 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess13(res, file) {
+      this.inquire.imageUrl13 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .text {
+      display: inline-block;
+    }
+  }
+  .inquireBox {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    span {
+      display: block;
+      margin-right: 20px;
+      width: 100px;
+    }
+    .but {
+      margin-left: 20px;
+    }
+    .input {
+      width: 180px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
+.dialogBox {
+  width: 100%;
+  //   height: 50px;
+  //   line-height: 50px;
+  display: flex;
+  align-items: baseline;
+  margin-bottom: 20px;
+  .input {
+    width: 50%;
+  }
+  .selectBox {
+    display: flex;
+    height: 35px;
+    line-height: 35px;
+    margin-bottom: 20px;
+  }
+  .selectBoxImg {
+    height: 150px;
+  }
+}
+</style>

src/views/roomBackground/roomBackground.vue

@@ -0,0 +1,683 @@
+<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 class="demonstration">id</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 状态 -->
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.statusArr"
+          :key="item.status"
+          :label="item.desc"
+          :value="item.status"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        tableData = [];
+        currentPage = 1;
+        isFinished = false;
+        getData();
+      "
+      >查询</el-button
+    >
+    <!-- 重置按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = '';
+        inquire.id = '';
+        inquire.status = '';
+        getData();
+      "
+      >重置按钮</el-button
+    >
+    <!-- 新增按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        dialogVisibleTitle = '新增';
+        dialogVisibleTitleType = 1;
+        dialogObj.checkedArr = [];
+        dialogObj.radio = '0';
+        dialogObj.imageUrl1 = '';
+        dialogObj.imageUrl2 = '';
+        dialogObj.imageUrl3 = '';
+        dialogObj.price = '';
+        dialogObj.renew = '';
+        dialogObj.originalPrice = '';
+        dialogObj.day = '';
+        dialogObj.sort = '';
+        dialogObj.radio2 = '1';
+        dialogVisible = true;
+      "
+      >新增</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="id" />
+      <el-table-column prop="type" align="center" label="是否免费">
+        <template v-slot="scope">{{
+          scope.row.type == 0 ? "免费" : scope.row.type == 1 ? "付费" : "自定义"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="buyGoldPrice" align="center" label="购买价格" />
+      <el-table-column prop="renewGoldPrice" align="center" label="续费价格" />
+      <el-table-column prop="originalGoldPrice" align="center" label="原价" />
+      <el-table-column prop="buyHour" align="center" label="有效期" />
+      <el-table-column prop="seq" align="center" label="排序" />
+      <el-table-column prop="status" align="center" label="上架状态">
+        <template v-slot="scope">{{
+          scope.row.status == 1 ? "上架" : "下架"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="url" align="center" label="图片">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.url"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.url]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+          <!-- <div
+            v-show="scope.row.url.toLowerCase().endsWith('.svga')"
+            :id="'guide' + scope.row.id"
+            class="game-guide"
+          >
+            {{ guideFn(scope.row.id, scope.row.url) }}
+          </div> -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" align="center" label="创建时间" />
+      <el-table-column prop="partitionDesc" align="center" label="分区" />
+      <el-table-column prop="adminUser" align="center" label="操作人" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button
+            class="primary"
+            type="primary"
+            @click="
+              dialogVisibleTitle = '编辑';
+              dialogVisibleTitleType = 2;
+              dialogObj.checkedArr = checkedArrFun(scope.row.partitionFlag);
+              dialogObj.radio = scope.row.type.toString();
+              dialogObj.price = scope.row.buyGoldPrice;
+              dialogObj.renew = scope.row.renewGoldPrice;
+              dialogObj.originalPrice = scope.row.originalGoldPrice;
+              dialogObj.day = scope.row.buyHour;
+              dialogObj.sort = scope.row.seq;
+              dialogObj.radio2 = scope.row.status.toString();
+              dialogObj.imageUrl2 = scope.row.url;
+              dialogObj.imageUrl1 = '';
+              dialogObj.imageUrl3 = '';
+              dialogObj.id = scope.row.id;
+              dialogVisible = true;
+            "
+            >编辑</el-button
+          >
+          <!-- <el-button class="primary" type="primary" @click="del(scope.row)"
+            >删除</el-button
+          > -->
+          <!-- 删除弹出框 -->
+          <!-- <el-popover
+            v-model:visible="scope.row.visible1"
+            placement="top"
+            :width="160"
+          >
+            <p>确定要删除么?</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="small" @click="scope.row.visible1 = false">
+                取消
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                @click="pass(scope.row.id)"
+              >
+                确认
+              </el-button>
+            </div>
+            <template #reference>
+              <el-button
+                class="danger"
+                type="danger"
+                @click="scope.row.visible1 = true"
+                >删除</el-button
+              > -->
+          <!-- </template>
+          </el-popover> -->
+        </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="[1, 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="dialogVisible"
+      :title="dialogVisibleTitle"
+      center
+      :width="500"
+    >
+      <div class="dialogBox">
+        <span>分区：</span>
+        <el-checkbox-group v-model="dialogObj.checkedArr">
+          <el-checkbox
+            v-for="(item, i) in inquire.partitionArr"
+            :key="i"
+            :label="item.id"
+            >{{ item.desc }}</el-checkbox
+          >
+        </el-checkbox-group>
+      </div>
+      <div class="dialogBox">
+        <span>是否免费：</span>
+        <div>
+          <el-radio v-model="dialogObj.radio" label="0">是</el-radio>
+          <el-radio v-model="dialogObj.radio" label="1">否</el-radio>
+        </div>
+      </div>
+      <!-- <div class="dialogBox">
+        <span>房内图标：</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="dialogObj.imageUrl1"
+            :src="dialogObj.imageUrl1"
+            class="avatar"
+          />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div> -->
+      <div class="dialogBox">
+        <span>购买价格：</span>
+        <el-input
+          v-model="dialogObj.price"
+          placeholder="如果是免费请写0"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="dialogBox">
+        <span>续费价格：</span>
+        <el-input
+          v-model="dialogObj.renew"
+          placeholder="如果是免费请写0"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="dialogBox">
+        <span>原价：</span>
+        <el-input
+          v-model="dialogObj.originalPrice"
+          placeholder="如果是免费请写0"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="dialogBox">
+        <span>有效天数：</span>
+        <el-input
+          v-model="dialogObj.day"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="dialogBox">
+        <span>排序：</span>
+        <el-input
+          v-model="dialogObj.sort"
+          placeholder=""
+          class="input"
+        ></el-input>
+      </div>
+      <div class="dialogBox">
+        <span>状态：</span>
+        <div>
+          <el-radio v-model="dialogObj.radio2" label="1">上架</el-radio>
+          <el-radio v-model="dialogObj.radio2" label="-1">下架</el-radio>
+        </div>
+      </div>
+      <div class="dialogBox">
+        <span>背景图片：</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess2"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <!-- 这里是原来的图片预览 -->
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="dialogObj.imageUrl2"
+            :zoom-rate="1.1"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+          <!-- <div
+            v-show="dialogObj.imageUrl2.toLowerCase().endsWith('.svga')"
+            id="guide2"
+            class="game-guide"
+          >
+            {{ guideFn2(dialogObj.imageUrl2) }}
+          </div> -->
+        </el-upload>
+      </div>
+      <!-- <div class="dialogBox">
+        <span>动效图片：</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess3"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img
+            v-if="dialogObj.imageUrl3"
+            :src="dialogObj.imageUrl3"
+            class="avatar"
+          />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div> -->
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="addNeid(dialogVisibleTitleType)"
+            >确认</el-button
+          >
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  page,
+  roomBackgroundAdd,
+  roomBackgroundUpdate,
+} from "@/api/roomBackground/roomBackground";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref, onMounted, nextTick } from "vue";
+import SVGA from "svgaplayerweb";
+export default {
+  name: "roomBackground",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: "",
+        partitionArr: [],
+        id: "",
+        status: "",
+        statusArr: [
+          {
+            status: "1",
+            desc: "上架",
+          },
+          {
+            status: "-1",
+            desc: "下架",
+          },
+        ],
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      isLoading: false, // 加载状态
+      isFinished: false, // 是否加载完成
+      //   删除相关
+      visible: false,
+      //   编辑新增
+      dialogVisible: false,
+      dialogVisibleTitle: "新增",
+      dialogVisibleTitleType: 1, //1新增2编辑
+      dialogObj: {
+        checkedArr: [],
+        radio: "1",
+        imageUrl1: "",
+        imageUrl2: "",
+        imageUrl3: "",
+        price: "",
+        renew: "",
+        originalPrice: "",
+        day: "",
+        sort: "",
+        radio2: "1",
+        id: null,
+      },
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      console.log(res);
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+      this.getData();
+    });
+  },
+  methods: {
+    guideFn(id, url) {
+      // 等待 DOM 渲染完成
+      this.$nextTick(() => {
+        const guideElement = document.getElementById("guide" + id);
+        if (guideElement && url.toLowerCase().endsWith(".svga")) {
+          let player = new SVGA.Player(guideElement);
+          let parser = new SVGA.Parser();
+          parser.load(url, (videoItem) => {
+            // 你的svga文件路径
+            player.setVideoItem(videoItem);
+            player.startAnimation(); // 开始动画
+          });
+        }
+      });
+    },
+    guideFn2(url) {
+      // 等待 DOM 渲染完成
+      this.$nextTick(() => {
+        const guideElement = document.getElementById("guide2");
+        if (guideElement && url.toLowerCase().endsWith(".svga")) {
+          let player = new SVGA.Player(guideElement);
+          let parser = new SVGA.Parser();
+          parser.load(url, (videoItem) => {
+            // 你的 svga 文件路径
+            player.setVideoItem(videoItem);
+            player.startAnimation(); // 开始动画
+          });
+        }
+      });
+    },
+    // 查询接口
+    getData() {
+      this.isLoading = true;
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      page({
+        partitionId: this.inquire.partitionId,
+        id: this.inquire.id,
+        status: this.inquire.status,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.rows;
+          this.total = res.data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    // 确认新增/确认编辑
+    addNeid(type) {
+      if (type == 1) {
+        var partitionIdNum = this.dialogObj.checkedArr.reduce(
+          (accumulator, currentValue) => {
+            return accumulator + currentValue;
+          },
+          0
+        );
+        roomBackgroundAdd({
+          partitionId: partitionIdNum,
+          type: this.dialogObj.radio,
+          buyGoldPrice: this.dialogObj.price,
+          renewGoldPrice: this.dialogObj.renew,
+          originalGoldPrice: this.dialogObj.originalPrice,
+          buyHour: this.dialogObj.day,
+          seq: this.dialogObj.sort,
+          status: this.dialogObj.radio2,
+          url: this.dialogObj.imageUrl2,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.dialogVisible = false;
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else {
+        var partitionIdNumEid = this.dialogObj.checkedArr.reduce(
+          (accumulator, currentValue) => {
+            return accumulator + currentValue;
+          },
+          0
+        );
+        roomBackgroundUpdate({
+          partitionId: partitionIdNumEid,
+          type: this.dialogObj.radio,
+          buyGoldPrice: this.dialogObj.price,
+          renewGoldPrice: this.dialogObj.renew,
+          originalGoldPrice: this.dialogObj.originalPrice,
+          buyHour: this.dialogObj.day,
+          seq: this.dialogObj.sort,
+          status: this.dialogObj.radio2,
+          url: this.dialogObj.imageUrl2,
+          id: this.dialogObj.id,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.dialogVisible = false;
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+    },
+    checkedArrFun(num) {
+      const arr = this.inquire.partitionArr
+        .filter((p) => {
+          return num == 0 || p.id == (p.id & num);
+        })
+        .map((p) => p.id);
+      return arr;
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess3(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl3 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+  mounted() {},
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
+.dialogBox {
+  width: 100%;
+  //   height: 50px;
+  //   line-height: 50px;
+  display: flex;
+  align-items: baseline;
+  margin-bottom: 20px;
+  .input {
+    width: 50%;
+  }
+  .selectBox {
+    display: flex;
+    height: 35px;
+    line-height: 35px;
+    margin-bottom: 20px;
+  }
+  .selectBoxImg {
+    height: 150px;
+  }
+}
+.game-guide {
+  width: 100px;
+  height: 100px;
+  overflow: hidden;
+  // left: 50%;
+  // top: 50%;
+  // transform: translate(-50%,-50%);
+  canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
+}
+</style>

src/views/roomBackground/roomBackgroundCustom.vue

@@ -0,0 +1,426 @@
+<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 class="demonstration">用户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-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = null;
+        inquire.id = null;
+        getData();
+      "
+      >重置搜索</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" 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="createTime" align="center" label="申请时间" />
+      <el-table-column prop="url" align="center" label="图片">
+        <template v-slot="scope">
+          <el-image
+            v-if="scope.row.url"
+            style="width: 100px; height: 100px"
+            :src="scope.row.url"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.url]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+          <div v-else>/</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" align="center" label="状态">
+        <template v-slot="scope">{{
+          scope.row.status < 0
+            ? "过期"
+            : scope.row.status == 0
+            ? "审核中"
+            : scope.row.status == 1
+            ? "通过"
+            : "不通过"
+        }}</template>
+      </el-table-column>
+      <el-table-column prop="updateTime" align="center" label="审核时间" />
+      <el-table-column prop="adminUser" align="center" label="操作人">
+        <template v-slot="scope">{{
+          scope.row.adminUser ? scope.row.adminUser : "-"
+        }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <!-- 通过弹出框 -->
+          <el-popover
+            v-model:visible="scope.row.visible1"
+            placement="top"
+            :width="160"
+          >
+            <p>确定要通过么?</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="small" @click="scope.row.visible1 = false">
+                取消
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                @click="pass(scope.row.id)"
+              >
+                确认
+              </el-button>
+            </div>
+            <template #reference>
+              <el-button
+                v-show="scope.row.status == 0"
+                class="primary"
+                type="primary"
+                @click="scope.row.visible1 = true"
+                >通过</el-button
+              >
+            </template>
+          </el-popover>
+
+          <!-- 拒绝弹出框 -->
+          <el-popover
+            v-model:visible="scope.row.visible2"
+            placement="top"
+            :width="160"
+          >
+            <p>确定要拒绝么?</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="small" @click="scope.row.visible2 = false">
+                取消
+              </el-button>
+              <el-button
+                size="small"
+                type="primary"
+                @click="reject(scope.row.id)"
+              >
+                确认
+              </el-button>
+            </div>
+            <template #reference>
+              <el-button
+                v-show="scope.row.status == 0"
+                class="primary"
+                type="primary"
+                @click="scope.row.visible2 = true"
+                >拒绝</el-button
+              >
+            </template>
+          </el-popover>
+
+          <!-- 删除弹出框 -->
+          <el-popover
+            v-model:visible="scope.row.visible3"
+            placement="top"
+            :width="160"
+          >
+            <p>确定要删除么?</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="small" @click="scope.row.visible3 = false">
+                取消
+              </el-button>
+              <el-button size="small" type="primary" @click="del(scope.row.id)">
+                确认
+              </el-button>
+            </div>
+            <template #reference>
+              <el-button
+                class="danger"
+                type="danger"
+                @click="scope.row.visible3 = true"
+                >删除</el-button
+              >
+            </template>
+          </el-popover></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="[1, 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,
+  customPage,
+  customPass,
+  customReject,
+  customDel,
+} from "@/api/roomBackground/roomBackground";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage, ElTable } from "element-plus";
+import { ref } from "vue";
+import { ElMessageBox } from "element-plus"; // 正确引入 ElM
+export default {
+  name: "roomBackgroundCustom",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: "",
+        partitionArr: [],
+        id: "",
+      },
+      // 表格
+      tableData: [{ x: "x" }],
+      // 分页
+      total: 0, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      //   删除相关
+      // visible1: false,
+      // visible2: false,
+      // visible3: false,
+    };
+  },
+  created() {
+    this.loading = true;
+    listPartitionInfo().then((res) => {
+      console.log(res);
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+      this.getData();
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      customPage({
+        partitionId: this.inquire.partitionId,
+        erbanNo: this.inquire.id,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.rows;
+          this.total = res.data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    // 通过
+    pass(id) {
+      customPass({ id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "操作成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 拒绝
+    reject(id) {
+      customReject({ id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "操作成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 删除
+    del(id) {
+      customDel({ id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: "操作成功",
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess3(res, file) {
+      console.log(file);
+      // this.operation.imageUrl1 = URL.createObjectURL();
+      this.dialogObj.imageUrl3 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        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;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+.pagination {
+  margin: 10px auto 10px;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.pagination_in {
+  text-align: center;
+}
+.dialogBox {
+  width: 100%;
+  //   height: 50px;
+  //   line-height: 50px;
+  display: flex;
+  align-items: baseline;
+  margin-bottom: 20px;
+  .input {
+    width: 50%;
+  }
+  .selectBox {
+    display: flex;
+    height: 35px;
+    line-height: 35px;
+    margin-bottom: 20px;
+  }
+  .selectBoxImg {
+    height: 150px;
+  }
+}
+</style>

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

@@ -103,6 +103,7 @@ export default {
             { 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%' },

src/views/users/ChargeRecordDailyStatisticsView.vue

@@ -1,24 +1,29 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <form class="col-sm-12" id="searchForm" action="/admin/chargeRecord/dailyexport" method="get"
-                        target="_blank">
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <form class="col-sm-12"
+                id="searchForm"
+                action="/admin/chargeRecord/dailyexport"
+                method="get"
+                target="_blank">
 
-                    </form>
-                    <div class="col-sm-12 pull-left">
-                        <h4>
-                            今日充值数据：<span class="totalAmount" style="color: red">0</span>（总金额）/
-                            <span class="totalCount" style="color: red">0</span>（总笔数）
-                            <span style="color: red">(单位：美元)</span>
-                        </h4>
-                    </div>
-                    <!-- <div class="col-sm-3 pull-right">
+          </form>
+          <div class="col-sm-12 pull-left">
+            <h4>
+              今日充值数据：<span class="totalAmount"
+                    style="color: red">0</span>（总金额）/
+              <span class="totalCount"
+                    style="color: red">0</span>（总笔数）
+              <span style="color: red">(单位：美元)</span>
+            </h4>
+          </div>
+          <!-- <div class="col-sm-3 pull-right">
                      <button id="btnSearch" class="btn btn-default">
                          <i class="glyphicon glyphicon-search"></i>查询
                      </button>
@@ -26,185 +31,194 @@
                          <i class="glyphicon glyphicon-export"></i>导出
                      </button>
                  </div>-->
-                </div>
-                <!-- .content -->
-                <div id="table"></div>
-
-            </div>
         </div>
-    </section>
+        <!-- .content -->
+        <div id="table"></div>
 
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </div>
-
-            </div>
-        </div>
+      </div>
     </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "ChargeRecordDailyStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordDailyStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            {
+              field: 'time',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 20,
+          pagination: true,
+          pageList: [20, 50, 100, 200, 300, 500],
+          search: false,
+          sidePagination: "client", //表示服务端请求
+          queryParamsType: "undefined",
+          queryParams: function queryParams (params) {   //设置查询参数
+            var param = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/dailylist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+            getTotalStatis();
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'MyCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        {
-                            field: 'time',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 20,
-                    pagination: true,
-                    pageList: [20, 50, 100, 200, 300, 500],
-                    search: false,
-                    sidePagination: "client", //表示服务端请求
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/dailylist',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                        getTotalStatis();
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
-                // 导出EXCEL
-                $('#btnExport').on('click', function () {
-                    $("#searchForm").submit();
-                });
+        // 导出EXCEL
+        $('#btnExport').on('click', function () {
+          $("#searchForm").submit();
+        });
 
-                // 查询刷新
-                $('#btnSearch').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          TableHelper.doRefresh('#table');
+        });
 
-                $("#table").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {
 
-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");
 
-                    var date = new Date().format("yyyy-MM-dd ");
-                    $("#modalLabel").html(date + parseTime(time));
+          var date = new Date().format("yyyy-MM-dd ");
+          $("#modalLabel").html(date + parseTime(time));
 
-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
 
-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/dailydetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/dailydetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });
 
 
-            });
-        }
-    },
+      });
+    }
+  },
 
 };
 
-function parseTime(val) {
-    if (val < 10) {
-        return '0' + val + ':00-0' + val + ':59';
-    } else {
-        return val + ':00-' + val + ':59';
-    }
+function parseTime (val) {
+  if (val < 10) {
+    return '0' + val + ':00-0' + val + ':59';
+  } else {
+    return val + ':00-' + val + ':59';
+  }
 }
-function getTotalStatis() {
-    $.get('/admin/chargeRecord/dailytotal', function (res) {
-        if (res.code == 200) {
-            console.log(res.data);
-            if (res.data) {
-                $('.totalAmount').html(res.data.amount);
-                $('.totalCount').html(res.data.count);
-            }
-        }
-    })
+function getTotalStatis () {
+  $.get('/admin/chargeRecord/dailytotal', function (res) {
+    if (res.code == 200) {
+      console.log(res.data);
+      if (res.data) {
+        $('.totalAmount').html(res.data.amount);
+        $('.totalCount').html(res.data.count);
+      }
+    }
+  })
 }
 </script>
 

src/views/users/ChargeRecordEnPartitionStatisticsView.vue

@@ -103,6 +103,7 @@ export default {
             { 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%' },

src/views/users/ChargeRecordTotalStatisticsView.vue

@@ -1,228 +1,250 @@
 <template>
-    <section class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <!-- Content Header (Page header) -->
-                <section class="content-header">
-                    <h1 id="itemTitle"></h1>
-                </section>
-                <div id="toolbar">
-                    <div class="col-sm-12">
-                        <div class="pull-left">
-                            <form id="searchForm" class="col-sm-pull-12" action="/admin/chargeRecord/totalexport"
-                                method="get" target="_blank">
-                                <div class="col-sm-11">
-                                    <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>
+  <section class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+          <h1 id="itemTitle"></h1>
+        </section>
+        <div id="toolbar">
+          <div class="col-sm-12">
+            <div class="pull-left">
+              <form id="searchForm"
+                    class="col-sm-pull-12"
+                    action="/admin/chargeRecord/totalexport"
+                    method="get"
+                    target="_blank">
+                <div class="col-sm-11">
+                  <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>
-                            <span style="color: red">(单位：美元)</span>
-                        </div>
-
-                    </div>
                 </div>
-
-                <!-- .content -->
-                <div id="table"></div>
-
+              </form>
             </div>
-        </div>
-    </section>
-
-    <div class="modal fade" id="recordDetail" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel"></h4>
-                </div>
-                <div class="modal-body">
-                    <div id="detailtable"></div>
-                </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>
+              <span style="color: red">(单位：美元)</span>
             </div>
+
+          </div>
         </div>
+
+        <!-- .content -->
+        <div id="table"></div>
+
+      </div>
     </div>
+  </section>
+
+  <div class="modal fade"
+       id="recordDetail"
+       tabindex="-1"
+       role="dialog"
+       aria-labelledby="modalLabel">
+    <div class="modal-dialog"
+         role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button"
+                  class="close"
+                  data-dismiss="modal"
+                  aria-label="Close"><span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title"
+              id="modalLabel"></h4>
+        </div>
+        <div class="modal-body">
+          <div id="detailtable"></div>
+        </div>
+
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 export default {
-    name: "ChargeRecordTotalStatisticsView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "ChargeRecordTotalStatisticsView",
+  setup () {
+    return {};
+  },
+  created () {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData () {
+      $(function () {
+        $('#table').bootstrapTable('destroy');
+        $('#table').bootstrapTable({
+          columns: [
+            { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
+            /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
+            {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
+            {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
+            {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
+            {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
+            {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
+            {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
+            {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
+            {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
+            {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
+            { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
+            { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
+            { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
+            { field: 'startPayAmount', title: 'startPay支付', align: 'center', width: '5%' },
+            { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
+            { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
+            { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
+            {
+              field: 'timeStr',
+              title: '操作',
+              align: 'center',
+              width: '5%',
+              formatter: function (val, row, index) {
+                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
+                  '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
+              }
+            }
+          ],
+          undefinedText: 0,
+          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 = {
+              pageNum: params.pageNumber,
+              pageSize: params.pageSize,
+              beginDate: $('#beginDate').val(),
+              endDate: $('#endDate').val()
+            };
+            return param;
+          },
+          toolbar: '#toolbar',
+          url: '/admin/chargeRecord/totallist',
+          onLoadSuccess: function () {  //加载成功时执行
+            console.log("load success");
+          },
+          onLoadError: function () {  //加载失败时执行
+            console.log("load fail");
+          }
         });
-    },
-    methods: {
-        initData() {
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'timeStr', title: '日期', align: 'center', width: '5%' },
-                        /*{field: 'wxAmount', title: '微信支付', align: 'center', width: '5%'},
-                        {field: 'wxWapAmount', title: '微信H5支付', align: 'center', width: '5%'},
-                        {field: 'wxPubAmount', title: '微信公众号', align: 'center', width: '5%'},
-                        {field: 'alipayAmount', title: '支付宝', align: 'center', width: '5%'},
-                        {field: 'alipayV2Amount', title: '支付宝V2', align: 'center', width: '5%'},
-                        {field: 'wxMicroMallPubAmount', title: '微商城公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2Amount', title: '平台公众号', align: 'center', width: '5%'},
-                        {field: 'wxPub2H5Amount', title: '平台公众号H5支付', align: 'center', width: '5%'},
-                        {field: 'alipayWapAmount', title: '支付宝H5', align: 'center', width: '5%'},
-                        {field: 'iosPayAmount', title: 'IOS支付', align: 'center', width: '5%'},
-                        {field: 'wxMiniAppAmount', title: '小程序支付', align: 'center', width: '5%'},*/
-                        { field: 'googleAmount', title: 'google支付', align: 'center', width: '5%' },
-                        { field: 'payermaxAmount', title: 'payermax支付', align: 'center', width: '5%' },
-                        { field: 'myCardAmount', title: 'myCard支付', align: 'center', width: '5%' },
-                        { field: 'iosPayAmount', title: 'ios支付', align: 'center', width: '5%' },
-                        { field: 'companyAccount', title: '充值打公账', align: 'center', width: '5%' },
-                        { field: 'totalAmount', title: '总计充值金额数', align: 'center', width: '5%' },
-                        {
-                            field: 'timeStr',
-                            title: '操作',
-                            align: 'center',
-                            width: '5%',
-                            formatter: function (val, row, index) {
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-success opt-detail" data-id=' + val + '>' +
-                                    '<i class="glyphicon glyphicon-edit"></i> 明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    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 = {
-                            pageNum: params.pageNumber,
-                            pageSize: params.pageSize,
-                            beginDate: $('#beginDate').val(),
-                            endDate: $('#endDate').val()
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '/admin/chargeRecord/totallist',
-                    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();
-                });
+        // 导出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');
-                });
-                var chargeStart = $('#beginDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
+        // 查询刷新
+        $('#btnSearch').on('click', function () {
+          if (!$('#beginDate').val() || !$('#endDate').val()) {
+            $("#tipMsg").text("请输入必填的信息");
+            $("#tipModal").modal('show');
+            return;
+          }
+          TableHelper.doRefresh('#table');
+        });
+        var chargeStart = $('#beginDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
 
-                var chargeEnd = $('#endDate').datepicker({
-                    format: 'yyyy-mm-dd',
-                    autoclose: true
-                });
-                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);
-                });
+        var chargeEnd = $('#endDate').datepicker({
+          format: 'yyyy-mm-dd',
+          autoclose: true
+        });
+        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").on("click", '.opt-detail', function () {
+        $("#table").on("click", '.opt-detail', function () {
 
-                    $("#recordDetail").modal('show');
-                    var time = $(this).attr("data-id");
+          $("#recordDetail").modal('show');
+          var time = $(this).attr("data-id");
 
-                    $("#modalLabel").html(time);
+          $("#modalLabel").html(time);
 
-                    $('#detailtable').bootstrapTable('destroy');
-                    $('#detailtable').bootstrapTable({
-                        columns: [
-                            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-                            { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
-                            { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
+          $('#detailtable').bootstrapTable('destroy');
+          $('#detailtable').bootstrapTable({
+            columns: [
+              { field: 'channel', title: '渠道', align: 'center', width: '5%' },
+              { field: 'amount', title: '充值金额', align: 'center', width: '5%' },
+              { field: 'count', title: '充值笔数', align: 'center', width: '5%' }
 
-                        ],
-                        undefinedText: 0,
-                        height: 600,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: false,
-                        pageList: [20, 50, 100, 200, 300, 500],
-                        search: false,
-                        sidePagination: "client", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                pageNum: params.pageNumber,
-                                pageSize: params.pageSize,
-                                time: time
-                            };
-                            return param;
-                        },
-                        url: '/admin/chargeRecord/totaldetail',
-                        onLoadSuccess: function () {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
-            });
+            ],
+            undefinedText: 0,
+            height: 600,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: false,
+            pageList: [20, 50, 100, 200, 300, 500],
+            search: false,
+            sidePagination: "client", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams (params) {   //设置查询参数
+              var param = {
+                pageNum: params.pageNumber,
+                pageSize: params.pageSize,
+                time: time
+              };
+              return param;
+            },
+            url: '/admin/chargeRecord/totaldetail',
+            onLoadSuccess: function () {  //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {  //加载失败时执行
+              console.log("load fail");
+            }
+          });
+        });
+      });
 
-        }
-    },
+    }
+  },
 
 };
 </script>

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

@@ -103,6 +103,7 @@ export default {
             { 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%' },

src/views/users/DiamondGiveHistoryView.vue

@@ -24,12 +24,13 @@
                                     <option value="">请选择...</option>
                                     <option value="0">金币</option>
                                     <option value="1">背包礼物</option>
+                                    <option value="2">web-api金币</option>
                                 </select>
                             </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><span class="col-sm-1">至</span>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"></div>
+                            <span class="col-sm-1">至</span>
                             <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
 
                         </div>
@@ -110,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');
@@ -163,6 +147,8 @@ export default {
                             formatter: function (val, row, index) {
                                 if (row.type == 0) {
                                     return '金币'
+                                }else if(row.type == 2){
+                                    return 'web-api金币';
                                 } else {
                                     return '背包礼物';
                                 }
@@ -287,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/FeedBack.vue

@@ -69,7 +69,7 @@
           :src="scope.row.screenUrl"
           :zoom-rate="1.1"
           :preview-src-list="scope.row.screenUrl"
-          fit="cover"
+          fit="scale-down"
           preview-teleported="true"
           hide-on-click-modal="true"
         />

src/views/users/GiftManageView.vue

@@ -66,6 +66,9 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</option>
+                                    <option value="18">幸运礼物</option>
+                                    <option value="19">CP礼物</option>
+                                    <option value="20">定制礼物</option>
                                 </select>
                             </div>
                             <label for="partitionId" class="col-sm-1 control-label">地区:</label>
@@ -153,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">
@@ -208,6 +212,9 @@
                                     <option value="15">线性福袋礼物</option>
                                     <option value="16">超级幸运礼物</option>
                                     <option value="17">国家礼物</option>
+                                    <option value="18">幸运礼物</option>
+                                    <option value="19">CP礼物</option>
+                                    <option value="20">定制礼物</option>
                                 </select>
                             </div>
                         </div>
@@ -648,6 +655,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: '地区', 
@@ -664,6 +672,9 @@ export default {
                                 if ((val & 4) != 0) {
                                     value += '华语区<br>';
                                 }
+                                if ((val & 8) != 0) {
+                                    value += '土耳其<br>';
+                                }
                                 return value;
                             }
                         },

src/views/wishingStar/wishingRound.vue

@@ -52,7 +52,7 @@
             :src="scope.row.giftUrl"
             :zoom-rate="1.1"
             :preview-src-list="[scope.row.giftUrl]"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />

src/views/wishingStar/wishingStarSet.vue

@@ -42,7 +42,7 @@
             :src="scope.row.giftUrl"
             :zoom-rate="1.1"
             :preview-src-list="[scope.row.giftUrl]"
-            fit="cover"
+            fit="scale-down"
             preview-teleported="true"
             hide-on-click-modal="true"
           />