修改游戏管理bug

(cherry picked from commit 5f2cb18b6a89696b8285173ed4862629e1b0f73c)

src/api/chat/publicChatTopRecord.js

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

src/api/gameAdmin/gameAdmin.js

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,56 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -10,7 +10,7 @@
                     <div id="toolbar">
                         奖品类别：<select name="prizeType" id="prizeType" class="input-m">
                             <option value="0">--全部--</option>
-                            <option value="1">金币</option>
+                            <option value="1">钻石</option>
                             <option value="2">线上礼物</option>
                             <option value="3">座驾</option>
                             <option value="4">头饰</option>
@@ -45,7 +45,7 @@
 
                             <div class="col-sm-8" style="padding-top:7px;">
                                 <select name="addType" id="addType" data-btn-class="btn btn-warning">
-                                    <option value="1">金币</option>
+                                    <option value="1">钻石</option>
                                     <option value="2">线上礼物</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
@@ -179,7 +179,7 @@ export default {
                             field: 'prizeType', title: '奖品类别', align: 'center', valign: 'middle', width: '20%', formatter: function (val, row, index) {
                                 switch (val) {
                                     case 1:
-                                        return '金币';
+                                        return '钻石';
 
                                     case 2:
                                         return '在线礼物';
@@ -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/activity/ActivityPackAdminView.vue

@@ -655,7 +655,7 @@ export default {
                                 field: 'type', title: '奖品类型', align: 'center', width: '5%', valign: 'middle', formatter: function (val, row, index) {
                                     switch (val) {
                                         case 1:
-                                            return '金币';
+                                            return '钻石';
 
                                         case 2:
                                             return '在线礼物';

src/views/activity/LuckySeaRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />钻石
+                        当前库存 <span name="stock" id="stock" />金币
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>

src/views/anchor/AnchorBillUploadView.vue

@@ -41,8 +41,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>

src/views/anchor/AnchorReleaseGoldView.vue

@@ -65,8 +65,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>
@@ -107,8 +107,8 @@ export default {
                         // {field: 'temp', title: 'id', align: 'center', checkbox: true, width: '5%'},
                         { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
                         { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币数量', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币数量', align: 'center', width: '5%' },
                         {
                             field: 'createTime',
                             title: '创建时间',

src/views/callbattle/ActCallBattleRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />金币
+                        当前库存 <span name="stock" id="stock" />钻石
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>

src/views/car/CarGoodsAdminView.vue

@@ -136,7 +136,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">使用金币购买</label>
+                            <label class="col-sm-3 control-label">使用钻石购买</label>
                             <div class="col-sm-9">
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="0">否</label>
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="1" checked>是</label>
@@ -147,7 +147,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="price" id="price">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -155,7 +155,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="renewPrice" id="renewPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
                         <div class="form-group">
                             <label for="originalPrice" class="col-sm-3 control-label">原价:</label>
@@ -163,7 +163,7 @@
                                 <input type="number" class="form-control" placeholder="没有填0" value="0" name="originalPrice"
                                     id="originalPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -469,7 +469,7 @@ export default {
                         },
                         {
                             field: 'goldSale',
-                            title: '金币购买',
+                            title: '钻石购买',
                             align: 'center',
                             width: '3%',
                             formatter: function (val, row, index) {
@@ -497,9 +497,9 @@ export default {
                                 }
                             }
                         },
-                        { field: 'originalPrice', title: '原价（金币）', align: 'center', width: '5%' },
-                        { field: 'price', title: '购买价格（金币）', align: 'center', width: '5%' },
-                        { field: 'renewPrice', title: '续费价格（金币）', align: 'center', width: '5%' },
+                        { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
+                        { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
+                        { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
                         { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
@@ -1033,7 +1033,7 @@ export default {
                             return;
                         }
                         if (goldSale == 1 && (!price || !renewPrice || !originalPrice)) {
-                            $("#tipMsg").text("请填写完整金币价格");
+                            $("#tipMsg").text("请填写完整钻石价格");
                             $("#tipModal").modal('show');
                             return;
                         } else if (radishSale == 1 && (!radishPrice || !radishRenewPrice || !radishOriginalPrice)) {

src/views/car/CarStatisticsView.vue

@@ -59,7 +59,7 @@ export default {
                         { field: 'createTime', title: '日期', align: 'center', width: '5%' },
                         { field: 'carId', title: '座驾ID', align: 'center', width: '5%' },
                         { field: 'carName', title: '座驾名称', align: 'center', width: '5%' },
-                        { field: 'carPrice', title: '座驾金额(金币)', align: 'center', width: '5%' },
+                        { field: 'carPrice', title: '座驾金额(钻石)', align: 'center', width: '5%' },
                         { field: 'carRadishPrice', title: '座驾金额(萝卜)', align: 'center', width: '5%' },
                         { field: 'carStatus', title: '座驾状态', align: 'center', width: '5%' },
                         { field: 'receivedCarNum', title: '用户收到数量', align: 'center', width: '5%' },

src/views/charge/ChargeRegionView.vue

@@ -372,7 +372,7 @@ export default {
                                 if (row.chargeProds) {
                                     for (let i = 0, len = row.chargeProds.length; i < len; i++) {
                                         var chargeProd = row.chargeProds[i];
-                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账钻石:' + chargeProd.chargeGoldNum + '<br/>';
+                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账金币:' + chargeProd.chargeGoldNum + '<br/>';
                                     }
                                 }
                                 return value;
@@ -549,9 +549,9 @@ export default {
                                 $select.append($option);
                             }
                             $div.append($select);
-                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         } else {
-                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         }
                         $formGroup.append($div);
                         $form.append($formGroup);
@@ -586,9 +586,9 @@ export default {
                             $select.append($option);
                         }
                         $div.append($select);
-                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     } else {
-                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     }
                     $formGroup.append($div);
                     $form.append($formGroup);

src/views/charge/FirstChargeRewardConfigView.vue

@@ -73,7 +73,7 @@
                                     <option value="2">铭牌</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
-                                    <option value="5">额外钻石</option>
+                                    <option value="5">额外金币</option>
                                 </select>
                             </div>
                         </div>
@@ -97,7 +97,7 @@
                             <label for="modal_rewardNum" class="col-sm-3 control-label">奖励个数：</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control validate[required,custom[integer]]" name="rewardNum"
-                                    id="modal_rewardNum" placeholder="礼物、额外钻石输入个数">
+                                    id="modal_rewardNum" placeholder="礼物、额外金币输入个数">
                             </div>
                         </div>
                         <div class="form-group">

src/views/charge/RedeemcodeAdminView.vue

@@ -41,7 +41,7 @@
                                         </div>
                                     </div>
                                     <div class="form-group">
-                                        <label for="amount" class="col-sm-3 control-label">金币大小:</label>
+                                        <label for="amount" class="col-sm-3 control-label">钻石大小:</label>
                                         <div class="col-sm-8">
                                             <input type="text" class="form-control  validate[required]" name="amount"
                                                 id="amount" value=10>
@@ -92,7 +92,7 @@ export default {
                         {
                             field: 'amount', title: '金额', align: 'center', width: '10%',
                             formatter: function (val, row, index) {
-                                return val + "金币";
+                                return val + "钻石";
                             }
                         },
                         {

src/views/chat/PublicChatTopRecordView.vue

@@ -0,0 +1,156 @@
+<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/finance/FinanceStatisticsView.vue

@@ -79,12 +79,12 @@ export default {
                                 }
                             }
                         },
-                        { field: 'goldIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
-                        { field: 'goldDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币余额', align: 'center', width: '5%' },
-                        { field: 'diamondIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
-                        { field: 'diamondDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'goldIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
+                        { field: 'goldDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'diamondIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
+                        { field: 'diamondDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币余额', align: 'center', width: '5%' },
                         { field: 'totalNum', title: '总额', align: 'center', width: '5%' },
                     ],
                     cache: false,

src/views/findlove/FindLovePlatformPrizeDataAdminView.vue

@@ -36,7 +36,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入钻石总数：</span>
+                            <span>用户投入金币总数：</span>
                             <span id="userInputDiamonds"></span>
                         </p>
                         <p>
@@ -193,7 +193,7 @@ export default {
                                 { field: 'date', title: '日期', align: 'center', valign: 'middle', width: '20%' },
                                 { field: 'peopleNum', title: '抽奖人数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                                { field: 'userInputDiamonds', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
+                                { field: 'userInputDiamonds', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'giftOutputDiamonds', title: '平台产出价值数', align: 'center', valign: 'middle', width: '10%' }
                             ],
                             cache: false,

src/views/findlove/FindLovePrizeDrawRecordAdminView.vue

@@ -100,7 +100,7 @@ export default {
                             }
                         },
                         { field: 'level', title: '礼物等级', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'diamonds', title: '钻石单价', align: 'center', valign: 'middle', width: '10%' },
+                        { field: 'diamonds', title: '金币单价', align: 'center', valign: 'middle', width: '10%' },
                         {
                             field: 'poolType', title: '礼物组类型', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                                 switch (row.poolType) {

src/views/firstpage/RecommendResourceAdminView.vue

@@ -34,6 +34,16 @@
                 <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>
@@ -169,6 +179,25 @@ 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',
@@ -216,10 +245,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 + '>' +
+                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' + val + '" data-index="' + index + '">' +
                                     '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
-                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val +
-                                    '><i class="glyphicon glyphicon-remove"></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>';
                             }
                         }
                     ],
@@ -295,6 +324,7 @@ export default {
 
                     var beginTime = $("#beginTime").val();
                     var endTime = $("#endTime").val();
+                    var partitionId = $('#partitionId').val();
 
                     if (iconA == null || iconA == '') {
                         $("#tipMsg").text("保存失败，请先上传图片！");
@@ -321,7 +351,8 @@ export default {
                                 contentA: contentA,
                                 contentB: contentB,
                                 beginTime: beginTime,
-                                endTime: endTime
+                                endTime: endTime,
+                                partitionId: partitionId,
                             },
                             dataType: "json",
                             success: function (json) {
@@ -343,13 +374,18 @@ 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 },
+                        data: { 
+                            seq: seq,
+                            partitionId: partitionId,
+                        },
                         dataType: "json",
                         success: function (res) {
                             var json = res.data;
@@ -383,6 +419,8 @@ export default {
                                 $('#iconUrlB').val(json.iconB);
                                 $('#iconImgUrlB').attr('src', json.iconB);
 
+                                $('#partitionId').val(json.partitionId);
+
                                 // 打开编辑弹窗
                                 $("#roomTagModal").modal('show');
                                 $("#modalLabel").text("编辑房间标签");
@@ -395,6 +433,8 @@ 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参数有误");
@@ -405,7 +445,10 @@ export default {
                         $.ajax({
                             type: 'post',
                             url: "/admin/home/resource/deleteByStrategySeq",
-                            data: { seq: seq },
+                            data: { 
+                                seq: seq, 
+                                partitionId: partitionId,
+                            },
                             dataType: "json",
                             success: function (json) {
                                 if (json.code == 200) {

src/views/flowteam/FlowTeamStatisticView.vue

@@ -358,7 +358,7 @@ export default {
                             { field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'chargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'sendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'giveCount', title: '累计收到转赠次数', align: 'center', width: '5%', },
                             { field: 'giveMoney', title: '累计收到转赠金额', align: 'center', width: '5%', },
                             { field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
@@ -507,7 +507,7 @@ export default {
                             { field: 'tchargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'tchargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'tchargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'tsendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'tsendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'tgiveCount', title: '累计收到转赠次数', align: 'center', width: '5%', },
                             { field: 'tgiveMoney', title: '累计收到转赠金额', align: 'center', width: '5%', },
                             { field: 'tarpu', title: 'Arpu', align: 'center', width: '5%', },
@@ -666,7 +666,7 @@ export default {
                             { field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'chargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'sendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
                             {
                                 field: 'memberId',
@@ -726,9 +726,9 @@ export default {
                             { field: 'signUpTime', title: '新增日期', align: 'center', width: '5%' },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%' },
                             { field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%' },
-                            { field: 'totalSendGiftMoney', title: '送礼钻石数', align: 'center', width: '5%' },
-                            { field: 'totalBackbagSendGiftMoney', title: '送礼背包钻石数', align: 'center', width: '5%' },
-                            { field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包钻石数', align: 'center', width: '5%' },
+                            { field: 'totalSendGiftMoney', title: '送礼金币数', align: 'center', width: '5%' },
+                            { field: 'totalBackbagSendGiftMoney', title: '送礼背包金币数', align: 'center', width: '5%' },
+                            { field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金币数', align: 'center', width: '5%' },
                         ],
                         undefinedText: 0,
                         cache: false,

src/views/hall/ClanGoldFlowAdminView.vue

@@ -128,14 +128,14 @@ export default {
                             { field: 'clanElderErbanNo', title: '会长平台号', align: 'center', width: '5%' },
                             { field: 'clanElderNick', title: '会长昵称', align: 'center', width: '5%' },
                             { field: 'hallCount', title: '房间数', align: 'center', width: '10%' },
-                            { field: 'giftDiamonds', title: '公会收礼钻石数', align: 'center', width: '10%' },
-                            { field: 'hallDiamonds', title: '签约房钻石数', align: 'center', width: '10%' },
-                            { field: 'clanDiamonds', title: '非签约房钻石数', align: 'center', width: '10%' },
-                            { field: 'otherDiamonds', title: '其他钻石数', align: 'center', width: '10%' },
-                            { field: 'earnGolds', title: '公会收益金币数', align: 'center', width: '10%' },
-                            { field: 'receiveGolds', title: '成员收益金币数', align: 'center', width: '10%' },
-                            { field: 'exchangeGolds', title: '兑换金币数', align: 'center', width: '10%' },
-                            { field: 'remainGolds', title: '可结算金币数', align: 'center', width: '10%' },
+                            { field: 'giftDiamonds', title: '公会收礼金币数', align: 'center', width: '10%' },
+                            { field: 'hallDiamonds', title: '签约房金币数', align: 'center', width: '10%' },
+                            { field: 'clanDiamonds', title: '非签约房金币数', align: 'center', width: '10%' },
+                            { field: 'otherDiamonds', title: '其他金币数', align: 'center', width: '10%' },
+                            { field: 'earnGolds', title: '公会收益钻石数', align: 'center', width: '10%' },
+                            { field: 'receiveGolds', title: '成员收益钻石数', align: 'center', width: '10%' },
+                            { field: 'exchangeGolds', title: '兑换钻石数', align: 'center', width: '10%' },
+                            { field: 'remainGolds', title: '可结算钻石数', align: 'center', width: '10%' },
                             {
                                 field: 'tmp',
                                 title: '操作',

src/views/headwear/HeadwearAdminView.vue

@@ -127,7 +127,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">使用金币购买</label>
+                            <label class="col-sm-3 control-label">使用钻石购买</label>
                             <div class="col-sm-9">
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="0">否</label>
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="1" checked>是</label>
@@ -138,7 +138,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="price" id="price">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -146,7 +146,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="renewPrice" id="renewPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
                         <div class="form-group">
                             <label for="originalPrice" class="col-sm-3 control-label">原价:</label>
@@ -154,7 +154,7 @@
                                 <input type="number" class="form-control" placeholder="没有填0" value="0" name="originalPrice"
                                     id="originalPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -396,7 +396,7 @@ export default {
                         },
                         {
                             field: 'goldSale',
-                            title: '金币购买',
+                            title: '钻石购买',
                             align: 'center',
                             width: '3%',
                             formatter: function (val, row, index) {
@@ -424,9 +424,9 @@ export default {
                                 }
                             }
                         },
-                        { field: 'originalPrice', title: '原价（金币）', align: 'center', width: '5%' },
-                        { field: 'price', title: '购买价格（金币）', align: 'center', width: '5%' },
-                        { field: 'renewPrice', title: '续费价格（金币）', align: 'center', width: '5%' },
+                        { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
+                        { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
+                        { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
                         { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
@@ -717,7 +717,7 @@ export default {
                         return;
                     }
                     if (goldSale == 1 && (!price || !renewPrice || !originalPrice)) {
-                        $("#tipMsg").text("请填写完整金币价格");
+                        $("#tipMsg").text("请填写完整钻石价格");
                         $("#tipModal").modal('show');
                         return;
                     } else if (radishSale == 1 && (!radishPrice || !radishRenewPrice || !radishOriginalPrice)) {

src/views/headwear/HeadwearStatisticsView.vue

@@ -62,7 +62,7 @@ export default {
                         { field: 'createTime', title: '日期', align: 'center', width: '5%' },
                         { field: 'headwearId', title: '头饰ID', align: 'center', width: '5%' },
                         { field: 'headwearName', title: '头饰名称', align: 'center', width: '5%' },
-                        { field: 'headwearPrice', title: '价格(金币)', align: 'center', width: '5%' },
+                        { field: 'headwearPrice', title: '价格(钻石)', align: 'center', width: '5%' },
                         { field: 'headwearRadishPrice', title: '价格(萝卜)', align: 'center', width: '5%' },
                         { field: 'headwearStatus', title: '头饰状态', align: 'center', width: '5%' },
                         { field: 'receivedHeadwearNum', title: '用户收到数量', align: 'center', width: '5%' },

src/views/linearlypool/PlatformPrizeDataAdminDayView.vue

@@ -29,7 +29,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入金币总数：</span>
+                            <span>用户投入钻石总数：</span>
                             <span id="userPay"></span>
                         </p>
                         <p>
@@ -41,11 +41,11 @@
                             <span id="actualNum"></span>
                         </p>
                         <p>
-                            <span>用户获得礼物中金币数：</span>
+                            <span>用户获得礼物中钻石数：</span>
                             <span id="giftNum"></span>
                         </p>
                         <p>
-                            <span>用户获得非礼物总金币数：</span>
+                            <span>用户获得非礼物总钻石数：</span>
                             <span id="notGiftNum"></span>
                         </p>
                         <p>
@@ -214,11 +214,11 @@ export default {
                                 }
                             },
                             { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'userTotalPay', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalGiftActualValue', title: '用户获得礼物金币数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
                             // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
                             //     var key = row.createTime;

src/views/linearlypool/PlatformPrizeDataAdminView.vue

@@ -29,7 +29,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入金币总数：</span>
+                            <span>用户投入钻石总数：</span>
                             <span id="userPay"></span>
                         </p>
                         <p>
@@ -41,11 +41,11 @@
                             <span id="actualNum"></span>
                         </p>
                         <p>
-                            <span>用户获得礼物中金币数：</span>
+                            <span>用户获得礼物中钻石数：</span>
                             <span id="giftNum"></span>
                         </p>
                         <p>
-                            <span>用户获得非礼物总金币数：</span>
+                            <span>用户获得非礼物总钻石数：</span>
                             <span id="notGiftNum"></span>
                         </p>
                         <p>
@@ -214,11 +214,11 @@ export default {
                                 }
                             },
                             { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'userTotalPay', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalGiftActualValue', title: '用户获得礼物金币数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
                             // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
                             //     var key = row.createTime;

src/views/linearlypool/PoolItemAdminView.vue

@@ -652,7 +652,7 @@ export default {
                                 $prizeType = '谢谢参与';
                                 break;
                             case '1':
-                                $prizeType = '金币';
+                                $prizeType = '钻石';
                                 break;
                             case '2':
                                 $prizeType = '礼物';

src/views/lucky/LuckyGiftRangeView.vue

@@ -50,7 +50,7 @@
       <el-table-column prop="rewardName" align="center" label="奖品名称" />
       <el-table-column prop="rewardType" align="center" label="奖品分类">
         <template v-slot="scope">
-          {{ scope.row.rewardType == 1 ? "钻石" : "礼物" }}
+          {{ scope.row.rewardType == 1 ? "金币" : "礼物" }}
         </template>
       </el-table-column>
       <el-table-column prop="stockNum" align="center" label="库存" />
@@ -138,15 +138,15 @@
       </div>
 
       <div
-        v-show="dialog.value1 == 1 || dialog.value1 == '钻石' ? true : false"
+        v-show="dialog.value1 == 1 || dialog.value1 == '金币' ? true : false"
         class="inquire"
         style="display: flex; margin-bottom: 20px"
       >
-        <span class="demonstration">奖励钻石数</span>
+        <span class="demonstration">奖励金币数</span>
         <el-input
           style="width: 220px; display: inline-block"
           v-model="dialog.diamond"
-          placeholder="请输入钻石数"
+          placeholder="请输入金币数"
           class="input"
         ></el-input>
       </div>
@@ -242,7 +242,7 @@ export default {
         gifts: [
           {
             value: "1",
-            label: "钻石",
+            label: "金币",
           },
           {
             value: "2",
@@ -394,7 +394,7 @@ export default {
     },
     //编辑
     edi(val) {
-      this.dialog.value1 = val.rewardType == 1 ? "钻石" : "礼物";
+      this.dialog.value1 = val.rewardType == 1 ? "金币" : "礼物";
       this.dialog.gitChance = val.rewardRate;
       this.dialog.showChance = val.showRate;
       this.dialog.inventory = val.stockNum;
@@ -437,7 +437,7 @@ export default {
       if (this.dialogBool) {
         if (this.dialog.value1 == 1) {
           obj = {
-            rewardType: this.dialog.value1 == "钻石" || this.dialog.value1 == 1 ? 1 : 2,
+            rewardType: this.dialog.value1 == "金币" || this.dialog.value1 == 1 ? 1 : 2,
             rewardValue: this.dialog.diamond,
             rewardRate: this.dialog.gitChance,
             showRate: this.dialog.showChance,
@@ -447,7 +447,7 @@ export default {
           };
         } else {
           obj = {
-            rewardType: this.dialog.value1 == "钻石" || this.dialog.value1 == 1 ? 1 : 2,
+            rewardType: this.dialog.value1 == "金币" || this.dialog.value1 == 1 ? 1 : 2,
             rewardValue: this.dialog.gifts2[this.dialog.value2].giftId,
             rewardRate: this.dialog.gitChance,
             showRate: this.dialog.showChance,
@@ -462,9 +462,9 @@ export default {
         this.dialog.diamond = "";
         this.dialog.value2 = 0;
       } else {
-        if (this.dialog.value1 == 1 || this.dialog.value1 == "钻石") {
+        if (this.dialog.value1 == 1 || this.dialog.value1 == "金币") {
           obj = {
-            rewardType: this.dialog.value1 == "钻石" ? 1 : 2,
+            rewardType: this.dialog.value1 == "金币" ? 1 : 2,
             rewardValue: this.dialog.diamond,
             rewardRate: this.dialog.gitChance,
             showRate: this.dialog.showChance,
@@ -475,7 +475,7 @@ export default {
           };
         } else {
           obj = {
-            rewardType: this.dialog.value1 == "钻石" ? 1 : 2,
+            rewardType: this.dialog.value1 == "金币" ? 1 : 2,
             rewardValue: this.dialog.gifts2[this.dialog.value2].giftId,
             rewardRate: this.dialog.gitChance,
             showRate: this.dialog.showChance,

src/views/luckybag/LuckyBagStatsView.vue

@@ -49,13 +49,13 @@
                             <span class="num"></span>
                         </div>
                         <div class="col-sm-6">
-                            <span>用户投入钻石总数：</span>
+                            <span>用户投入金币总数：</span>
                             <span class="inputValue"></span>
                         </div>
                     </div>
                     <div class="summary col-sm-12">
                         <div class="col-sm-6">
-                            <span>平台支出钻石总数：</span>
+                            <span>平台支出金币总数：</span>
                             <span class="outputValue"></span>
                         </div>
                         <div class="col-sm-6">
@@ -107,8 +107,8 @@ export default {
                         { field: 'nick', title: '昵称', align: 'center', width: '5%' },
                         { field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle' },
                         { field: 'num', title: '福袋购买数量', align: 'center', width: '5%' },
-                        { field: 'inputValue', title: '用户投入钻石数', align: 'center', width: '5%' },
-                        { field: 'outputValue', title: '平台支出钻石数', align: 'center', width: '5%' },
+                        { field: 'inputValue', title: '用户投入金币数', align: 'center', width: '5%' },
+                        { field: 'outputValue', title: '平台支出金币数', align: 'center', width: '5%' },
                         {
                             field: 'ratio', title: '偏差比率', align: 'center', width: '5%',
                             formatter: function (val, row, index) {

src/views/match/HpjyGameManageView.vue

@@ -87,7 +87,7 @@
                                 ：</label>
                             <div class="col-sm-9">
                                 <input type="text" class="form-control validate[required]" name="quotaPrice" id="quotaPrice"
-                                    placeholder="报名需要支付的钻石数">
+                                    placeholder="报名需要支付的金币数">
                             </div>
                         </div>
                         <div class="form-group">

src/views/miniGame/MiniGameForBaiShunView.vue

@@ -0,0 +1,256 @@
+<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

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

src/views/newLuckyBag/LuckyBagLinearPoolView.vue

@@ -732,8 +732,12 @@ export default {
                                 var options = [];
                                 for (var i = 0, len = data.length; i < len; i++) {
                                     var item = data[i];
-                                    options.push('<option value="' + item.giftId + '">' + item.giftName + '</option>')
-                                    luckyBagMap[item.giftId] = item
+                                    let giftName = item.giftName;
+                                    if (giftName && giftName.startsWith('{') && giftName.endsWith('}')) {
+                                        item.giftName = JSON.parse(giftName).zh;
+                                    }
+                                    options.push('<option value="' + item.giftId + '">' + item.giftName + '</option>');
+                                    luckyBagMap[item.giftId] = item;
                                 }
                                 $("#qLuckyBagId").html(options.join(' '));    //填充到select标签中
                             }

src/views/newLuckyBag/NewLuckyBagDeviateRangeView.vue

@@ -112,7 +112,7 @@ export default {
                                 if (giftName.startsWith('{') && giftName.endsWith('}')) {
                                     giftName = JSON.parse(giftName).zh;
                                 }
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftId + '-' + giftName + '-' + res.data[i].goldPrice + '金币</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftId + '-' + giftName + '-' + res.data[i].goldPrice + '钻石</option>';
                             }
                             $('#luckyBag').html(str);
                             //初始化table
@@ -195,7 +195,7 @@ export default {
                     selectGiftName = $("#luckyBag").find("option:selected").text();
                     console.info("selectGiftName: ", selectGiftName)
                     console.info("selectGiftId: ", selectGiftId)
-                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '金币</option>';
+                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '钻石</option>';
                     $('#giftId').html(str);
                     // 打开编辑弹窗
                     $('#deviateRangeId').val('');
@@ -235,7 +235,7 @@ export default {
                     $("#deviateLowerLimit").val(data.lowerLimit);
                     $("#deviateUpperLimit").val(data.upperLimit);
                     $("#creator").val(data.creator);
-                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '金币</option>';
+                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '钻石</option>';
                     $('#giftId').html(str);
                     // 打开编辑弹窗
                     $("#deviateRangeModal").modal('show');

src/views/newLuckyBag/NewLuckyBagDeviateView.vue

@@ -175,7 +175,7 @@ export default {
                                 if (giftName.startsWith('{') && giftName.endsWith('}')) {
                                     giftName = JSON.parse(giftName).zh;
                                 }
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftId + '-' + giftName + '-' + res.data[i].goldPrice + '金币</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftId + '-' + giftName + '-' + res.data[i].goldPrice + '钻石</option>';
                             }
                             $('#luckyBag').html(str);
                             $('#luckyBagId').html(str);
@@ -311,7 +311,7 @@ export default {
                     selectGiftName = $("#luckyBag").find("option:selected").text();
                     console.info("selectGiftName: ", selectGiftName)
                     console.info("selectGiftId: ", selectGiftId)
-                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '金币</option>';
+                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '钻石</option>';
                     // $('#luckyBagId').html(str);
                     $('#luckyBagId').html(str);
                     selectRangeName = $("#deviateRange").find("option:selected").text()
@@ -335,7 +335,7 @@ export default {
                     selectGiftName = $("#luckyBag").find("option:selected").text();
                     console.info("selectGiftName: ", selectGiftName)
                     console.info("selectGiftId: ", selectGiftId)
-                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '金币</option>';
+                    const str = '<option value="' + selectGiftId + '">' + selectGiftName + '钻石</option>';
                     $('#luckyBagId').html(str);
                     selectRangeName = $("#deviateRange").find("option:selected").text()
                     selectRangeId = $("#deviateRange").find("option:selected").val()

src/views/noble/NobleAdminView.vue

@@ -92,7 +92,7 @@
                                     <option value="2">续费</option>
                                     <option value="3">体验</option>
                                 </select>
-                                <span class="tips">开通会打公帐而且会返金币</span>
+                                <span class="tips">开通会打公帐而且会返钻石</span>
                             </div>
                         </div>
                         <div class="form-group toggle-group">
@@ -124,9 +124,9 @@
 import TableHelper from '@/utils/bootstrap-table-helper';
 
 var tipsArr = [
-    '开通会打公帐而且会返金币',
-    '续费会打公帐而且会返金币',
-    '体验不会打公帐也不会返还金币'
+    '开通会打公帐而且会返钻石',
+    '续费会打公帐而且会返钻石',
+    '体验不会打公帐也不会返还钻石'
 ];
 export default {
     name: "NobleAdminView",
@@ -222,7 +222,7 @@ export default {
                                 }
                             },
                             { field: 'nobleName', title: '贵族名称', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'goldNum', title: '金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'goldNum', title: '钻石数', align: 'center', valign: 'middle', width: '10%' },
                             {
                                 field: 'nobleDays', title: '贵族选择时间', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                                     if (val) {
@@ -234,7 +234,7 @@ export default {
                                 field: 'payType', title: '支付类型', align: 'center', valign: 'middle', formatter: function (val, row, index) {
                                     switch (val) {
                                         case 1:
-                                            return '金币开通';
+                                            return '钻石开通';
                                     
                                         case 2:
                                             return '用户付款开通';

src/views/nobleman/GuildInfo.vue

@@ -0,0 +1,382 @@
+<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

@@ -0,0 +1,168 @@
+<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

@@ -0,0 +1,181 @@
+<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,25 +98,6 @@ 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: [
@@ -251,6 +232,11 @@ export default {
                     }
                 });
 
+                // 筛选按钮点击事件
+                $('#searchBtn').on('click', function () {
+                    TableHelper.doRefresh('#table');
+                });
+
             });
         }
     },

src/views/prize/PrizeAdminView.vue

@@ -54,7 +54,7 @@
                         <div class="col-sm-8" style="margin-left: -20px;">
                             <select name="addType" id="addType" data-btn-class="btn btn-warning"
                                 style="border-radius: 2px; width: 100px; height: 30px;">
-                                <option value="budGold">金币</option>
+                                <option value="budGold">钻石</option>
                                 <option value="onlineGift">线上礼物</option>
                                 <option value="dress">装扮</option>
                                 <option value="entityGift">实体奖品</option>
@@ -174,7 +174,7 @@
                                     class="form-control validate[required]" placeholder="">
                             </div>
 
-                            <div class="col-sm-3" id="attention" style="color:lightgray;">平台价值和实际价值都指金币价值</div>
+                            <div class="col-sm-3" id="attention" style="color:lightgray;">平台价值和实际价值都指钻石价值</div>
                         </div>
 
                         <!-- 实际价值 -->
@@ -280,9 +280,13 @@ export default {
                         $.get('/admin/headwear/total/list', {}, function (res) {
                             if (res.code == 200) {
                                 for (var i = 0; i < res.data.length; i++) {
-                                    dress.push(res.data[i]);
-
-                                    var str = '<option value="' + dress[i].headwearId + '">' + dress[i].name + '</option>';
+                                    let item = res.data[i];
+                                    let name = item.name;
+                                    if (name && name.startsWith('{') && name.endsWith('}')) {
+                                        item.name = JSON.parse(name).zh;
+                                    }
+                                    dress.push(item);
+                                    var str = '<option value="' + item.headwearId + '">' + item.name + '</option>';
 
                                     $('.headwearContent').append(str);
                                 }
@@ -297,7 +301,12 @@ export default {
                                 var data = res.data;
                                 console.log(data);
                                 for (var key in data) {
-                                    var str = '<option value="' + data[key].giftId + '">' + data[key].giftName + '</option>';
+                                    let item = data[key];
+                                    let giftName = item.giftName;
+                                    if (giftName && giftName.startsWith('{') && giftName.endsWith('}')) {
+                                        item.giftName = JSON.parse(giftName).zh;
+                                    }
+                                    var str = '<option value="' + item.giftId + '">' + item.giftName + '</option>';
                                     $('#awardChoose').append(str);
                                 }
                             } else {
@@ -315,9 +324,14 @@ export default {
                         $.get('/admin/car/goods/total/list', {}, function (res) {
                             if (res.code == 200) {
                                 for (var i = 0; i < res.data.length; i++) {
-                                    car.push(res.data[i]);
+                                    let item = res.data[i];
+                                    let name = item.name;
+                                    if (name && name.startsWith('{') && name.endsWith('}')) {
+                                        item.name = JSON.parse(name).zh;
+                                    }
+                                    car.push(item);
 
-                                    var str = '<option value="' + car[i].id + '">' + car[i].name + '</option>';
+                                    var str = '<option value="' + item.id + '">' + item.name + '</option>';
                                     $('.carContent').append(str);
                                 }
                             }
@@ -357,7 +371,7 @@ export default {
                             field: 'prizeType', title: '奖品分类', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                                 switch (val) {
                                     case 1:
-                                        return '<p>金币</p>';
+                                        return '<p>钻石</p>';
 
 
                                     case 2:
@@ -418,7 +432,7 @@ export default {
                     queryParamsType: 'undefined',
                     queryParams: function queryParams(params) {
                         var giftKey = {
-                            '金币': 1,
+                            '钻石': 1,
                             '在线礼物': 2,
                             '座驾': 3,
                             '头饰': 4,

src/views/prize/PrizeDataAdminNewView.vue

@@ -64,7 +64,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入金币总数：</span>
+                            <span>用户投入钻石总数：</span>
                             <span id="userPay"></span>
                         </p>
                         <p>
@@ -76,11 +76,11 @@
                             <span id="actualNum"></span>
                         </p>
                         <p>
-                            <span>用户获得礼物中金币数：</span>
+                            <span>用户获得礼物中钻石数：</span>
                             <span id="giftNum"></span>
                         </p>
                         <p>
-                            <span>用户获得非礼物总金币数：</span>
+                            <span>用户获得非礼物总钻石数：</span>
                             <span id="notGiftNum"></span>
                         </p>
                         <p>
@@ -255,11 +255,11 @@ export default {
                                 }
                             },
                             { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'userTotalPay', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalGiftActualValue', title: '用户获得礼物金币数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
                             // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
                             //     var key = row.createTime;

src/views/prize/PrizeDataAdminView.vue

@@ -64,7 +64,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入金币总数：</span>
+                            <span>用户投入钻石总数：</span>
                             <span id="userPay"></span>
                         </p>
                         <p>
@@ -76,11 +76,11 @@
                             <span id="actualNum"></span>
                         </p>
                         <p>
-                            <span>用户获得礼物中金币数：</span>
+                            <span>用户获得礼物中钻石数：</span>
                             <span id="giftNum"></span>
                         </p>
                         <p>
-                            <span>用户获得非礼物总金币数：</span>
+                            <span>用户获得非礼物总钻石数：</span>
                             <span id="notGiftNum"></span>
                         </p>
                         <p>
@@ -255,11 +255,11 @@ export default {
                                 }
                             },
                             { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'userTotalPay', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'userTotalPay', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalPlatformValue', title: '总平台价值', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalActualValue', title: '总实际价值', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalGiftActualValue', title: '用户获得礼物金币数', align: 'center', valign: 'middle', width: '10%' },
-                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物金币数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalGiftActualValue', title: '用户获得礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
+                            { field: 'totalNotGiftActualValue', title: '用户获得非礼物钻石数', align: 'center', valign: 'middle', width: '10%' },
                             { field: 'totalRealGiftActualValue', title: '用户获得实物', align: 'center', valign: 'middle', width: '10%' },
                             // {field: '', title: '操作', align: 'center', valign: 'middle', width: '10%',formatter: function(val,row,index) {
                             //     var key = row.createTime;

src/views/prize/PrizeManageAdminView.vue

@@ -47,7 +47,7 @@
               <span class="col-sm-3">许愿池类型</span>
               <span class="col-sm-3">奖品种类数</span>
               <span class="col-sm-3">奖品个数</span>
-              <span class="col-sm-3">总期望值(金币)</span>
+              <span class="col-sm-3">总期望值(钻石)</span>
             </p>
 
             <p class="col-sm-12">
@@ -381,7 +381,7 @@ export default {
                     return '谢谢参与';
 
                   case 1:
-                    return '金币';
+                    return '钻石';
 
                   case 2:
                     return '在线礼物';
@@ -555,7 +555,7 @@ export default {
                 $prizeType = '谢谢参与';
                 break;
               case '1':
-                $prizeType = '金币';
+                $prizeType = '钻石';
                 break;
               case '2':
                 $prizeType = '礼物';

src/views/recharge/RechargeDiamondGiveHistoryView.vue

@@ -84,7 +84,7 @@ export default {
                         { field: 'giveDate', title: '日期', align: 'center', width: '5%' },
                         { field: 'rechargeNum', title: '有转赠的代充人数', align: 'center', width: '5%' },
                         { field: 'giveNum', title: '接受代充转赠的人数', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '转出钻石数', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '转出金币数', align: 'center', width: '5%' },
                         {
                             field: 'handle',
                             title: '详情',

src/views/recharge/RechargeUserView.vue

@@ -177,7 +177,7 @@ export default {
                                 return value;
                             }
                         },
-                        { field: 'outDiamondNum', title: '最近30天转出钻石', align: 'center', width: '5%' },
+                        { field: 'outDiamondNum', title: '最近30天转出金币', align: 'center', width: '5%' },
                         {
                             field: 'id',
                             title: '操作',

src/views/recharge/TransferIdentitySet.vue

@@ -39,7 +39,7 @@
       <el-table-column align="center" prop="erbanNo" label="piko号"> </el-table-column>
       <el-table-column align="center" prop="nick" label="昵称"> </el-table-column>
       <el-table-column align="center" prop="hallName" label="所属公会"> </el-table-column>
-      <el-table-column align="center" prop="diamonds" label="当前账户钻石余额">
+      <el-table-column align="center" prop="diamonds" label="当前账户金币余额">
       </el-table-column>
       <el-table-column align="center" prop="createTime" label="权限生效时间">
       </el-table-column>
@@ -222,7 +222,7 @@ export default {
           { piko号: "erbanNo" },
           { 昵称: "nick" },
           { 所属公会: "hallName" },
-          { 当前钻石账户余额: "diamonds" },
+          { 当前金币账户余额: "diamonds" },
           { 权限生效时间: "createTime" },
           { 操作人: "operator" },
         ];

src/views/record/OfficialGoldBusTypeView.vue

@@ -16,9 +16,9 @@
                         <div class="col-sm-3">
                             <select id="queryActivityType" name="activityType" class="form-control">
                                 <option value="">全部</option>
-                                <option value="12">官方赠送金币</option>
-                                <option value="17">活动奖励金币</option>
-                                <option value="20">公款充值金币</option>
+                                <option value="12">官方赠送钻石</option>
+                                <option value="17">活动奖励钻石</option>
+                                <option value="20">公款充值钻石</option>
                                 <option value="51">官方钻石消除</option>
                             </select>
                         </div>
@@ -52,7 +52,7 @@
                     <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>
+                    <h4 class="modal-title" id="modalLabel">钻石赠送类型配置</h4>
                 </div>
                 <div class="modal-body">
                     <form class="form-horizontal" id="addForm">
@@ -61,9 +61,9 @@
                             <label for="activityType" class="col-sm-2 control-label">类型:</label>
                             <div class="col-sm-8 control-label">
                                 <select name="activityType" id="activityType" class="form-control validate[required]">
-                                    <option value="12">官方赠送金币</option>
-                                    <option value="17">活动奖励金币</option>
-                                    <option value="20">公款充值金币</option>
+                                    <option value="12">官方赠送钻石</option>
+                                    <option value="17">活动奖励钻石</option>
+                                    <option value="20">公款充值钻石</option>
                                     <option value="51">官方钻石消除</option>
                                 </select>
                             </div>
@@ -126,9 +126,9 @@ export default {
                         {
                             field: 'activityType', title: '活动类型', align: 'center', valign: 'middle', width: '10%',
                             formatter: function (val, row, index) {
-                                if (val == 12) { return "官方赠送金币" }
-                                if (val == 17) { return "活动奖励金币" }
-                                if (val == 20) { return "公款充值金币" }
+                                if (val == 12) { return "官方赠送钻石" }
+                                if (val == 17) { return "活动奖励钻石" }
+                                if (val == 20) { return "公款充值钻石" }
                                 if (val == 51) { return "官方钻石消除" }
                                 return val;
                             }

src/views/record/OfficialRadishView.vue

@@ -44,7 +44,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <div style="color:red;">（每个用户赠送次数不能大于3，并且被赠送用户的金币余额不能大于250）</div>
+                                <div style="color:red;">（每个用户赠送次数不能大于3，并且被赠送用户的钻石余额不能大于250）</div>
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-2 control-label"></label>
@@ -66,14 +66,14 @@
                     <th style="width: 50px">头像</th>
                     <th style="width:200px;">平台号</th>
                     <th style="width:300px;">昵称</th>
-                    <th>金币</th>
+                    <th>钻石</th>
                 </tr></thead>
                 <tbody id="tbody">
                 </tbody>-->
                 </table>
             </div>
         </div>
-        <!--查看金币赠送记录-->
+        <!--查看钻石赠送记录-->
     </section>
     <!-- .content -->
 </template>
@@ -184,7 +184,7 @@ function initUserInfoTable() {
             },
             { field: 'erbanNo', title: '平台号', align: 'center', width: '5%', valign: 'middle' },
             { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' },
-            { field: 'goldNum', title: '金币', align: 'center', width: '5%', valign: 'middle' },
+            { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' },
             { field: 'radishNum', title: '萝卜', align: 'center', width: '5%', valign: 'middle' },
         ],
         cache: false,

src/views/record/OfficicalGoldRecordView.vue

@@ -23,8 +23,8 @@
                                         <select name="type" id="type" class="col-sm-2 form-control"
                                             data-btn-class="btn-warning">
                                             <option value="" selected="selected">全部</option>
-                                            <option value="62">官方赠送金币</option>
-                                            <option value="12">官方赠送钻石</option>
+                                            <option value="62">官方赠送钻石</option>
+                                            <option value="12">官方赠送金币</option>
                                             <option value="6">官方赠送水晶</option>
                                         </select>
                                     </div>

src/views/record/OfficicalGoldView.vue

@@ -45,13 +45,13 @@
                                 <div class="col-sm-10">
                                     <select name="type" id="type" class="form-control" ata-btn-class="btn-warning"
                                         onchange="selectOnchang(this)">
-                                        <option value="OFFICAL_DIAMOND">官方赠送钻石</option>
+                                        <option value="OFFICAL_DIAMOND">官方赠送金币</option>
                                         <option value="OFFICAL_RADISH">官方赠送水晶</option>
                                         <option value="ACTIVITY_GOLD">活动奖励钻石</option>
-                                        <option value="COMPANY_ACCOUNT_DIAMOND">公款充值钻石</option>
-                                        <option value="OFFICAL_REDUCE_DIAMONDS">官方钻石消除</option>
-                                        <option value="OFFICAL_GOLD">官方赠送金币</option>
-                                        <option value="CLEAR_USER_GOLD">用户金币清除</option>
+                                        <option value="COMPANY_ACCOUNT_DIAMOND">公款充值金币</option>
+                                        <option value="OFFICAL_REDUCE_DIAMONDS">官方金币消除</option>
+                                        <option value="OFFICAL_GOLD">官方赠送钻石</option>
+                                        <option value="CLEAR_USER_GOLD">用户钻石清除</option>
                                         <!-- <option value="OFFICAL_RADISH">官方赠送萝卜</option>
                                        <option value="ACTIVITY_RADISH">活动奖励萝卜</option> -->
                                     </select>
@@ -85,14 +85,14 @@
                     <th style="width: 50px">头像</th>
                     <th style="width:200px;">耳伴号</th>
                     <th style="width:300px;">昵称</th>
-                    <th>钻石</th>
+                    <th>金币</th>
                 </tr></thead>
                 <tbody id="tbody">
                 </tbody>-->
                 </table>
             </div>
         </div>
-        <!--查看钻石赠送记录-->
+        <!--查看金币赠送记录-->
     </section>
     <!-- .content -->
 </template>
@@ -212,7 +212,7 @@ export default {
                             return;
                         }
                         if (actualGold != parseInt(actualAmount * 1000)) {
-                            $("#tipMsg").text("赠送钻石与充值金额兑换比例不正确！");
+                            $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
                             $("#tipModal").modal('show');
                             return;
                         }
@@ -302,12 +302,12 @@ export default {
                         var maxGold = parseInt(actualAmount * 1200);
                         var actualGold = parseInt(num);
                         if (actualGold < minGold || actualGold > maxGold) {
-                            $("#tipMsg").text("赠送钻石与充值金额兑换比例不正确！");
+                            $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
                             $("#tipModal").modal('show');
                             return;
                         }
                         if (actualGold != parseInt(actualAmount * 1000)) {
-                            $("#tipMsg").text("赠送钻石与充值金额兑换比例不正确！");
+                            $("#tipMsg").text("赠送金币与充值金额兑换比例不正确！");
                             $("#tipModal").modal('show');
                             return;
                         }
@@ -371,9 +371,9 @@ function initUserInfoTable() {
             },
             { field: 'erbanNo', title: '耳伴号', align: 'center', width: '5%', valign: 'middle' },
             { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' },
-            { field: 'goldNum', title: '金币', align: 'center', width: '5%', valign: 'middle' },
+            { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' },
             { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' },
-            { field: 'diamondsNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' }
+            { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' }
         ],
         cache: false,
         striped: true,

src/views/record/OfficicalKeyView.vue

@@ -64,14 +64,14 @@
                     <th style="width: 50px">头像</th>
                     <th style="width:200px;">平台号</th>
                     <th style="width:300px;">昵称</th>
-                    <th>金币</th>
+                    <th>钻石</th>
                 </tr></thead>
                 <tbody id="tbody">
                 </tbody>-->
                 </table>
             </div>
         </div>
-        <!--查看金币赠送记录-->
+        <!--查看钻石赠送记录-->
     </section>
     <!-- .content -->
 </template>

src/views/redenvelope/RedEnvelopeView.vue

@@ -125,11 +125,11 @@ export default {
                                 return redEnvelopeStatusMap[val]
                             }
                         },
-                        { field: 'originalAmount', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'originalAmount', title: '金币数量', align: 'center', width: '5%' },
                         { field: 'commissionAmount', title: '手续费', align: 'center', width: '5%' },
-                        { field: 'getAmount', title: '领取钻石', align: 'center', width: '5%' },
+                        { field: 'getAmount', title: '领取金币', align: 'center', width: '5%' },
                         { field: 'getNumDesc', title: '领取数量', align: 'center', width: '5%' },
-                        { field: 'backAmount', title: '退还钻石', align: 'center', width: '5%' },
+                        { field: 'backAmount', title: '退还金币', align: 'center', width: '5%' },
                         { field: 'roomTitle', title: '房间标题', align: 'center', width: '10%' },
                         { field: 'roomErbanNo', title: '房间平台号', align: 'center', width: '5%' },
                         {

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">
+            <div style="margin-bottom: 25px" v-if="resource.skipType == 1 || resource.skipType == 3">
                 <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

@@ -0,0 +1,453 @@
+<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/HomePermitView.vue

@@ -84,15 +84,15 @@ export default {
                         dataType: "json",
                         success: function (json) {
                             if (json.code == 200) {
-                                $("#tipMsg").text("赠送金币成功");
+                                $("#tipMsg").text("赠送钻石成功");
                                 $("#tipModal").modal('show');
                             } else {
-                                $("#tipMsg").text("赠送金币出错，errorCode: " + json.code);
+                                $("#tipMsg").text("赠送钻石出错，errorCode: " + json.code);
                                 $("#tipModal").modal('show');
                             }
                         },
                         error: function (json) {
-                            $("#tipMsg").text("赠送金币出错，网络出错");
+                            $("#tipMsg").text("赠送钻石出错，网络出错");
                             $("#tipModal").modal('show');
                         }
                     });

src/views/room/HomeRecommView.vue

@@ -149,15 +149,15 @@ export default {
                         dataType: "json",
                         success: function (json) {
                             if (json.code == 200) {
-                                $("#tipMsg").text("赠送金币成功");
+                                $("#tipMsg").text("赠送钻石成功");
                                 $("#tipModal").modal('show');
                             } else {
-                                $("#tipMsg").text("赠送金币出错，errorCode: " + json.code);
+                                $("#tipMsg").text("赠送钻石出错，errorCode: " + json.code);
                                 $("#tipModal").modal('show');
                             }
                         },
                         error: function (json) {
-                            $("#tipMsg").text("赠送金币出错，网络出错");
+                            $("#tipMsg").text("赠送钻石出错，网络出错");
                             $("#tipModal").modal('show');
                         }
                     });

src/views/room/RoomSearchAdminView.vue

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

src/views/room/RoomSerialView.vue

@@ -83,11 +83,11 @@
               <span id="roomTitle"></span>
             </div>
             <div class="col-sm-6">
-              <span>收礼总钻石：</span>
+              <span>收礼总金币：</span>
               <span id="totalDiamonds"></span>
             </div>
             <div class="col-sm-6">
-              <span>房间抽成钻石数：</span>
+              <span>房间抽成金币数：</span>
               <span id="cutDiamonds"></span>
             </div>
           </div>
@@ -262,10 +262,10 @@ export default {
               { field: "num", title: "序号", align: "center", width: "5%" },
               { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
               { field: "nick", title: "昵称", align: "center", width: "5%" },
-              { field: "amount", title: "收礼总钻石", align: "center", width: "5%" },
+              { field: "amount", title: "收礼总金币", align: "center", width: "5%" },
               {
                 field: "cutDiamonds",
-                title: "房间抽成钻石",
+                title: "房间抽成金币",
                 align: "center",
                 width: "5%",
               },

src/views/seekelfin/SeekElfinUserRecordAdminView.vue

@@ -16,7 +16,7 @@
                     <button type="button" class="btn btn-primary" id="btnExport">导出</button>
                 </div>
                 <div class="col-sm-12">
-                    当前库存 <span name="stock" id="stock" />钻石
+                    当前库存 <span name="stock" id="stock" />金币
                     <button id="editStock" class="btn btn-default">编辑库存</button>
                 </div>
             </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>
@@ -96,7 +96,7 @@ export default {
                         { field: 'nick', title: '昵称', align: 'center', width: '5%' },
                         { field: 'prodId', title: '档位', align: 'center', width: '5%' },
                         { field: 'selectNoNum', title: '购买个数', align: 'center', width: '5%' },
-                        { field: 'costGoldNum', title: '花费总钻石数', align: 'center', width: '5%' },
+                        { field: 'costGoldNum', title: '花费总金币数', align: 'center', width: '5%' },
                         { field: 'receiveGoldNum', title: '产出平台价值', align: 'center', width: '5%' },
                         { field: 'createTime', title: '时间', align: 'center', width: '5%' }
                     ],

src/views/sign/DrawCountWhiteAdminView.vue

@@ -25,7 +25,7 @@
                             <input type="text" name="min_sign" class="form-control" id="maxShare" placeholder="请输入最大值">
                         </div>
 
-                        <label for="erbanNo" class="col-sm-1 control-label">金币充值总额:</label>
+                        <label for="erbanNo" class="col-sm-1 control-label">钻石充值总额:</label>
                         <div class="col-sm-2">
                             <input type="text" name="min_sign" class="form-control" id="minGold" placeholder="请输入最小值">--
                             <input type="text" name="min_sign" class="form-control" id="maxGold" placeholder="请输入最大值">
@@ -62,10 +62,10 @@ export default {
                         { field: 'erbanNo', title: '用户ID', align: 'center', width: '5%', valign: 'middle' },
                         { field: 'nick', title: '用户昵称', align: 'center', width: '15%', valign: 'middle' },
                         { field: 'drawNum', title: '参与瓜分次数', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'drawGoldNum', title: '瓜分金币总额', align: 'center', valign: 'middle', width: '10%' },
+                        { field: 'drawGoldNum', title: '瓜分钻石总额', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'signNum', title: '签到总天数', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'shareNum', title: '签到分享总次数', align: 'center', width: '5%', valign: 'middle' },
-                        { field: 'chargeNum', title: '金币充值总额', align: 'center', valign: 'middle', width: '10%' },
+                        { field: 'chargeNum', title: '钻石充值总额', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'whiteNum', title: '历史白名单次数', align: 'center', width: '5%', valign: 'middle' },
                         {
                             field: 'whiteStatus', title: '白名单状态', align: 'center', width: '15%', valign: 'middle',

src/views/sign/GoldPrizeAdminView.vue

@@ -94,7 +94,7 @@
                             <label for="goldNum" class="col-sm-3 control-label">奖品:</label>
                             <div class="col-sm-8 control-label">
                                 <input type="text" class="form-control validate[custom[integer]]"
-                                    style="float: left;width: 90%;" name="goldNum" id="goldNum" placeholder="请输入金币数量">金币
+                                    style="float: left;width: 90%;" name="goldNum" id="goldNum" placeholder="请输入钻石数量">钻石
                             </div>
                         </div>
 
@@ -180,7 +180,7 @@ export default {
                         {
                             field: 'goldNum', title: '奖品', align: 'center', width: '5%', valign: 'middle',
                             formatter: function (val, row, index) {
-                                return val + "金币";
+                                return val + "钻石";
 
                             }
                         },

src/views/sign/PrizeGoldPoolAdminView.vue

@@ -17,9 +17,9 @@
                                 type="button" goldType="2" title="实际奖池默认金额">编辑</button></span>
                     </div>
                     <div class="col-sm-2 width30">
-                        <span>展示奖池累计金币值：</span>
+                        <span>展示奖池累计钻石值：</span>
                         <span><span class="dayShowGoldNum">0</span><button class="btn btn-primary editGoldNum marginLeft20"
-                                type="button" goldType="3" title="展示奖池累计金币值">编辑</button></span>
+                                type="button" goldType="3" title="展示奖池累计钻石值">编辑</button></span>
                     </div>
                 </div>
 
@@ -51,7 +51,7 @@
                         <span class="typeNum" whiteNum="0" ordinaryNum="0">0</span>
                     </div>
                     <div class="col-sm-2">
-                        <span>总期望值(金币)：</span>
+                        <span>总期望值(钻石)：</span>
                         <span class="dayDisplayGoldNum" whiteNum="0" ordinaryNum="0" ratioValue="0"
                             whiteRatioValue="0">0</span>
                     </div>
@@ -226,7 +226,7 @@ export default {
                         {
                             field: 'goldNum', title: '奖品', align: 'center', width: '5%', valign: 'middle',
                             formatter: function (val, row, index) {
-                                return val + "金币";
+                                return val + "钻石";
 
                             }
                         },
@@ -365,7 +365,7 @@ export default {
                                 }
                                 $opt.attr('value', res.data[i].id);
                                 $opt.attr("class", res.data[i].level)
-                                $opt.html(res.data[i].goldNum + "金币");
+                                $opt.html(res.data[i].goldNum + "钻石");
                             }
                             if (j == 0) {
                                 $('#goldPrize').val("");

src/views/statistic/UserDetailAdminView.vue

@@ -55,6 +55,14 @@
                         </div>
 
                     </div>
+                    <div class="col-sm-12">
+                        <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">
@@ -76,6 +84,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "UserDetailAdminView",
@@ -84,6 +94,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -155,6 +166,7 @@ export default {
                                 phone: $('#phone').val(),
                                 startDate: $('#startDate').val(),
                                 endDate: $('#endDate').val(),
+                                partitionId: $('#partitionId').val(),
                             };
                             return param;
                         },
@@ -169,6 +181,7 @@ export default {
                         },
                         columns: [
                             { field: 'uid', title: 'uid', align: 'center', valign: 'middle' },
+                            { field: 'partitionDesc', title: '地区', align: 'center', valign: '15%' },
                             { field: 'erbanNo', title: '平台号', align: 'center', valign: '10%' },
                             { field: 'nick', title: '昵称', align: 'center', valign: '15%' },
                             {
@@ -229,7 +242,25 @@ export default {
 
 
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部'
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
 
 };

src/views/system/I18nMessageAdminView.vue

@@ -0,0 +1,176 @@
+<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/BillRecordAdminView.vue

@@ -92,7 +92,7 @@ export default {
                     { field: 'roomErbanNo', title: '房主平台号', align: 'center', valign: 'middle', width: '10%' },
                     { field: 'giftName', title: '礼物名称', align: 'center', valign: 'middle', width: '5%' },
                     { field: 'giftNum', title: '礼物数量', align: 'center', valign: 'middle', width: '5%' },
-                    { field: 'amount', title: '钻石/水晶/金币', align: 'center', valign: 'middle', width: '5%' },
+                    { field: 'amount', title: '金币/水晶/钻石', align: 'center', valign: 'middle', width: '5%' },
                     { field: 'country', title: '国家/地区', align: 'center', valign: 'middle', width: '5%' },
                     { field: 'localCurrencyCode', title: '本地货币数', align: 'center', valign: 'middle', width: '5%' },
                     { field: 'localAmount', title: '货币数', align: 'center', valign: 'middle', width: '5%' },

src/views/users/ChargeRecordArPartitionStatisticsView.vue

@@ -0,0 +1,156 @@
+<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/ChargeRecordCountryStatisticsView.vue

@@ -83,10 +83,10 @@ export default {
                 $('#table').bootstrapTable({
                     columns: [
                         { field: 'country', title: '国家/地区', align: 'center', width: '25%' },
-                        { field: 'googleGold', title: 'google充值钻石', align: 'center', width: '25%' },
-                        { field: 'payermaxGold', title: 'payermax充值钻石', align: 'center', width: '25%' },
-                        { field: 'iosGold', title: 'ios充值钻石', align: 'center', width: '25%' },
-                        { field: 'totalGold', title: '总充值钻石', align: 'center', width: '25%' },
+                        { field: 'googleGold', title: 'google充值金币', align: 'center', width: '25%' },
+                        { field: 'payermaxGold', title: 'payermax充值金币', align: 'center', width: '25%' },
+                        { field: 'iosGold', title: 'ios充值金币', align: 'center', width: '25%' },
+                        { field: 'totalGold', title: '总充值金币', align: 'center', width: '25%' },
                     ],
                     cache: false,
                     striped: true,

src/views/users/ChargeRecordEnPartitionStatisticsView.vue

@@ -0,0 +1,156 @@
+<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/ChargeRecordManualAdminView.vue

@@ -106,7 +106,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="modal_total_gold" class="col-sm-3 control-label">钻石数<font color="red">*</font>
+                            <label for="modal_total_gold" class="col-sm-3 control-label">金币数<font color="red">*</font>
                                 ：</label>
                             <div class="col-sm-9">
                                 <input type="text" class="form-control" name="totalGold" id="modal_total_gold"
@@ -190,7 +190,7 @@ export default {
                     { field: 'country', title: '地区', align: 'center', valign: 'middle' },
                     { field: 'localCurrencyCode', title: '本地货币代码', align: 'center', valign: 'middle' },
                     { field: 'localAmount', title: '本地金额', align: 'center', valign: 'middle' },
-                    { field: 'totalGold', title: '钻石', align: 'center', valign: 'middle' },
+                    { field: 'totalGold', title: '金币', align: 'center', valign: 'middle' },
                     {
                         field: 'chargeStatus', title: '充值状态', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, inde) {
                             switch (val) {

src/views/users/ChargeRecordPartitionStatisticsView.vue

@@ -0,0 +1,155 @@
+<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/ChargeRecordPersonalAdminView.vue

@@ -107,7 +107,7 @@ export default {
                     { field: 'country', title: '地区', align: 'center', valign: 'middle' },
                     { field: 'localCurrencyCode', title: '本地货币代码', align: 'center', valign: 'middle' },
                     { field: 'localAmount', title: '本地金额', align: 'center', valign: 'middle' },
-                    { field: 'totalGold', title: '钻石', align: 'center', valign: 'middle' },
+                    { field: 'totalGold', title: '金币', align: 'center', valign: 'middle' },
                     {
                         field: 'chargeStatus', title: '充值状态', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, inde) {
                             switch (val) {

src/views/users/ChargeRecordZhPartitionStatisticsView.vue

@@ -0,0 +1,156 @@
+<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/DiamondGiveHistoryView.vue

@@ -22,7 +22,7 @@
                             <div class="col-sm-1">
                                 <select id="type" name="type" class="form-control">
                                     <option value="">请选择...</option>
-                                    <option value="0">钻石</option>
+                                    <option value="0">金币</option>
                                     <option value="1">背包礼物</option>
                                 </select>
                             </div>
@@ -47,7 +47,7 @@
                     </div>
                     <div class="summary col-sm-12">
                         <div class="col-sm-3">
-                            <span>总转增钻石：</span>
+                            <span>总转增金币：</span>
                             <span class="totalDiamondNum"></span>
                         </div>
                     </div>
@@ -94,7 +94,7 @@
 
                     <div class="summary col-sm-12">
                         <div class="col-sm-3">
-                            <span>总转增钻石：</span>
+                            <span>总转增金币：</span>
                             <span class="totalSendDiamondNum"></span>
                         </div>
                     </div>
@@ -162,14 +162,14 @@ export default {
                             field: 'type', title: '转赠类型', align: 'center', width: '5%',
                             formatter: function (val, row, index) {
                                 if (row.type == 0) {
-                                    return '钻石'
+                                    return '金币'
                                 } else {
                                     return '背包礼物';
                                 }
                             }
                         },
                         {
-                            field: 'diamondNum', title: '转赠钻石数', align: 'center', width: '5%',
+                            field: 'diamondNum', title: '转赠金币数', align: 'center', width: '5%',
                             formatter: function (val, row, index) {
                                 if (row.type == 1) {
                                     return '-'
@@ -226,7 +226,7 @@ export default {
 
                         // {field: 'erbanNo', title: '平台ID', align: 'center', width: '5%'},
                         // {field: 'nick', title: '昵称', align: 'center', width: '5%'},
-                        // {field: 'totalSendDiamondNum', title: '总转增钻石数', align: 'center', width: '5%'},
+                        // {field: 'totalSendDiamondNum', title: '总转增金币数', align: 'center', width: '5%'},
                         /*{
                             field: 'uid',
                             title: '操作',
@@ -323,7 +323,7 @@ export default {
                         columns: [
                             { field: 'erbanNo', title: '转赠人ID', align: 'center', width: '5%' },
                             { field: 'nick', title: '转赠人昵称', align: 'center', width: '5%' },
-                            { field: 'diamondNum', title: '转赠钻石数', align: 'center', width: '5%' },
+                            { field: 'diamondNum', title: '转赠金币数', align: 'center', width: '5%' },
                             {
                                 field: 'rate', title: '手续费', align: 'center', width: '5%',
                                 formatter: function (val, row, index) {

src/views/users/GiftAdminView.vue

@@ -30,8 +30,8 @@
                             <thead>
                                 <tr>
                                     <th>受赠人uid</th>
-                                    <th>受赠人金币</th>
                                     <th>受赠人钻石</th>
+                                    <th>受赠人金币</th>
                                     <th>操作时间</th>
                                 </tr>
                             </thead>

src/views/users/GiftManageView.vue

@@ -43,7 +43,7 @@
                             <div class="col-sm-2">
                                 <select name="consume_type" id="consume_type" class="form-control">
                                     <option value="" selected="selected">全部</option>
-                                    <option value="1">金币礼物</option>
+                                    <option value="1">钻石礼物</option>
                                     <option value="2">萝卜礼物</option>
                                     <option value="3">免费礼物</option>
                                 </select>
@@ -159,7 +159,7 @@
                             <div class="col-sm-10">
                                 <select class="form-control" name="consumeType" id="consumeType"
                                     data-btn-class="btn-warning" onchange="selectConsumeChange(this)">
-                                    <option value="1" selected="selected">金币礼物</option>
+                                    <option value="1" selected="selected">钻石礼物</option>
                                     <option value="2">萝卜礼物</option>
                                     <option value="3">免费礼物</option>
                                 </select>
@@ -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">
+                                <select name="otherViewType" id="otherViewType" data-btn-class="btn-warning" class="form-control">
                                     <option value="0">全部</option>
-                                    <option value="1">MP4</option>
+                                    <option value="1" selected>MP4</option>
                                     <option value="2">PAG</option>
                                 </select>
                             </div>
@@ -686,7 +686,7 @@ export default {
                             width: '10%',
                             formatter: function (val, row, index) {
                                 if (val == 1) {
-                                    return '金币礼物';
+                                    return '钻石礼物';
                                 } else if (val == 2) {
                                     return '萝卜礼物';
                                 } else if (val == 3) {
@@ -935,7 +935,7 @@ export default {
                     $("#giftId").val('');
 
                     $('#viewUploadFile').val('');
-                    $('#viewUrl').attr('');
+                    $('#viewUrl').val('');
                     $('#viewFile').attr("src", '');
                     $("#viewFileInfo").html('');
 
@@ -948,13 +948,12 @@ export default {
                     ComboboxHelper.setDef("#nobleId", '0');
                     $('#giftType').val(2);
                     $("input:radio[name='giftStatus']")[1].checked = true;
-                    $("input:radio[name='hasEffect']")[1].checked = true;
+                    $("input:radio[name='hasEffect']")[0].checked = true;
                     $("input:radio[name='hasVggPic']")[1].checked = true;
                     $("input:radio[name='hasSvga']")[0].checked = true;
-                    $("input:radio[name='isLatest']")[1].checked = true;
-                    $("input:radio[name='isTimeLimit']")[1].checked = true;
+                    $("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('');
@@ -1190,7 +1189,7 @@ export default {
                     $("#giftId").val('');
 
                     $('#viewUploadFile').val('');
-                    $('#viewUrl').attr('');
+                    $('#viewUrl').val('');
                     $('#viewFile').attr("src", '');
                     $("#viewFileInfo").html('');
 

src/views/users/GiftStatisticsView.vue

@@ -65,7 +65,7 @@ export default {
                         { field: 'createTime', title: '日期', align: 'center', width: '5%' },
                         { field: 'giftId', title: '礼物ID', align: 'center', width: '5%' },
                         { field: 'giftName', title: '礼物名称', align: 'center', width: '5%' },
-                        { field: 'totalNum', title: '礼物金额(金币)', align: 'center', width: '5%' },
+                        { field: 'totalNum', title: '礼物金额(钻石)', align: 'center', width: '5%' },
                         { field: 'giftStatus', title: '礼物状态', align: 'center', width: '5%' },
                         { field: 'receivedGiftNum', title: '收到礼物数量', align: 'center', width: '5%' },
                     ],

src/views/users/InviteCodeStatsView.vue

@@ -64,7 +64,7 @@ export default {
                         { field: 'inviteChargeTime', title: '邀请充值次数', align: 'center', width: '5%' },
                         { field: 'inviteChargeAmount', title: '邀请充值金额(美元)', align: 'center', valign: 'middle', width: '5%' },
                         { field: 'inviteGiftSendUserAmount', title: '邀请送礼人数', align: 'center', valign: 'middle', width: '5%' },
-                        { field: 'inviteGiftSendAmount', title: '邀请送礼钻石数', align: 'center', valign: 'middle', width: '5%' },
+                        { field: 'inviteGiftSendAmount', title: '邀请送礼金币数', align: 'center', valign: 'middle', width: '5%' },
                     ],
                     undefinedText: "",
                     cache: false,

src/views/users/MagicManageView.vue

@@ -88,7 +88,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="magicPrice" class="col-sm-2 control-label">价格(金币)</label>
+                            <label for="magicPrice" class="col-sm-2 control-label">价格(钻石)</label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control validate[required]" name="magicPrice"
                                     id="magicPrice">

src/views/users/UserBackpackAdminView.vue

@@ -58,7 +58,7 @@ export default {
                                     return '特殊礼物';
                                 }
                                 if (val == 1) {
-                                    return '金币礼物';
+                                    return '钻石礼物';
                                 } else if (val == 2) {
                                     return '萝卜礼物';
                                 } else {

src/views/users/UserCancelView.vue

@@ -175,8 +175,8 @@ export default {
                             }
                         },*/
 
-                            { field: 'userPurseVo.diamondNum', title: '钻石数', align: 'center', valign: 'middle' },
-                            { field: 'userPurseVo.goldNum', title: '金币数', align: 'center', valign: 'middle' },
+                            { field: 'userPurseVo.diamondNum', title: '金币数', align: 'center', valign: 'middle' },
+                            { field: 'userPurseVo.goldNum', title: '钻石数', align: 'center', valign: 'middle' },
                             // {field:'account.phone',title:'手机电话',align:'center',valign:'middle'},
                             {
                                 field: 'birth',

src/views/users/UserCheckAdminBaseView.vue

@@ -222,8 +222,8 @@ export default {
                             }
                         },
 
-                        { field: 'userPurseVo.diamonds', title: '钻石数', align: 'center', valign: 'middle' },
-                        { field: 'userPurseVo.golds', title: '金币数', align: 'center', valign: 'middle' },
+                        { field: 'userPurseVo.diamonds', title: '金币数', align: 'center', valign: 'middle' },
+                        { field: 'userPurseVo.golds', title: '钻石数', align: 'center', valign: 'middle' },
                         // {field:'account.phone',title:'手机电话',align:'center',valign:'middle'},
                         {
                             field: 'users.birth',

src/views/users/UserCheckAdminView.vue

@@ -54,9 +54,9 @@
                             <div class="userDesc">自我描述: <span></span></div>
                         </div>
                         <div class="part form-group">
-                            <div class="diamondNum">钻石数: <span></span></div>
+                            <div class="diamondNum">金币数: <span></span></div>
                             <div class="crystalNum">水晶数: <span></span></div>
-                            <div class="goldNum">金币数: <span></span></div>
+                            <div class="goldNum">钻石数: <span></span></div>
                         </div>
                         <div class="part form-group">
                             <div class="followNum">关注数: <span></span></div>
@@ -385,8 +385,8 @@ export default {
                             }
                         },
 
-                        { field: 'userPurseVo.diamonds', title: '钻石数', align: 'center', valign: 'middle' },
-                        { field: 'userPurseVo.golds', title: '金币数', align: 'center', valign: 'middle' },
+                        { field: 'userPurseVo.diamonds', title: '金币数', align: 'center', valign: 'middle' },
+                        { field: 'userPurseVo.golds', title: '钻石数', align: 'center', valign: 'middle' },
                         // {field:'account.phone',title:'手机电话',align:'center',valign:'middle'},
                         {
                             field: 'users.birth',

src/views/users/UserDrawProdAdminView.vue

@@ -62,7 +62,7 @@
                             <label for="prodType" class="col-sm-2 control-label">奖品类型</label>
                             <div class="col-sm-10">
                                 <select name="prodType" id="prodType" data-btn-class="btn-warning">
-                                    <option value="1">金币</option>
+                                    <option value="1">钻石</option>
                                     <option value="2">靓号</option>
                                     <option value="3">座驾</option>
                                     <option value="4">实物</option>
@@ -82,7 +82,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <div class="tips">* 注意：座驾填座驾ID，金币填金币数量，靓号填具体靓号，实物填实物价值</div>
+                            <div class="tips">* 注意：座驾填座驾ID，钻石填钻石数量，靓号填具体靓号，实物填实物价值</div>
                             <label for="prodValue" class="col-sm-2 control-label">奖品值</label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control validate[required]" name="prodValue" id="prodValue">
@@ -169,7 +169,7 @@ export default {
                         {
                             field: 'prodType', title: '奖品类型', align: 'center', width: '10%', formatter: function (val, row, index) {
                                 if (val == 1) {
-                                    return "金币";
+                                    return "钻石";
                                 } else if (val == 2) {
                                     return "靓号";
                                 } else if (val == 3) {

src/views/users/UserPurseAdminView.vue

@@ -67,9 +67,9 @@ export default {
                         { field: 'uid', title: '用户uid', align: 'center', valign: 'middle', width: '8%' },
                         { field: 'erbanNo', title: '平台号', align: 'center', valign: 'middle', width: '8%' },
                         { field: 'nick', title: '昵称', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'diamonds', title: '钻石', align: 'center', valign: 'middle', width: '8%' },
+                        { field: 'diamonds', title: '金币', align: 'center', valign: 'middle', width: '8%' },
                         { field: 'crystals', title: '水晶', align: 'center', valign: 'middle', width: '8%' },
-                        { field: 'golds', title: '金币', align: 'center', valign: 'middle', width: '8%' },
+                        { field: 'golds', title: '钻石', align: 'center', valign: 'middle', width: '8%' },
                         {
                             field: 'firstCharge', title: '首充资格', align: 'center', valign: 'middle', width: '2%', formatter: function (val, row, index) {
                                 if (val) {

src/views/vip/VipManageView.vue

@@ -395,7 +395,7 @@ export default {
                         },
                         { 
                             field: 'returnProfits', 
-                            title: '返利日期+返利钻石数量', 
+                            title: '返利日期+返利金币数量', 
                             align: 'center', 
                             width: '5%', 
                             formatter: function (val, row) {
@@ -619,7 +619,7 @@ export default {
                         } else {
                             html += '第 <input type="text" data-index="' + i + '" id="profitDate' + i + '" value="' + profitDate + '" style="width:41px;"/> 天，';
                         }
-                        html += '返利 <input type="text" data-index="' + i + '" id="profitAmount' + i + '" value="' + profitAmount + '" style="width:41px;"/> 钻石 <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button><br/>';
+                        html += '返利 <input type="text" data-index="' + i + '" id="profitAmount' + i + '" value="' + profitAmount + '" style="width:41px;"/> 金币 <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button><br/>';
                         $span.append(html);
                         $div.append($span);
                     }
@@ -640,7 +640,7 @@ export default {
                     } else {
                         html += '第 <input type="text" data-index="' + i + '" id="profitDate' + i + '" style="width:41px;"/> 天，';
                     }
-                    html += '返利 <input type="text" data-index="' + i + '" id="profitAmount' + i + '" style="width:41px;"/> 钻石 <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button><br/>';
+                    html += '返利 <input type="text" data-index="' + i + '" id="profitAmount' + i + '" style="width:41px;"/> 金币 <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button><br/>';
                     $span.html(html);
                     $div.append($span);
                     $('#addSize').val(++i);

src/views/wishingStar/wishingStarSet.vue

@@ -423,7 +423,9 @@ export default {
     getData() {
       this.loading = true;
       // @ts-ignore
-      promiseStarConfigList().then((res) => {
+      promiseStarConfigList({
+        partitionId: this.searchValues.partitionId,
+      }).then((res) => {
         this.tableData = res.data;
         this.loading = false;
       });
@@ -435,12 +437,13 @@ export default {
     // 监听新增礼物价值
     // @ts-ignore
     giftOptionsChange(e) {
+      let gifts = this.giftOptions.filter(v => this.resource.partitionId == null || ((v.partitionFlag & this.resource.partitionId) != 0));
       // @ts-ignore
-      this.resource.giftId = this.giftOptions[e].giftId;
+      this.resource.giftId = gifts[e].giftId;
       // @ts-ignore
-      this.resource.giftName = this.giftOptions[e].giftName;
+      this.resource.giftName = gifts[e].giftName;
       // @ts-ignore
-      this.resource.goldPrice = this.giftOptions[e].goldPrice;
+      this.resource.goldPrice = gifts[e].goldPrice;
     },
     // 表单编辑
     // @ts-ignore

src/views/withdraw/ClanGoldSettlementRecordView.vue

@@ -97,8 +97,8 @@ export default {
                     columns: [
                         { field: 'erbanNo', title: '会长平台号', align: 'center', width: '5%' },
                         { field: 'nick', title: '公会名', align: 'center', width: '5%' },
-                        { field: 'exchangeGolds', title: '已累计兑换金币', align: 'center', width: '5%' },
-                        { field: 'settlementGolds', title: '公会成员结算金币', align: 'center', width: '5%' },
+                        { field: 'exchangeGolds', title: '已累计兑换钻石', align: 'center', width: '5%' },
+                        { field: 'settlementGolds', title: '公会成员结算钻石', align: 'center', width: '5%' },
                         { field: 'createTime', title: '申请时间', align: 'center', width: '5%' },
                         {
                             field: 'handle',
@@ -173,8 +173,8 @@ export default {
                         columns: [
                             { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
                             { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                            { field: 'exchangeGolds', title: '已累计兑换金币', align: 'center', width: '5%' },
-                            { field: 'settlementGolds', title: '结算金币', align: 'center', width: '5%' },
+                            { field: 'exchangeGolds', title: '已累计兑换钻石', align: 'center', width: '5%' },
+                            { field: 'settlementGolds', title: '结算钻石', align: 'center', width: '5%' },
                             { field: 'createTime', title: '结算时间', align: 'center', width: '5%' }
                         ],
                         cache: false,

src/views/withdraw/WithdrawApplyView.vue

@@ -165,7 +165,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="chinaUnionPay-goldNum" class="col-sm-3 control-label">核销金币：</label>
+                            <label for="chinaUnionPay-goldNum" class="col-sm-3 control-label">核销钻石：</label>
                             <div class="col-sm-9">
                                 <input type="text" readonly class="form-control" name="chinaUnionPay-goldNum"
                                     id="chinaUnionPay-goldNum">
@@ -310,7 +310,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="abroad-goldNum" class="col-sm-3 control-label">核销金币：</label>
+                            <label for="abroad-goldNum" class="col-sm-3 control-label">核销钻石：</label>
                             <div class="col-sm-9">
                                 <input type="text" readonly class="form-control" name="abroad-goldNum" id="abroad-goldNum">
                             </div>
@@ -407,7 +407,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="other-goldNum" class="col-sm-3 control-label">核销金币：</label>
+                            <label for="other-goldNum" class="col-sm-3 control-label">核销钻石：</label>
                             <div class="col-sm-9">
                                 <input type="text" readonly class="form-control" name="other-goldNum" id="other-goldNum">
                             </div>
@@ -441,10 +441,10 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" id="rejectAndNoReturn">
-                        驳回不返还金币
+                        驳回不返还钻石
                     </button>
                     <button type="button" class="btn btn-primary" id="rejectAndReturn">
-                        驳回且返还金币
+                        驳回且返还钻石
                     </button>
                 </div>
             </div>
@@ -512,7 +512,7 @@ export default {
                                 return value;
                             }
                         },
-                        { field: 'goldNum', title: '核销金币', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '核销钻石', align: 'center', width: '5%' },
                         {
                             field: 'id',
                             title: '操作',
@@ -765,7 +765,7 @@ export default {
                     var id = currentData.id;
                     var erbanNo = currentData.erbanNo;
                     var goldNum = currentData.goldNum;
-                    var rejectContent = '驳回后将返回<span style="color: red;">' + erbanNo + '</span>用户<span style="color: red;">' + goldNum + '</span>金币<br/>';
+                    var rejectContent = '驳回后将返回<span style="color: red;">' + erbanNo + '</span>用户<span style="color: red;">' + goldNum + '</span>钻石<br/>';
                     $('#recordIdStr').val(id);
                     $('#rejectContent').html(rejectContent);
                     $("#rejectModal").modal('show');
@@ -824,7 +824,7 @@ export default {
                         var erBanNo = rows[i]['erbanNo'];
                         var goldNum = rows[i]['goldNum'];
                         recordIdStr += id;
-                        rejectContent += '驳回后将返回<span style="color: red;">' + erBanNo + '</span>用户<span style="color: red;">' + goldNum + '</span>金币<br/>';
+                        rejectContent += '驳回后将返回<span style="color: red;">' + erBanNo + '</span>用户<span style="color: red;">' + goldNum + '</span>钻石<br/>';
                         if (i != len - 1) {
                             recordIdStr += ',';
                         }
@@ -834,7 +834,7 @@ export default {
                     $("#rejectModal").modal('show');
                 });
 
-                //驳回不返还金币
+                //驳回不返还钻石
                 $("#rejectAndNoReturn").on('click', function () {
                     var recordIdStr = $('#recordIdStr').val();
                     const isSecretary = confirm('是否发送小秘书通知') ? 1 : 0;
@@ -860,7 +860,7 @@ export default {
                     });
                 });
 
-                //驳回且返还金币
+                //驳回且返还钻石
                 $("#rejectAndReturn").on('click', function () {
                     var recordIdStr = $('#recordIdStr').val();
                     const isSecretary = confirm('是否发送小秘书通知') ? 1 : 0;

src/views/withdraw/WithdrawConfigView.vue

@@ -27,7 +27,7 @@
                     <form class="form-horizontal">
                         <input type="hidden" name="id" id="id" />
                         <div class="form-group">
-                            <label for="minValue" class="col-sm-3 control-label">最小提现金币：</label>
+                            <label for="minValue" class="col-sm-3 control-label">最小提现钻石：</label>
                             <div class="col-sm-9">
                                 <input type="text" class="form-control" id="minValue">
                             </div>
@@ -205,7 +205,7 @@ export default {
                 $('#table').bootstrapTable('destroy');
                 $('#table').bootstrapTable({
                     columns: [
-                        { field: 'minValue', title: '最小提现金币', align: 'center', width: '5%' },
+                        { field: 'minValue', title: '最小提现钻石', align: 'center', width: '5%' },
                         { field: 'weekMaxValue', title: '周提现上限', align: 'center', width: '5%' },
                         { field: 'weekLimitCount', title: '周提现次数', align: 'center', width: '5%' },
                         {

src/views/withdraw/WithdrawUserLimitView.vue

@@ -20,8 +20,8 @@
                                 <select name="searchType" id="searchType" data-btn-class="btn-warning" class="form-control">
                                     <option value="0" selected="selected">全部</option>
                                     <option value="1">提现</option>
-                                    <option value="2">兑换钻石</option>
-                                    <option value="3">提现+兑换钻石</option>
+                                    <option value="2">兑换金币</option>
+                                    <option value="3">提现+兑换金币</option>
                                 </select>
                             </div>
                             <label for="roomErBanNo" class="col-sm-2 control-label">所属房间ID:</label>
@@ -77,7 +77,7 @@
                             <label for="limitType" class="col-sm-3 control-label">限制内容：</label>
                             <div class="col-sm-9" id="limitType">
                                 <input type="checkbox" name="limitType" value="1" />提现<br>
-                                <input type="checkbox" name="limitType" value="2" />兑换钻石<br>
+                                <input type="checkbox" name="limitType" value="2" />兑换金币<br>
                             </div>
                         </div>
                     </form>
@@ -125,7 +125,7 @@ export default {
                         { field: 'roomErBanNo', title: '所属房间ID', align: 'center', width: '5%' },
                         { field: 'hallRoomName', title: '所属公会', align: 'center', width: '5%' },
                         { field: 'hallErBanNo', title: '所属公会ID', align: 'center', width: '5%' },
-                        { field: 'golds', title: '当前账户金币余额', align: 'center', width: '5%' },
+                        { field: 'golds', title: '当前账户钻石余额', align: 'center', width: '5%' },
                         {
                             field: 'limitContent',
                             title: '限制内容',
@@ -136,7 +136,7 @@ export default {
                                 var isDiamond = row.isDiamond;
                                 var isCash = row.isCash;
                                 if (isDiamond) {
-                                    value += '兑换钻石<br>';
+                                    value += '兑换金币<br>';
                                 }
                                 if (isCash) {
                                     value += '提现';