替换金币字眼为钻石

src/api/chat/publicChatTopRecord.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export const getPublicChatTopRecordPage = query => {
-    return request({
-        url: '/admin/publicChatTopRecord/page',
-        method: 'get',
-        params: query
-    });
-};

src/api/gameAdmin/gameAdmin.js

@@ -1,20 +0,0 @@
-import request from '@/utils/request';
-import { genQueryParam } from '@/utils/maintainer';
-
-// 获取游戏列表
-export const mgList = query => {
-    return request({
-        url: '/admin/miniGame/statis/mgList',
-        method: 'get',
-        params: query
-    });
-};
-// 游戏编辑
-export const save = query => {
-    return request({
-        url: '/admin/miniGame/save',
-        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
-        method: 'post',
-        data: query
-    });
-};

src/api/miniGame/miniGameForBaiShun.js

@@ -1,23 +0,0 @@
-import request from '@/utils/request';
-import { genQueryParam } from '@/utils/maintainer';
-
-export const miniGameForBaiShunPage = query => {
-    return request({
-        url: '/admin/miniGame/baiShun/statis/page',
-        method: 'get',
-        params: query
-    });
-};
-
-export const miniGameForBaiShunDetailPage = query => {
-    return request({
-        url: '/admin/miniGame/baiShun/statis/detailPage',
-        method: 'get',
-        params: query
-    });
-};
-
-export const miniGameForBaiShunExport = query => {
-    window.location.href = `/admin/miniGame/baiShun/statis/export?${genQueryParam(query)}`;
-    return;
-};

src/api/miniGame/miniGameForNav.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request';
-
-export const miniGameForNavPage = query => {
-    return request({
-        url: '/admin/miniGame/nav/page',
-        method: 'get',
-        params: query
-    });
-};

src/api/nobleman/nobleman.js

@@ -1,56 +0,0 @@
-import request from '@/utils/request';
-import { genQueryParam } from '@/utils/maintainer';
-
-// 邀请移除记录
-export const pageOperateRecord = query => {
-    return request({
-        url: '/admin/family/manage/pageOperateRecord',
-        method: 'get',
-        params: query
-    });
-};
-// 查询公会信息
-export const pageFamily = query => {
-    return request({
-        url: '/admin/family/manage/pageFamily',
-        method: 'get',
-        params: query
-    });
-};
-// 公会成员信息
-export const pageFamilyMember = query => {
-    return request({
-        url: '/admin/family/manage/pageFamilyMember',
-        method: 'get',
-        params: query
-    });
-};
-// 创建公会信息
-export const create = query => {
-    return request({
-        url: '/admin/family/manage/create',
-        method: 'post',
-        params: query
-    });
-};
-// 删除公会信息
-export const dismiss = query => {
-    return request({
-        url: '/admin/family/manage/dismiss',
-        method: 'post',
-        params: query
-    });
-};
-// 幸运礼物详情导出 
-export const luckyGiftRewardRecordExport = query => {
-    window.location.href = `/admin/luckyGiftRewardRecord/export?${genQueryParam(query)}`;
-    return;
-};
-// 公会信息编辑接口
-export const update = query => {
-    return request({
-        url: '/admin/family/manage/update',
-        method: 'post',
-        params: query
-    });
-};

src/api/system/i18nMessage.js

@@ -1,17 +0,0 @@
-import request from "@/utils/request";
-
-export function getI18nMessageList() {
-    return request({
-        url: '/admin/i18nMessage/list',
-        method: 'get'
-    });
-}
-
-export function saveI18nMessage(data) {
-    return request({
-        url: '/admin/i18nMessage/save',
-        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
-        method: 'post',
-        data: data
-    });
-}

src/views/activity/ActivityAwardAdminView.vue

@@ -529,7 +529,7 @@ export default {
                         $('#carChoose').combobox();
                     })
 
-                    $.get('/admin/nameplate/total/list', {}, function (res) {
+                    $.get('/admin/nameplate//total/list', {}, function (res) {
                         if (res.code == 200) {
                             for (var i = 0; i < res.data.length; i++) {
                                 //                        car.push(res.data[i]);

src/views/chat/PublicChatTopRecordView.vue

@@ -1,156 +0,0 @@
-<template>
-    <section class="content">
-        <div class="box box-danger">
-            <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">
-                        <div class="col-sm-12">
-                            <label for="erbanNo" class="col-sm-1 control-label">ID:</label>
-                            <div class="col-sm-2">
-                                <input type="text" class="form-control" name="erbanNo" id="erbanNo">
-                            </div>
-                            <label for="startTime" class="col-sm-1 control-label">付费日期:</label>
-                            <div class="col-sm-2">
-                                <input type="text" name="startTime" id="timeBegin" class="input-sm form-control" placeholder="起始时间">
-                            </div>
-                            <label for="endTime" class="col-sm-1 control-label">-</label>
-                            <div class="col-sm-2">
-                                <input type="text" name="endTime" id="timeEnd" class="input-sm form-control" placeholder="结束时间">
-                            </div>
-                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
-                            <div class="col-sm-2">
-                                <select name="partitionId" id="partitionId" class="form-control"></select>
-                            </div>
-                        </div>
-                        <div class="col-sm-12">
-                            <button id="btnSearch" class="btn btn-default">
-                                <i class="glyphicon glyphicon-search"></i>查询
-                            </button>
-                        </div>
-                    </div>
-                </section><!-- .content -->
-            </div>
-        </div>
-    </section>
-</template>
-  
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-import { getPublicChatTopRecordPage } from '@/api/chat/publicChatTopRecord';
-import { getPartitionInfoList } from '@/api/partition/partitionInfo';
-import { buildSelectOption } from '@/utils/system-helper';
-
-export default {
-    name: 'PublicChatTopRecordView',
-    data() {
-        return {
-            columns: [
-                { field: 'erbanNo', title: '用户ID', align: 'center', width: '5%' },
-                { field: 'nick', title: '用户昵称', align: 'center', width: '15%' },
-                { field: 'partitionDesc', title: '所属地区', align: 'center', width: '15%' },
-                { field: 'payMoneyNum', title: '付费金额（金币）', align: 'center', width: '15%' },
-                { field: 'createTime', title: '付费日期', align: 'center', width: '15%' },
-            ],
-        };
-    },
-    created() {
-        this.initPartition();
-        this.init();
-    },
-    methods: {
-        init() {
-            this.$nextTick(function () {
-                let $this = this;
-                var picker1 = $("#timeBegin").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    todayBtn: true,
-                    autoclose: true,
-                });
-                var picker2 = $("#timeEnd").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    todayBtn: true,
-                    autoclose: true
-                });
-                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);
-                });
-                $this.initTable();
-                $('#btnSearch').click(function () {
-                    $this.search();
-                });
-            });
-        },
-        initTable() {
-            let $this = this;
-            TableHelper.destroy('#table');
-            $('#table').bootstrapTable({
-                columns: $this.columns,
-                cache: false,
-                striped: true,
-                showRefresh: false,
-                pageSize: 10,
-                pagination: true,
-                pageList: [1, 10, 20, 30, 50],
-                search: false,
-                sidePagination: 'server',
-                queryParamsType: 'undefined',
-                queryParams: function queryParams(params) {
-                    var param = {
-                        erbanNo: $('#erbanNo').val(),
-                        startTime: $('#timeBegin').val(),
-                        endTime: $('#timeEnd').val(),
-                        partitionId: $('#partitionId').val(), 
-                        pageNum: params.pageNumber,
-                        pageSize: params.pageSize,
-                    };
-                    return param;
-                },
-                ajax: function(request) {
-                    getPublicChatTopRecordPage(request.data).then(res => {
-                        let data = res.data;
-                        request.success({
-                            'rows': data.records,
-                            'total': data.total
-                        });
-                    });
-                },
-                toolbar: '#toolbar',
-            });
-        },
-        search() {
-            TableHelper.doRefresh('#table');
-        },
-        initPartition() {
-            getPartitionInfoList().then(res => {
-                let data = res.data;
-                buildSelectOption(
-                    "#partitionId",
-                    null,
-                    [{
-                        value: '',
-                        text: '全部',
-                    }].concat(data.map((v) => {
-                    return {
-                        value: v.id,
-                        text: v.desc,
-                    };
-                    }))
-                );
-            });
-        },
-    },
-}
-</script>
-  
-<style scoped></style>

src/views/firstpage/RecommendResourceAdminView.vue

@@ -34,16 +34,6 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="addForm">
                         <input type="hidden" name="id" id="id" />
-                        <div class="form-group">
-                            <label for="partitionId" class="col-sm-3 control-label">选择地区：</label>
-                            <div class="col-sm-9">
-                                <select name="partitionId" id="partitionId" class="col-sm-3 form-control">
-                                    <option value="1">英语区</option>
-                                    <option value="2">阿拉伯语区</option>
-                                    <option value="4">华语区</option>
-                                </select>
-                            </div>
-                        </div>
                         <!--A策略-->
                         <div class="form-group">
                             <label for="resourceA" class="col-sm-3 control-label">A策略<font color="red">*</font>：</label>
@@ -179,25 +169,6 @@ export default {
                 $('#table').bootstrapTable({
                     columns: [
                         { field: 'id', title: '序号', align: 'center', width: '5%' },
-                        {
-                            field: 'partitionId', 
-                            title: '地区', 
-                            align: 'center', 
-                            width: '10%',
-                            formatter: function (val, row, index) {
-                                let value = '';
-                                if ((val & 1) != 0) {
-                                    value += '英语区<br>';
-                                }
-                                if ((val & 2) != 0) {
-                                    value += '阿拉伯语区<br>';
-                                }
-                                if ((val & 4) != 0) {
-                                    value += '华语区<br>';
-                                }
-                                return value;
-                            }
-                        },
                         {
                             field: 'resourceA',
                             title: 'A',
@@ -245,10 +216,10 @@ export default {
                             width: '10%',
                             formatter: function (val, row, index) {
                                 if (row.isDefault) return '';
-                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' + val + '" data-index="' + index + '">' +
+                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' + val + '>' +
                                     '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
-                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id="' + val +
-                                    '" data-index="' + index + '"><i class="glyphicon glyphicon-remove"></i>删除</button>';
+                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val +
+                                    '><i class="glyphicon glyphicon-remove"></i>删除</button>';
                             }
                         }
                     ],
@@ -324,7 +295,6 @@ export default {
 
                     var beginTime = $("#beginTime").val();
                     var endTime = $("#endTime").val();
-                    var partitionId = $('#partitionId').val();
 
                     if (iconA == null || iconA == '') {
                         $("#tipMsg").text("保存失败，请先上传图片！");
@@ -351,8 +321,7 @@ export default {
                                 contentA: contentA,
                                 contentB: contentB,
                                 beginTime: beginTime,
-                                endTime: endTime,
-                                partitionId: partitionId,
+                                endTime: endTime
                             },
                             dataType: "json",
                             success: function (json) {
@@ -374,18 +343,13 @@ export default {
                 });
 
                 $("#table").on("click", '.opt-edit', function () {
-                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
-                    let partitionId = currentData.partitionId;
                     var seq = $(this).attr("data-id");
                     clearModal();
 
                     $.ajax({
                         type: "get",
                         url: "/admin/home/resource/getResourceByStrategySeq",
-                        data: { 
-                            seq: seq,
-                            partitionId: partitionId,
-                        },
+                        data: { seq: seq },
                         dataType: "json",
                         success: function (res) {
                             var json = res.data;
@@ -419,8 +383,6 @@ export default {
                                 $('#iconUrlB').val(json.iconB);
                                 $('#iconImgUrlB').attr('src', json.iconB);
 
-                                $('#partitionId').val(json.partitionId);
-
                                 // 打开编辑弹窗
                                 $("#roomTagModal").modal('show');
                                 $("#modalLabel").text("编辑房间标签");
@@ -433,8 +395,6 @@ export default {
                 });
 
                 $("#table").on("click", '.opt-remove', function () {
-                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
-                    let partitionId = currentData.partitionId;
                     var seq = $(this).attr("data-id");
                     if (seq == 'undefined') {
                         $("#tipMsg").text("id参数有误");
@@ -445,10 +405,7 @@ export default {
                         $.ajax({
                             type: 'post',
                             url: "/admin/home/resource/deleteByStrategySeq",
-                            data: { 
-                                seq: seq, 
-                                partitionId: partitionId,
-                            },
+                            data: { seq: seq },
                             dataType: "json",
                             success: function (json) {
                                 if (json.code == 200) {

src/views/miniGame/MiniGameForBaiShunView.vue

@@ -1,256 +0,0 @@
-<template>
-    <section class="content">
-        <div class="box box-danger">
-            <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">
-                        <div class="col-sm-12">
-                            <label for="gameId" class="col-sm-1 control-label">游戏:</label>
-                            <div class="col-sm-2">
-                                <select id="gameId" class="input-sm form-control"></select>
-                            </div>
-                            <label for="startTime" class="col-sm-1 control-label">日期:</label>
-                            <div class="col-sm-2">
-                                <input type="text" name="startTime" id="startTime" class="input-sm form-control" placeholder="开始日期">
-                            </div>
-                            <label for="startTime" class="col-sm-1 control-label">-</label>
-                            <div class="col-sm-2">
-                                <input type="text" name="endTime" id="endTime" class="input-sm form-control" placeholder="结束日期">
-                            </div>
-                        </div>
-                        <div class="col-sm-12">
-                            <button id="btnSearch" class="btn btn-default">
-                                <i class="glyphicon glyphicon-search"></i>查询
-                            </button>
-                        </div>
-                    </div>
-                </section><!-- .content -->
-            </div>
-        </div>
-    </section>
-
-    <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content" style="width: 190%; left: 50%; transform: translateX(-50%);">
-                <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>
-                <input type="hidden" name="dateTime" id="detailTime" />
-                <div class="modal-body">
-                    <!-- .content -->
-                    <div id="detailTable"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="btnExport">导出</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-  
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-import { miniGameForBaiShunPage, miniGameForBaiShunDetailPage, miniGameForBaiShunExport } from '@/api/miniGame/miniGameForBaiShun';
-import { getConfigValueByKey } from '@/api/system/sysconf';
-import { buildSelectOption } from '@/utils/system-helper';
-
-export default {
-    name: 'MiniGameForBaiShunView',
-    data() {
-        return {
-            columns: [
-                { field: 'dateTime', title: '日期', align: 'center', width: '15%' },
-                { field: 'userCount', title: '人数', align: 'center', width: '15%' },
-                { field: 'consumeNum', title: '货币消耗', align: 'center', width: '15%' },
-                { field: 'settleNum', title: '结算总量', align: 'center', width: '15%' },
-                { 
-                    field: 'platformNum', 
-                    title: '平台收入', 
-                    align: 'center', 
-                    width: '15%',
-                    formatter: function (val, row, index) {
-                        return row.consumeNum - row.settleNum;
-                    }
-                },
-                {
-                    field: 'dateTime',
-                    title: '操作',
-                    align: 'center',
-                    width: '15%',
-                    valign: 'middle',
-                    formatter: function (val, row, index) {
-                        return '<button class="btn btn-sm btn-default opt-detail" data-index="' + index + '">详情</button>';
-                    }
-                }
-            ],
-            detailColumns: [
-                { field: 'erbanNo', title: '用户平台ID', align: 'center', width: '15%' },
-                { field: 'nick', title: '昵称', align: 'center', width: '15%' },
-                { field: 'consumeNum', title: '货币消耗', align: 'center', width: '15%' },
-                { field: 'settleNum', title: '结算总量', align: 'center', width: '15%' },
-                { 
-                    field: 'platformNum', 
-                    title: '平台收入', 
-                    align: 'center', 
-                    width: '15%',
-                    formatter: function (val, row, index) {
-                        return row.consumeNum - row.settleNum;
-                    }
-                },
-            ],
-        };
-    },
-    created() {
-        this.initGame();
-        this.init();
-    },
-    methods: {
-        init() {
-            this.$nextTick(function () {
-                let $this = this;
-                var picker1 = $("#startTime").datetimepicker({
-                    format: 'yyyy-mm-dd 00:00:00',
-                    todayBtn: true,
-                    autoclose: true,
-                });
-                var picker2 = $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd 00:00:00',
-                    todayBtn: true,
-                    autoclose: true
-                });
-                picker1.on('changeDate', function () {
-                    var date = $('#startTime').datetimepicker('getDate');
-                    picker2.datetimepicker('setStartDate', date);
-                });
-                picker2.on('changeDate', function () {
-                    var date = $('#endTime').datetimepicker('getDate');
-                    picker1.datetimepicker('setEndDate', date);
-                });
-                $this.initTable();
-                $('#table').on('click', '.opt-detail', function () {
-                    $this.detail(this);
-                });
-                $('#btnSearch').click(function () {
-                    $this.search();
-                });
-                $('#btnExport').click(function () {
-                    $this.export();
-                });
-            });
-        },
-        initTable() {
-            let $this = this;
-            TableHelper.destroy('#table');
-            $('#table').bootstrapTable({
-                columns: $this.columns,
-                cache: false,
-                striped: true,
-                showRefresh: false,
-                pageSize: 10,
-                pagination: true,
-                pageList: [1, 10, 20, 30, 50],
-                search: false,
-                sidePagination: 'server',
-                queryParamsType: 'undefined',
-                queryParams: function queryParams(params) {
-                    var param = {
-                        gameId: $('#gameId').val(),
-                        startTime: $('#startTime').val(), 
-                        endTime: $('#endTime').val(), 
-                        pageNum: params.pageNumber,
-                        pageSize: params.pageSize,
-                    };
-                    return param;
-                },
-                ajax: function(request) {
-                    miniGameForBaiShunPage(request.data).then(res => {
-                        let data = res.data;
-                        request.success({
-                            'rows': data.records,
-                            'total': data.total
-                        });
-                    });
-                },
-                toolbar: '#toolbar',
-            });
-        },
-        search() {
-            TableHelper.doRefresh('#table');
-        },
-        detail(obj) {
-            const currentData = $('#table').bootstrapTable('getData')[$(obj).data('index')];
-            let dateTime = currentData.dateTime;
-            $('#modalLabel').html('日期:' + dateTime);
-            $('#detailTime').val(dateTime);
-            TableHelper.destroy('#detailTable');
-            $('#detailTable').bootstrapTable({
-                columns: this.detailColumns,
-                cache: false,
-                striped: true,
-                showRefresh: false,
-                pageSize: 10,
-                pagination: true,
-                pageList: [1, 10, 20, 30, 50],
-                search: false,
-                sidePagination: 'server',
-                queryParamsType: 'undefined',
-                queryParams: function queryParams(params) {
-                    var param = {
-                        gameId: $('#gameId').val(),
-                        dateTime: $('#detailTime').val(), 
-                        pageNum: params.pageNumber,
-                        pageSize: params.pageSize,
-                    };
-                    return param;
-                },
-                ajax: function(request) {
-                    miniGameForBaiShunDetailPage(request.data).then(res => {
-                        let data = res.data;
-                        request.success({
-                            'rows': data.records,
-                            'total': data.total
-                        });
-                    });
-                },
-            });
-            $("#detailModal").modal('show');
-        },
-        export() {
-            miniGameForBaiShunExport({
-                dateTime: $('#detailTime').val(),
-            });
-        },
-        initGame() {
-            getConfigValueByKey({
-                configId: 'BAISHUN_GAME'
-            }).then(res => {
-                if (res.data) {
-                    let data = JSON.parse(res.data.configValue);
-                    buildSelectOption(
-                        "#gameId",
-                        data[0],
-                        data.map((v) => {
-                        return {
-                            value: v.gameId,
-                            text: v.gameName,
-                        };
-                        })
-                    );
-                }
-            });
-        },
-    },
-}
-</script>
-  
-<style scoped></style>

src/views/miniGame/MiniGameForNavView.vue

@@ -1,174 +0,0 @@
-<template>
-    <section class="content">
-        <div class="box box-danger">
-            <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">
-                        <div class="col-sm-12">
-                            <label for="gameMode" class="col-sm-1 control-label">游戏模式:</label>
-                            <div class="col-sm-3">
-                                <select name="gameMode" id="gameMode" class="input-sm form-control">
-                                    <option value="" selected="selected">全部</option>
-                                    <option value="1">经典</option>
-                                    <option value="0">快速</option>
-                                </select>
-                            </div>
-                            <label for="startTime" class="col-sm-1 control-label">日期:</label>
-                            <div class="col-sm-3">
-                                <input type="text" name="startTime" id="startTime" class="input-sm form-control" placeholder="开始日期">
-                            </div>
-                            <label for="startTime" class="col-sm-1 control-label">-</label>
-                            <div class="col-sm-3">
-                                <input type="text" name="endTime" id="endTime" class="input-sm form-control" placeholder="结束日期">
-                            </div>
-                        </div>
-                        <div class="col-sm-12">
-                            <button id="btnSearch" class="btn btn-default">
-                                <i class="glyphicon glyphicon-search"></i>查询
-                            </button>
-                        </div>
-                    </div>
-                </section><!-- .content -->
-            </div>
-        </div>
-    </section>
-
-    <div class="modal fade" id="detailModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content" style="width: 190%; left: 50%; transform: translateX(-50%);">
-                <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>
-                <input type="hidden" name="dateTime" id="detailTime" />
-                <div class="modal-body">
-                    <!-- .content -->
-                    <div id="detailTable"></div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="btnExport">导出</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-  
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-import { miniGameForNavPage } from '@/api/miniGame/miniGameForNav';
-
-export default {
-    name: 'MiniGameForNavView',
-    data() {
-        return {
-            columns: [
-                { field: 'mgId', title: '游戏ID', align: 'center', width: '15%' },
-                { field: 'mgName', title: '游戏名称', align: 'center', width: '15%' },
-                { field: 'dateTime', title: '日期', align: 'center', width: '15%' },
-                { 
-                    field: 'gameMode', 
-                    title: '游戏模式', 
-                    align: 'center', 
-                    width: '15%',
-                    formatter: function (val, row, index) {
-                        let value = '';
-                        if (val == 1) {
-                            value = '经典';
-                        } else if (val == 0) {
-                            value = '快速';
-                        }
-                        return value;
-                    }
-                },
-                { field: 'userCount', title: '游戏人数', align: 'center', width: '15%' },
-                { field: 'ticket', title: '入门费', align: 'center', width: '15%' },
-            ],
-        };
-    },
-    created() {
-        this.init();
-    },
-    methods: {
-        init() {
-            this.$nextTick(function () {
-                let $this = this;
-                var picker1 = $("#startTime").datetimepicker({
-                    format: 'yyyy-mm-dd 00:00:00',
-                    todayBtn: true,
-                    autoclose: true,
-                });
-                var picker2 = $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd 00:00:00',
-                    todayBtn: true,
-                    autoclose: true
-                });
-                picker1.on('changeDate', function () {
-                    var date = $('#startTime').datetimepicker('getDate');
-                    picker2.datetimepicker('setStartDate', date);
-                });
-                picker2.on('changeDate', function () {
-                    var date = $('#endTime').datetimepicker('getDate');
-                    picker1.datetimepicker('setEndDate', date);
-                });
-                $this.initTable();
-                $('#table').on('click', '.opt-detail', function () {
-                    $this.detail(this);
-                });
-                $('#btnSearch').click(function () {
-                    $this.search();
-                });
-            });
-        },
-        initTable() {
-            let $this = this;
-            TableHelper.destroy('#table');
-            $('#table').bootstrapTable({
-                columns: $this.columns,
-                cache: false,
-                striped: true,
-                showRefresh: false,
-                pageSize: 10,
-                pagination: true,
-                pageList: [1, 10, 20, 30, 50],
-                search: false,
-                sidePagination: 'server',
-                queryParamsType: 'undefined',
-                queryParams: function queryParams(params) {
-                    var param = {
-                        gameMode: $('#gameMode').val(),
-                        startTime: $('#startTime').val(), 
-                        endTime: $('#endTime').val(), 
-                        pageNum: params.pageNumber,
-                        pageSize: params.pageSize,
-                    };
-                    return param;
-                },
-                ajax: function(request) {
-                    miniGameForNavPage(request.data).then(res => {
-                        let data = res.data;
-                        request.success({
-                            'rows': data.records,
-                            'total': data.total
-                        });
-                    });
-                },
-                toolbar: '#toolbar',
-            });
-        },
-        search() {
-            TableHelper.doRefresh('#table');
-        },
-    },
-}
-</script>
-  
-<style scoped></style>

src/views/nameplate/NameplateInfoView.vue

@@ -412,12 +412,12 @@ export default {
                                 }
                                 
                                 $('#nameplateType1').attr("disabled", "true");
-                                if (!json.isCustomWord) {
+                                if (json.isCustomWord == 0) {
                                     $('input[name="isCustomWord"]').get(0).checked = true;
-                                    $('#fixedWord-div').addClass("hidden");
+                                    $('#fixedWord-div').removeClass("hidden");
                                 } else {
                                     $('input[name="isCustomWord"]').get(1).checked = true;
-                                    $('#fixedWord-div').removeClass("hidden");
+                                    $('#fixedWord-div').addClass("hidden");
                                     $('#fixedWord').val('');
                                 }
 
@@ -586,7 +586,7 @@ export default {
                 });
                 //是否自定义文案变化
                 $('input[type=radio][name=isCustomWord]').change(function () {
-                    if ($(this).val() == 1) {
+                    if ($(this).val() == 0) {
                         $('#fixedWord-div').removeClass("hidden");
                     } else {
                         $('#fixedWord-div').addClass("hidden");

src/views/nobleman/GuildInfo.vue

@@ -1,382 +0,0 @@
-<template>
-  <div class="box">
-    <!-- 查询 -->
-    <div class="inquire">
-      <span>ID</span>
-      <el-input
-        v-model="inquire.userId"
-        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>
-    <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-    <el-button class="primary" type="primary" @click="addDialog = true"
-      >添加</el-button
-    >
-
-    <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <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.backgroundUrl"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.backgroundUrl]"
-            fit="cover"
-            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 prop="goldIncome" align="center" label="金币总收入" />
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
-      <el-table-column
-        prop="memberNumLimit"
-        align="center"
-        label="成员数量上限"
-      />
-      <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="
-              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
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 新增弹窗 -->
-    <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>
-      </div>
-      <!-- <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >会长昵称</span
-        >
-        <el-input
-          v-model="resource.nick"
-          style="width: 75%"
-          class="input"
-        ></el-input>
-      </div> -->
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="addDialog = false">取消</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-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.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>
-      </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"
-          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.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>
-        </span>
-      </template>
-    </el-dialog>
-    <!-- 二次确认删除弹窗 -->
-    <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>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { pageFamily, create, update, dismiss } from "@/api/nobleman/nobleman";
-// @ts-ignore
-import { dateFormat } from "@/utils/system-helper";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-export default {
-  name: "GuildInfo",
-  data() {
-    return {
-      loading: false,
-      delDialog: false,
-      delDialogData: null,
-      //查询所需条件对象
-      inquire: {
-        userId: "",
-        time: "",
-      },
-      //新增所需对象
-      resource: {
-        id: "",
-        nick: "",
-      },
-      // 表格
-      tableData: [],
-      //   新增弹窗
-      addDialog: false,
-      // 分页
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-      // 编辑弹窗
-      editDialog: false,
-      ediObj: {
-        leaderId: "",
-        leaderNick: "",
-        guildNick: "",
-        guildNumber: "",
-        id: "",
-      },
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 查询接口
-    getData() {
-      this.loading = true;
-      let time = this.inquire.time;
-      let startTime = "";
-      let endTime = "";
-      if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
-      }
-      pageFamily({
-        erbanNo: this.inquire.userId,
-        familyName: this.inquire.nick,
-        startDate: startTime,
-        endDate: endTime,
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-      }).then((res) => {
-        this.total = res.data.total;
-        this.tableData = res.data.rows;
-        this.loading = false;
-      });
-    },
-    // 添加
-    add() {
-      this.addDialog = false;
-      create({
-        erbanNo: this.resource.id,
-      }).then((res) => {
-        this.getData();
-      });
-    },
-    // 编辑按钮
-    ediClick(res) {
-      var obj = res.row;
-      this.ediObj.leaderId = obj.ownerErbanNo;
-      this.ediObj.leaderNick = obj.ownerNick;
-      this.ediObj.guildNick = obj.name;
-      this.ediObj.guildNumber = obj.memberNumLimit;
-      this.ediObj.id = obj.id;
-      this.editDialog = true;
-    },
-    // 二次确认弹窗
-    editDialogClick() {
-      console.log(this.ediObj);
-      update({
-        id: this.ediObj.id,
-        memberNumLimit: this.ediObj.guildNumber,
-      }).then((res) => {
-        if (res.code == 200) {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.getData();
-          this.editDialog = false;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
-    // 解散按钮
-    delClick() {
-      console.log(this.delDialogData.id);
-      var familyId = this.delDialogData.id;
-      dismiss({ familyId }).then((res) => {
-        console.log();
-        if (res.code == 200) {
-          this.getData();
-          ElMessage({
-            showClose: true,
-            message: "解散成功",
-            type: "success",
-          });
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
-    // 分页导航
-    handleSizeChange() {
-      this.getData();
-    },
-    handleCurrentChange() {
-      this.getData();
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-    span {
-      margin-right: 10px;
-    }
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/nobleman/GuildMemberInfo.vue

@@ -1,168 +0,0 @@
-<template>
-  <div class="box">
-    <!-- 查询 -->
-    <div class="inquire">
-      <span>ID</span>
-      <el-input
-        v-model="inquire.userId"
-        placeholder=""
-        class="input"
-      ></el-input>
-    </div>
-    <!-- 工会昵称 -->
-    <div class="inquire">
-      <span>工会名称</span>
-      <el-input v-model="inquire.nick" 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>
-    <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-
-    <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="familyName" align="center" label="公会昵称" />
-      <el-table-column prop="erbanNo" align="center" label="成员ID" />
-      <el-table-column prop="nick" align="center" label="成员昵称" />
-      <el-table-column prop="goldIncome" align="center" label="金币总收入" />
-      <el-table-column prop="diamondRemain" align="center" label="钻石总收入" />
-      <el-table-column prop="micRemainTime" align="center" label="开播时长" />
-      <el-table-column
-        prop="sendGiftUserNum"
-        align="center"
-        label="送礼用户数"
-      />
-      <el-table-column align="center" label="成员状态">
-        <template v-slot="scope">{{
-          scope.row.enable ? "有效" : "无效"
-        }}</template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      class="paginationClass"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-      layout="sizes, prev, pager, next"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-  </div>
-</template>
-<script>
-import { pageFamilyMember } from "@/api/nobleman/nobleman";
-// @ts-ignore
-import { dateFormat } from "@/utils/system-helper";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-export default {
-  name: "GuildMemberInfo",
-  data() {
-    return {
-      loading: false,
-      //查询所需条件对象
-      inquire: {
-        userId: "",
-        nick: "",
-        time: "",
-      },
-      //新增所需对象
-      resource: {
-        id: "",
-        nick: "",
-      },
-      // 表格
-      tableData: [],
-      //   新增弹窗
-      addDialog: false,
-      // 分页
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 查询接口
-    getData() {
-      this.loading = true;
-      let time = this.inquire.time;
-      let startTime = "";
-      let endTime = "";
-      if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
-      }
-      console.log(this.inquire);
-
-      pageFamilyMember({
-        erbanNo: this.inquire.userId,
-        familyName: this.inquire.nick,
-        startDate: startTime,
-        endDate: endTime,
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-      }).then((res) => {
-        this.total = res.data.total;
-        this.tableData = res.data.rows;
-        this.loading = false;
-      });
-    },
-    // 分页导航
-    handleSizeChange() {
-      this.getData();
-    },
-    handleCurrentChange() {
-      this.getData();
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-    span {
-      margin-right: 10px;
-    }
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/nobleman/GuildMove.vue

@@ -1,181 +0,0 @@
-<template>
-  <div class="box">
-    <!-- 查询 -->
-    <div class="inquire">
-      <span>ID</span>
-      <el-input
-        v-model="inquire.userId"
-        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>
-    <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-
-    <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="familyName" align="center" label="家族昵称" />
-      <el-table-column prop="erbanNo" align="center" label="成员ID" />
-      <el-table-column prop="nick" align="center" label="成员昵称" />
-      <el-table-column prop="targetErbanNo" align="center" label="目标成员ID" />
-      <el-table-column prop="targetNick" align="center" label="目标成员昵称" />
-      <el-table-column prop="type" align="center" label="操作类型">
-        <template v-slot="scope">
-          {{
-            scope.row.type == 1
-              ? "申请加入"
-              : scope.row.type == 2
-              ? "申请退出"
-              : scope.row.type == 3
-              ? "邀请加入"
-              : scope.row.type == 4
-              ? "设置管理员"
-              : scope.row.type == 5
-              ? "移除管理员"
-              : "移除成员"
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" align="center" label="操作时间" />
-      <el-table-column prop="updateTime" align="center" label="最后更新时间" />
-      <el-table-column prop="status" align="center" label="状态">
-        <template v-slot="scope">
-          {{
-            scope.row.status == 1
-              ? "未处理"
-              : scope.row.status == 2
-              ? "同意"
-              : scope.row.status == 2
-              ? "拒绝"
-              : "过期"
-          }}
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      class="paginationClass"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-      layout="sizes, prev, pager, next"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-  </div>
-</template>
-<script>
-import { pageOperateRecord } from "@/api/nobleman/nobleman";
-// @ts-ignore
-import { dateFormat } from "@/utils/system-helper";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-export default {
-  name: "GuildMove",
-  data() {
-    return {
-      loading: false,
-      //查询所需条件对象
-      inquire: {
-        userId: "",
-        nick: "",
-        time: "",
-      },
-      //新增所需对象
-      resource: {
-        id: "",
-        nick: "",
-      },
-      // 表格
-      tableData: [],
-      //   新增弹窗
-      addDialog: false,
-      // 分页
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 查询接口
-    getData() {
-      this.loading = true;
-      let time = this.inquire.time;
-      let startTime = "";
-      let endTime = "";
-      if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
-      }
-      pageOperateRecord({
-        erbanNo: this.inquire.userId,
-        startDate: startTime,
-        endDate: endTime,
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-      }).then((res) => {
-        this.total = res.data.total;
-        this.tableData = res.data.rows;
-        this.loading = false;
-      });
-    },
-    // 分页导航
-    handleSizeChange() {
-      this.getData();
-    },
-    handleCurrentChange() {
-      this.getData();
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-    span {
-      margin-right: 10px;
-    }
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/prize/DeviateRangeManageAdminView.vue

@@ -98,6 +98,25 @@ export default {
     methods: {
         initData() {
             $(function () {
+                var main = {
+                    init: function () {
+                        this.eventRegister();
+                        this.getDataFromBack();
+                    },
+
+                    eventRegister: function () {
+                        // 筛选按钮点击事件
+                        $('#searchBtn').on('click', function () {
+                            TableHelper.doRefresh('#table');
+                        });
+                    },
+
+                    getDataFromBack: function () {
+
+                    }
+                };
+                main.init();
+
                 $('#table').bootstrapTable('destroy');
                 $('#table').bootstrapTable({
                     columns: [
@@ -232,11 +251,6 @@ export default {
                     }
                 });
 
-                // 筛选按钮点击事件
-                $('#searchBtn').on('click', function () {
-                    TableHelper.doRefresh('#table');
-                });
-
             });
         }
     },

src/views/record/OfficicalGoldView.vue

@@ -47,9 +47,9 @@
                                         onchange="selectOnchang(this)">
                                         <option value="OFFICAL_DIAMOND">官方赠送金币</option>
                                         <option value="OFFICAL_RADISH">官方赠送水晶</option>
-                                        <option value="ACTIVITY_GOLD">活动奖励钻石</option>
+                                        <option value="ACTIVITY_GOLD">活动奖励金币</option>
                                         <option value="COMPANY_ACCOUNT_DIAMOND">公款充值金币</option>
-                                        <option value="OFFICAL_REDUCE_DIAMONDS">官方金币消除</option>
+                                        <option value="OFFICAL_REDUCE_DIAMONDS">官方钻石消除</option>
                                         <option value="OFFICAL_GOLD">官方赠送钻石</option>
                                         <option value="CLEAR_USER_GOLD">用户钻石清除</option>
                                         <!-- <option value="OFFICAL_RADISH">官方赠送萝卜</option>

src/views/resource/GamePlayView.vue

@@ -107,7 +107,7 @@
                         :value="item.value"></el-option>
                 </el-select>
             </div>
-            <div style="margin-bottom: 25px" v-if="resource.skipType == 1 || resource.skipType == 3">
+            <div style="margin-bottom: 25px" v-if="resource.skipType == 1">
                 <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">资源编码</span>
                 <el-input v-model="resource.code" style="width: 75%" class="input" :placeholder="请输入资源编码"></el-input>
             </div>

src/views/room/GameAdmin.vue

@@ -1,453 +0,0 @@
-<template>
-  <div class="box">
-    <!-- 查询 -->
-    <div class="inquire" style="display: inline-block; margin-right: 20px">
-      <span class="demonstration">地区:</span>
-      <el-select v-model="inquire.partitionFlag" placeholder="请选择">
-        <el-option
-          v-for="item in options"
-          :key="item.partitionFlag"
-          :label="item.label"
-          :value="item.partitionFlag"
-        >
-        </el-option>
-      </el-select>
-    </div>
-
-    <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-
-    <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="mgId" align="center" label="游戏ID" />
-
-      <el-table-column prop="name" align="center" label="游戏名称" />
-
-      <el-table-column prop="partitionFlag" align="center" label="所属地区">
-        <template v-slot="scope">{{
-          scope.row.partitionFlag == 1
-            ? "英语区"
-            : scope.row.partitionFlag == 2
-            ? "阿拉伯语区"
-            : scope.row.partitionFlag == 4
-            ? "华语区"
-            : scope.row.partitionFlag == 3
-            ? "英语区、阿拉伯语区"
-            : scope.row.partitionFlag == 5
-            ? "英语区、华语区"
-            : scope.row.partitionFlag == 6
-            ? "阿拉伯语区、华语区"
-            : scope.row.partitionFlag == 7 || scope.row.partitionFlag == 0
-            ? "英语区、阿拉伯语区、华语区"
-            : "无所属地区"
-        }}</template>
-      </el-table-column>
-
-      <el-table-column prop="isShow" align="center" label="是否展示">
-        <template v-slot="scope">{{
-          scope.row.isShow == 0 ? "否" : scope.row.isShow == 1 ? "是" : "/"
-        }}</template>
-      </el-table-column>
-
-      <!-- <el-table-column prop="roomFlag" align="center" label="展示房间类型">
-        <template v-slot="scope">{{
-          (scope.row.roomFlag & 1) != 0
-            ? "游戏房"
-            : (scope.row.roomFlag & 2) != 0
-            ? "牌照房"
-            : (scope.row.roomFlag & 4) != 0
-            ? "普通房"
-            : "/"
-        }}</template>
-      </el-table-column> -->
-
-      <el-table-column prop="isAuthority" align="center" label="是否限制">
-        <template v-slot="scope">{{
-          scope.row.isAuthority == 0
-            ? "否"
-            : scope.row.isAuthority == 1
-            ? "是"
-            : "/"
-        }}</template>
-      </el-table-column>
-
-      <el-table-column prop="roleFlag" align="center" label="可开启角色">
-        <template v-slot="scope">{{
-          scope.row.roleFlag == 1
-            ? "房主"
-            : scope.row.roleFlag == 2
-            ? "管理员"
-            : scope.row.roleFlag == 3
-            ? "房主、管理员"
-            : "/"
-        }}</template>
-      </el-table-column>
-
-      <el-table-column align="center" label="操作" width="300">
-        <template v-slot="scope">
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            >编辑</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 编辑弹窗 -->
-    <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.gameId"
-          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.gameNick"
-          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-checkbox-group v-model="ediObj.checkList">
-          <el-checkbox label="华语区"></el-checkbox>
-          <el-checkbox label="英语区"></el-checkbox>
-          <el-checkbox label="阿拉伯语区"></el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <!-- 是否展示 -->
-      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >是否展示</span
-        >
-        <el-select v-model="ediObj.value1" placeholder="请选择">
-          <el-option
-            v-for="item in ediObj.options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <!-- 是否限制 -->
-      <div v-show="ediObj.value1" style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >是否限制</span
-        >
-        <el-select v-model="ediObj.value2" placeholder="请选择">
-          <el-option
-            v-for="item in ediObj.options2"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <!-- 可开启角色 -->
-      <div v-show="ediObj.value1" style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >可开启角色</span
-        >
-        <el-checkbox-group v-model="ediObj.checkList2">
-          <el-checkbox label="房主"></el-checkbox>
-          <el-checkbox label="管理员"></el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
-            确认
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
-
-    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px; display: none"
-      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 { mgList, save } from "@/api/gameAdmin/gameAdmin";
-// @ts-ignore
-import { dateFormat } from "@/utils/system-helper";
-// @ts-ignore
-import { ElMessage } from "element-plus";
-export default {
-  name: "GameAdmin",
-  data() {
-    return {
-      loading: false,
-      //查询所需条件对象
-      inquire: {
-        partitionFlag: "",
-        time: "",
-      },
-      //   选择器
-      options: [
-        {
-          partitionFlag: 1,
-          label: "英语区",
-        },
-        {
-          partitionFlag: 2,
-          label: "阿拉伯语区",
-        },
-        {
-          partitionFlag: 4,
-          label: "华语区",
-        },
-        {
-          partitionFlag: "",
-          label: "全部",
-        },
-      ],
-      // 表格
-      tableData: [],
-      //   控制编辑弹窗
-      editDialog: false,
-      editDiaData: {},
-      ediObj: {
-        gameId: "",
-        gameNick: "",
-        checkList: [],
-        value1: 0,
-        options: [
-          {
-            value: 1,
-            label: "是",
-          },
-          {
-            value: 0,
-            label: "否",
-          },
-        ],
-        value2: 0,
-        options2: [
-          {
-            value: 1,
-            label: "是",
-          },
-          {
-            value: 0,
-            label: "否",
-          },
-        ],
-        checkList2: [],
-        partitionFlag: null,
-      },
-      // 分页
-      total: 10, //总页数
-      currentPage: 1, //页码
-      pageSize: 10, //条数
-    };
-  },
-  created() {
-    this.getData();
-  },
-  methods: {
-    // 查询接口
-    getData() {
-      this.loading = true;
-      let time = this.inquire.time;
-      let startTime = "";
-      let endTime = "";
-      if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
-      }
-      console.log(this.inquire);
-      mgList({ partitionFlag: this.inquire.partitionFlag }).then((res) => {
-        if (res.code == 200) {
-          this.tableData = res.data;
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.loading = false;
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-          this.loading = false;
-        }
-      });
-    },
-    // 编辑按钮
-    ediClick(scope) {
-      this.editDialog = true;
-      this.editDiaData = scope.row;
-      var obj = this.editDiaData;
-      this.ediObj.gameId = obj.mgIdStr;
-      this.ediObj.gameNick = JSON.parse(obj.name).zh;
-      this.ediObj.partitionFlag = obj.partitionFlag;
-      this.ediObj.checkList =
-        obj.partitionFlag == 1
-          ? ["英语区"]
-          : obj.partitionFlag == 2
-          ? ["阿拉伯语区"]
-          : obj.partitionFlag == 4
-          ? ["华语区"]
-          : obj.partitionFlag == 3
-          ? ["英语区", "阿拉伯语区"]
-          : obj.partitionFlag == 5
-          ? ["英语区", "华语区"]
-          : obj.partitionFlag == 6
-          ? ["阿拉伯语区", "华语区"]
-          : scope.row.partitionFlag == 7 ||
-            scope.row.partitionFlag == 0 ||
-            scope.row.partitionFlag == ""
-          ? ["英语区", "阿拉伯语区", "华语区"]
-          : [];
-      this.ediObj.value1 = obj.isShow == false ? 0 : 1;
-      this.ediObj.value2 = obj.isAuthority;
-      this.ediObj.checkList2 =
-        obj.roleFlag == 1
-          ? ["房主"]
-          : obj.roleFlag == 2
-          ? ["管理员"]
-          : obj.roleFlag == 3
-          ? ["房主", "管理员"]
-          : [];
-      console.log(obj);
-    },
-    // 确认编辑按钮
-    editDialogClick() {
-      var obj = {
-        mgIdStr: this.ediObj.gameId,
-        name: this.ediObj.gameNick,
-        partitionFlag: this.districtFun(1),
-        isShow: this.ediObj.value1,
-        isAuthority: this.ediObj.value2,
-        roleFlag: this.districtFun(2),
-      };
-      console.log(obj);
-      save(obj).then((res) => {
-        if (res.code == 200) {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "success",
-          });
-          this.editDialog = false;
-          this.getData();
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-      });
-    },
-    // 计算数值
-    districtFun(type) {
-      console.log("ssss", this.ediObj);
-      var num = 0;
-      var district;
-      if (type == 1) {
-        district = {
-          华语区: 4,
-          英语区: 1,
-          阿拉伯语区: 2,
-        };
-        this.ediObj.checkList.forEach((res, i) => {
-          num += district[res];
-        });
-      } else {
-        district = {
-          房主: 1,
-          管理员: 2,
-        };
-        this.ediObj.checkList2.forEach((res, i) => {
-          num += district[res];
-        });
-      }
-      return num;
-    },
-    // 分页导航
-    handleSizeChange() {
-      this.getData();
-    },
-    handleCurrentChange() {
-      this.getData();
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.box {
-  padding-top: 20px;
-  background: #ecf0f5;
-  .inquire {
-    display: inline-block;
-    margin-right: 20px;
-    span {
-      margin-right: 10px;
-    }
-    .input {
-      width: 180px;
-      margin-right: 10px;
-    }
-  }
-  .dialogTableVisibleBut {
-    display: block;
-    margin: 30px 0 0 830px;
-  }
-  .paginationClass {
-    margin: 15px 0 5px 0px;
-  }
-}
-</style>

src/views/room/RoomSearchAdminView.vue

@@ -28,6 +28,7 @@
                                     <option value="0"></option>
                                     <option value="1">牌照房</option>
                                     <option value="2">非牌照房</option>
+                                    <option value="3">新秀房</option>
                                     <option value="4">个播房</option>
                                 </select>
                             </div>
@@ -83,6 +84,7 @@
                         <select id="permitType" name="permitType" class="form-control" data-btn-class="btn-warning">
                             <option value="1">牌照房</option>
                             <option value="2">普通房</option>
+                            <option value="3">新秀房</option>
                             <option value="4">个播房</option>
                         </select>
                         <input type="hidden" name="uid" id="roomTypeUid" />
@@ -372,14 +374,14 @@ export default {
                             width: '5%',
                             formatter: function (val, row, index) {
                                 switch (val) {
-                                    case 3:
-                                        return '普通房间';
+                                    case 1:
+                                        return '竞拍房';
                          
-                                    case 6:
-                                        return '个播房间';
+                                    case 2:
+                                        return '轻聊房';
                               
-                                    case 7:
-                                        return '游戏房间';
+                                    case 3:
+                                        return '轰趴房';
                                
                                 }
                             }
@@ -400,7 +402,7 @@ export default {
                         },
                         {
                             field: 'room.isPermitRoom',
-                            title: '牌照类型',
+                            title: '房间类型',
                             align: 'center',
                             valign: 'middle',
                             formatter: function (val, row, index) {
@@ -410,6 +412,9 @@ export default {
                               
                                     case 2:
                                         return '非牌照房';
+                                   
+                                    case 3:
+                                        return '新秀房';
                                 
                                     case 4:
                                         return '个播房';
@@ -598,27 +603,13 @@ export default {
 
                 $("#room-type-update").on('click', function () {
                     if ($('#roomPermitType').validationEngine('validate')) {
-                        let roomUid = $('#roomTypeUid').val();
-                        let permitType = $('#permitType').val();
-                        let roomType = 3;
-                        //牌照房
-                        if (permitType == 1) {
-                            
-                            // 普通房
-                        } else if (permitType == 2) {
-
-                            // 个播房
-                        } else if (permitType == 4) {
-                            roomType = 6;
-                        }
                         $.ajax({
                             type: 'post',
                             url: '/admin/roomAdmin/resetRoom',
                             dataType: 'json',
                             data: {
-                                uid: roomUid,
-                                roomType: roomType,
-                                permitType: permitType,
+                                uid: $('#roomTypeUid').val(),
+                                permitType: $('#permitType').val(),
                             },
                             success: function (res) {
                                 if (res.code == 200) {
@@ -627,7 +618,7 @@ export default {
                                     $("#tipModal").modal('show');
                                     TableHelper.doRefresh("#table");
                                 } else {
-                                    $("#tipMsg").text("保存失败，错误码：" + res.code + "，错误信息：" + res.message);
+                                    $("#tipMsg").text("保存失败，错误码：" + res.code + "，错误信息：" + res.data);
                                     $("#tipModal").modal('show');
                                 }
                             }

src/views/system/I18nMessageAdminView.vue

@@ -1,176 +0,0 @@
-<template>
-    <section class="content">
-        <div class="box box-danger">
-            <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">
-                        <div class="col-sm-12">
-                            <button id="btnAdd" class="btn btn-default">
-                                <i class="glyphicon glyphicon-plus"></i>增加
-                            </button>
-                        </div>
-                    </div>
-                </section><!-- .content -->
-            </div>
-        </div>
-    </section>
-
-    <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">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="modalLabel">多语言信息</h4>
-                </div>
-                <div class="modal-body">
-                    <form class="form-horizontal">
-                        <div class="form-group">
-                            <label for="key" class="col-sm-3 control-label">KEY:</label>
-                            <div class="col-sm-8">
-                                <input type="text" class="form-control validate[required]" name="key" id="key"
-                                    v-model="i18nMessage.key" />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="zh" class="col-sm-3 control-label">华语:</label>
-                            <div class="col-sm-8">
-                                <input type="text" class="form-control validate[required]" name="zh" id="zh"
-                                    v-model="i18nMessage.zh" />
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="en" class="col-sm-3 control-label">英语:</label>
-                            <div class="col-sm-8">
-                                <input type="text" class="form-control validate[required]" name="en" id="en"
-                                    v-model="i18nMessage.en" />
-                            </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="ar" id="ar"
-                                    v-model="i18nMessage.ar" />
-                            </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>
-import TableHelper from '@/utils/bootstrap-table-helper';
-import { getI18nMessageList, saveI18nMessage } from '@/api/system/i18nMessage';
-
-export default {
-    name: 'I18nMessageAdminView',
-    data() {
-        return {
-            columns: [
-                { field: 'key', title: 'KEY', align: 'center', width: '15%' },
-                { field: 'zh', title: '华语', align: 'center', width: '15%' },
-                { field: 'en', title: '英语', align: 'center', width: '15%' },
-                { field: 'ar', title: '阿语', align: 'center', width: '15%' },
-                {
-                    field: 'key',
-                    title: '操作',
-                    align: 'center',
-                    width: '20%',
-                    formatter: function (val, row, index) {
-                        return '<button class="btn btn-sm btn-success opt-edit" data-id="' + val + '" data-index="' + index + '">编辑</button>';
-                    }
-                }
-            ],
-            i18nMessages: [],
-            i18nMessage: {
-                key: '',
-                zh: '',
-                en: '',
-                ar: '',
-            },
-        };
-    },
-    created() {
-        this.init();
-        this.list();
-    },
-    methods: {
-        init() {
-            this.$nextTick(function () {
-                let $this = this;
-                $this.initTable();
-                $('#btnAdd').click(function () {
-                    $this.add(); 
-                });
-                $('#save').click(function () {
-                    $this.save();
-                });
-                $('#table').on('click', '.opt-edit', function () {
-                    $this.edit(this);
-                });
-            });
-        },
-        initTable() {
-            let $this = this;
-            TableHelper.destroy('#table');
-            $('#table').bootstrapTable({
-                columns: $this.columns,
-                cache: false,
-                striped: true,
-                showRefresh: true,
-                search: true,
-                pageSize: 10,
-                pagination: true,
-                pageList: [1, 10, 20, 30, 50],
-                sidePagination: "client",
-                queryParamsType: "undefined",
-                toolbar: '#toolbar',
-            });
-        },
-        list() {
-            getI18nMessageList().then(res => {
-                this.i18nMessages = res.data;
-                TableHelper.load('#table', this.i18nMessages);
-            });
-        },
-        add() {
-            this.i18nMessage.key = '';
-            this.i18nMessage.zh = '';
-            this.i18nMessage.en = '';
-            this.i18nMessage.ar = '';
-            $('#editModal').modal('show');
-        },
-        edit(obj) {
-            const index = $(obj).data('index');
-            const record = TableHelper.getData('#table')[index];
-            this.i18nMessage.key = record.key;
-            this.i18nMessage.zh = record.zh;
-            this.i18nMessage.en = record.en;
-            this.i18nMessage.ar = record.ar;
-            $('#editModal').modal('show');
-        },
-        save() {
-            let $this = this;
-            saveI18nMessage($this.i18nMessage).then(res => {
-                $('#editModal').modal('hide');
-                $this.list();
-            });
-        },
-    },
-}
-</script>
-  
-<style scoped></style>

src/views/users/ChargeRecordArPartitionStatisticsView.vue

@@ -1,156 +0,0 @@
-<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?partitionId=2"
-                      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>
-              </div>
-
-            </div>
-          </div>
-
-          <!-- .content -->
-          <div id="table"></div>
-        </section>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-
-export default {
-  name: "ChargeRecordArPartitionStatisticsView",
-  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: '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: 2,
-              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/ChargeRecordEnPartitionStatisticsView.vue

@@ -1,156 +0,0 @@
-<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?partitionId=1"
-                      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>
-              </div>
-
-            </div>
-          </div>
-
-          <!-- .content -->
-          <div id="table"></div>
-        </section>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-
-export default {
-  name: "ChargeRecordEnPartitionStatisticsView",
-  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: '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: 1,
-              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/ChargeRecordPartitionStatisticsView.vue

@@ -1,155 +0,0 @@
-<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">
-                    <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: "ChargeRecordPartitionStatisticsView",
-  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: 'partitionName', title: '分区', align: 'center', width: '25%' },
-            { field: 'googleUsd', title: 'google充值美元', align: 'center', width: '25%' },
-            { field: 'payermaxUsd', title: 'payermax充值美元', align: 'center', width: '25%' },
-            { field: 'myCardUsd', title: 'myCard充值美元', align: 'center', width: '25%' },
-            { field: 'iosUsd', title: 'ios充值美元', align: 'center', width: '25%' },
-            { field: 'companyUsd', title: '对公打款美元', align: 'center', width: '25%' },
-            { field: 'totalUsd', title: '总充值美元', align: 'center', width: '25%' },
-          ],
-          cache: false,
-          striped: true,
-          showRefresh: false,
-          pagination: false,
-          search: false,
-          queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
-            var param = {
-              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

@@ -1,156 +0,0 @@
-<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?partitionId=4"
-                      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>
-              </div>
-
-            </div>
-          </div>
-
-          <!-- .content -->
-          <div id="table"></div>
-        </section>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-
-export default {
-  name: "ChargeRecordZhPartitionStatisticsView",
-  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: '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: 4,
-              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/GiftManageView.vue

@@ -345,9 +345,9 @@
                         <div class="form-group">
                             <label for="otherViewType" class="col-sm-2 control-label">其他视图文件类型:</label>
                             <div class="col-sm-10">
-                                <select name="otherViewType" id="otherViewType" data-btn-class="btn-warning" class="form-control">
+                                <select name="otherViewType" id="otherViewType" data-btn-class="btn-warning">
                                     <option value="0">全部</option>
-                                    <option value="1" selected>MP4</option>
+                                    <option value="1">MP4</option>
                                     <option value="2">PAG</option>
                                 </select>
                             </div>
@@ -954,6 +954,7 @@ export default {
                     $("input:radio[name='isLatest']")[0].checked = true;
                     $("input:radio[name='isTimeLimit']")[0].checked = true;
                     $("input:radio[name='roomExclude']")[0].checked = true;
+                    $('#giftType').val('');
                     $("#notifyStaySecond").val('');
                     $("#isSkipRoom").val('');
                     $("#isSendMsg").val('');