Compare commits

..

38 Commits

Author SHA1 Message Date
dragon
f9a1f6a89c 完成幸运礼物优化 2024-11-20 15:59:20 +08:00
dragon
c7597a1b14 幸运礼物暂存 2024-11-20 15:59:19 +08:00
dragon
9b7d0132ef 幸运礼物暂存 2024-11-20 15:59:18 +08:00
khalil
0dcf3594bd 幸运24-记录-分区-增加土耳其区 2024-11-20 15:59:13 +08:00
khalil
e50a89fb0a 幸运24-记录-分区-增加土耳其区 2024-11-20 15:51:19 +08:00
khalil
49bd77ae3f 幸运24-分区-增加土耳其区 2024-11-20 11:58:17 +08:00
dragon
d9a6c2881b 修复财务管理-转赠统计时间筛选异常问题 2024-11-19 15:23:14 +08:00
dragon
46af95e834 公会信息异常问题 2024-11-15 18:53:59 +08:00
dragon
07543cca7d 修复页面异常问题 2024-11-15 18:36:50 +08:00
dragon
a75058d202 修复公会信息异常问题 2024-11-15 15:40:50 +08:00
dragon
9129e29bf3 新增公会默认选择地区 2024-11-15 11:55:56 +08:00
dragon
37df3b5db1 补齐新增土耳座驾资源管理 2024-11-14 15:54:12 +08:00
dragon
6e841bc675 完成土耳其化 2024-11-14 15:40:14 +08:00
dragon
286969cdd1 分区暂存 2024-11-14 15:40:12 +08:00
dragon
d3b48eea86 新增土耳其相关 2024-11-14 15:40:11 +08:00
dragon
9e6495d807 修复第二banner新增弹窗异常问题 2024-11-12 15:31:09 +08:00
dragon
836fb732c8 优化图片显示 2024-11-12 10:31:17 +08:00
dragon
9a151fbe05 新增第二banner无跳转接触必填限制 2024-11-12 10:31:16 +08:00
dragon
07e9a1e8b2 工会信息新增公会头像 2024-11-12 10:31:16 +08:00
dragon
d3c14383f8 新增无跳转类型-banner 2024-11-12 10:31:15 +08:00
dragon
5bba43c189 移除svga图片 2024-11-12 10:31:14 +08:00
dragon
74939056ce deBug未知报错 2024-11-12 10:31:13 +08:00
dragon
004bf0e03a 优化房间背景svga代码先后流程 2024-11-12 10:31:13 +08:00
dragon
b467577792 完成第二banner 2024-11-12 10:31:12 +08:00
dragon
99a1c89643 修复appui配置异常问题 2024-11-12 10:31:11 +08:00
dragon
b043d8c06e 修复报错问题 2024-11-12 10:31:10 +08:00
dragon
fb007e763c 完成房间背景和首页ui配置 2024-11-12 10:31:10 +08:00
khalil
2fddf66a5d 房间流水-后台-listByPage改list 2024-11-11 22:05:20 +08:00
khalil
75bcd232a4 banner-后台-跳转类型 2024-11-04 18:58:16 +08:00
dragon
ae0a3507a6 钻石流水显示时分秒+转赠类型新增web-api金币 2024-10-30 17:46:48 +08:00
khalil
31d6efd60e 头像-房间-上传 2024-10-28 14:20:59 +08:00
khalil
70993f1b4d 头像-房间-列表增加审核状态 2024-10-25 17:04:58 +08:00
khalil
e4fb991a98 寻爱-后台-奖品取消分区 2024-10-25 17:04:53 +08:00
khalil
b84438c19d 寻爱-后台-分区 2024-10-25 17:04:41 +08:00
dragon
ed9178a1d0 修复详情数据异常问题 2024-10-24 17:51:34 +08:00
dragon
78b3a70d5f 修复数据异常问题 2024-10-24 17:12:01 +08:00
dragon
baad132403 完成小游戏后台 2024-10-23 11:29:00 +08:00
dragon
c865eae77b 修复时间戳默认转换值 2024-10-18 17:00:48 +08:00
57 changed files with 10814 additions and 5353 deletions

6
package-lock.json generated
View File

@@ -27,6 +27,7 @@
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"sass": "^1.67.0", "sass": "^1.67.0",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",
"svgaplayerweb": "^2.3.2",
"unplugin-element-plus": "^0.8.0", "unplugin-element-plus": "^0.8.0",
"vue-clipboard2": "^0.3.3", "vue-clipboard2": "^0.3.3",
"vue-router": "^4.0.3", "vue-router": "^4.0.3",
@@ -11990,6 +11991,11 @@
"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
"dev": true "dev": true
}, },
"node_modules/svgaplayerweb": {
"version": "2.3.2",
"resolved": "https://registry.npmmirror.com/svgaplayerweb/-/svgaplayerweb-2.3.2.tgz",
"integrity": "sha512-QuTvNIgy3W6Mi4h74SczEHUtAwb8m3ax7Ai7xRLUuN6hjJh49RGtWOWq1IuF2I7ECcl0HAYn8FcTn99UDz9UiQ=="
},
"node_modules/svgo": { "node_modules/svgo": {
"version": "2.8.0", "version": "2.8.0",
"resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz", "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",

View File

@@ -27,6 +27,7 @@
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"sass": "^1.67.0", "sass": "^1.67.0",
"sass-loader": "^13.3.2", "sass-loader": "^13.3.2",
"svgaplayerweb": "^2.3.2",
"unplugin-element-plus": "^0.8.0", "unplugin-element-plus": "^0.8.0",
"vue-clipboard2": "^0.3.3", "vue-clipboard2": "^0.3.3",
"vue-router": "^4.0.3", "vue-router": "^4.0.3",

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,87 @@
import request from '@/utils/request';
import { genQueryParam } from '@/utils/maintainer';
import qs from 'qs';
// 地区接口
export const listPartitionInfo = query => {
return request({
url: '/partition/listPartitionInfo',
method: 'get',
params: query
});
};
// ==============================================首页ui配置==============================================
// 配置
export const appUiSetting = query => {
return request({
url: '/appUiSetting',
method: 'get',
params: query
});
};
// 保存
export const appUiSettingSave = query => {
return request({
url: '/appUiSetting/save',
method: 'post',
data: query
});
};
// ==============================================自定义背景==============================================
// 列表
export const page = query => {
return request({
url: '/admin/roomBackground/page',
method: 'get',
params: query
});
};
// 新增
export const roomBackgroundAdd = query => {
return request({
url: '/admin/roomBackground/add',
method: 'post',
params: query
});
};
// 编辑
export const roomBackgroundUpdate = query => {
return request({
url: '/admin/roomBackground/update',
method: 'post',
params: query
});
};
// ==============================================自定义背景==============================================
// 列表
export const customPage = query => {
return request({
url: '/admin/roomBackground/custom/page',
method: 'get',
params: query
});
};
// 通过
export const customPass = query => {
return request({
url: '/admin/roomBackground/custom/pass',
method: 'post',
params: query
});
};
// 拒绝
export const customReject = query => {
return request({
url: '/admin/roomBackground/custom/reject',
method: 'post',
params: query
});
};
// 删除
export const customDel = query => {
return request({
url: '/admin/roomBackground/custom/del',
method: 'post',
params: query
});
};

View File

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

View File

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

View File

@@ -63,6 +63,7 @@
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br> <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br> <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br> <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -93,6 +94,12 @@
<input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称"> <input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称">
</div> </div>
</div> </div>
<div class="form-group">
<label for="tr_modal_name" class="col-sm-4 control-label">土耳其装扮名称:</label>
<div class="col-sm-6">
<input type="text" class="form-control validate[required]" name="name" id="tr_modal_name" placeholder="请输入气泡名称">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">安卓图片:</label> <label class="col-sm-4 control-label">安卓图片:</label>
<div class="col-sm-6"> <div class="col-sm-6">
@@ -216,12 +223,16 @@ export default {
if ((val & 4) != 0) { if ((val & 4) != 0) {
value += '华语区<br>'; value += '华语区<br>';
} }
if ((val & 8) != 0) {
value += '土耳其区<br>';
}
return value; return value;
} }
}, },
{field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'}, {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'},
{field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'}, {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'},
{field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'},
{field: 'name.tr', title: '土耳其扮名称', align: 'middle', width: '5%'},
{ {
field: 'iosUrl', field: 'iosUrl',
title: '装扮图片', title: '装扮图片',
@@ -374,12 +385,16 @@ export default {
$("#ar_modal_name").val(row.name.ar); $("#ar_modal_name").val(row.name.ar);
// 英语名称 // 英语名称
$("#en_modal_name").val(row.name.en); $("#en_modal_name").val(row.name.en);
// 土耳其名称
$("#tr_modal_name").val(row.name.tr);
} else { } else {
$("#modal_name").val(name); $("#modal_name").val(name);
// 阿语名称 // 阿语名称
$("#ar_modal_name").val(name); $("#ar_modal_name").val(name);
// 英语名称 // 英语名称
$("#en_modal_name").val(name); $("#en_modal_name").val(name);
// 土耳其名称
$("#tr_modal_name").val(name);
} }
$('#addAndroidIconPicUrl').attr("src", row.androidUrl); $('#addAndroidIconPicUrl').attr("src", row.androidUrl);
$("#addForm #androidUrl").val(row.androidUrl); $("#addForm #androidUrl").val(row.androidUrl);
@@ -454,8 +469,10 @@ export default {
var ar_name = $("#ar_modal_name").val(); var ar_name = $("#ar_modal_name").val();
// 英语名称 // 英语名称
var en_name = $("#en_modal_name").val(); var en_name = $("#en_modal_name").val();
// 土耳其名称
var tr_name = $("#tr_modal_name").val();
// 国际化字段 // 国际化字段
var jsonName = {"zh":name,"ar":ar_name,"en":en_name} var jsonName = {"zh":name,"ar":ar_name,"en":en_name,"tr":tr_name}
const nameValue = JSON.stringify(jsonName); const nameValue = JSON.stringify(jsonName);
// 修改属性值 // 修改属性值
formData.name = nameValue; // 将giftName修改为"newGiftName" formData.name = nameValue; // 将giftName修改为"newGiftName"
@@ -528,6 +545,7 @@ export default {
$('#modal_name').val(''); $('#modal_name').val('');
$('#ar_modal_name').val(''); $('#ar_modal_name').val('');
$('#en_modal_name').val(''); $('#en_modal_name').val('');
$('#tr_modal_name').val('');
$('input[name="partitionFlag"]').each(function() { $('input[name="partitionFlag"]').each(function() {
$(this).checked = false; $(this).checked = false;
}); });

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

@@ -10,6 +10,17 @@
:disabled="tableLoading" :disabled="tableLoading"
> >
<div class="search-line"> <div class="search-line">
<el-form-item label="分区" prop="partitionId">
<el-select v-model="searchForm.partitionId" placeholder="请选择">
<el-option
v-for="item in partitionArr"
:key="item.id"
:label="item.desc"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="充值代理ID" prop="chargeAgentErbanNo"> <el-form-item label="充值代理ID" prop="chargeAgentErbanNo">
<el-input <el-input
v-model.trim="searchForm.chargeAgentErbanNo" v-model.trim="searchForm.chargeAgentErbanNo"
@@ -58,6 +69,8 @@
@header-click="headerCopy" @header-click="headerCopy"
style="width: 100%" style="width: 100%"
> >
<el-table-column align="center" prop="partitionDesc" label="分区">
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="receiveErbano" prop="receiveErbano"
@@ -110,7 +123,11 @@
</template> </template>
<script> <script>
import { chargeAgentList, chargeAgentSum } from "@/api/relAgency/relAgency.js"; import {
chargeAgentList,
chargeAgentSum,
listPartitionInfo,
} from "@/api/relAgency/relAgency.js";
import TablePagination from "@/components/common/TablePagination"; import TablePagination from "@/components/common/TablePagination";
import { formatDate, formatDateYMD } from "@/utils/relDate"; import { formatDate, formatDateYMD } from "@/utils/relDate";
import { dateFormat } from "@/utils/system-helper"; import { dateFormat } from "@/utils/system-helper";
@@ -138,7 +155,9 @@ export default {
chargeAgentErbanNo: null, chargeAgentErbanNo: null,
startTime: null, startTime: null,
endTime: null, endTime: null,
partitionId: "",
}, },
partitionArr: [],
searchRule: { searchRule: {
startTime: [ startTime: [
{ {
@@ -171,14 +190,23 @@ export default {
}, },
created() { created() {
// this.getData(); // this.getData();
listPartitionInfo().then((res) => {
this.partitionArr = res.data;
this.searchForm.partitionId=this.partitionArr[0].id;
});
}, },
methods: { methods: {
getData() { getData() {
this.tableLoading = true; this.tableLoading = true;
let { pageParams, searchForm } = this; let { pageParams, searchForm } = this;
searchForm.startTime = dateFormat(searchForm.startTime,'yyyy-MM-dd hh:mm:ss'); console.log(searchForm);
searchForm.endTime = dateFormat(searchForm.endTime,'yyyy-MM-dd hh:mm:ss'); searchForm.startTime = searchForm.startTime
? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
: null;
searchForm.endTime = searchForm.endTime
? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
: null;
searchForm = JSON.parse(JSON.stringify(searchForm)); searchForm = JSON.parse(JSON.stringify(searchForm));
pageParams = JSON.parse(JSON.stringify(pageParams)); pageParams = JSON.parse(JSON.stringify(pageParams));
Object.keys(searchForm).forEach((item) => { Object.keys(searchForm).forEach((item) => {
@@ -198,7 +226,7 @@ export default {
let data = res.data; let data = res.data;
this.tableData = data.records; this.tableData = data.records;
this.pageTotal = data.total; this.pageTotal = data.total;
}else { } else {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: res.message, message: res.message,
@@ -209,7 +237,7 @@ export default {
chargeAgentSum(pageParams).then((res) => { chargeAgentSum(pageParams).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.data; this.total = res.data;
}else { } else {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: res.message, message: res.message,

View File

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

View File

@@ -1,6 +1,23 @@
<template> <template>
<div class="box"> <div class="box">
<!-- 查询 --> <!-- 查询 -->
<div class="inquire">
<div class="block">
<span class="demonstration">分区</span>
<el-select
v-model="inquire.partitionId"
style="width: 75%"
placeholder="请选择"
>
<el-option
v-for="item in inquire.partitionArr"
:key="item.id"
:label="item.desc"
:value="item.id"
></el-option>
</el-select>
</div>
</div>
<div class="inquire"> <div class="inquire">
<span>公会ID</span> <span>公会ID</span>
<el-input <el-input
@@ -38,6 +55,7 @@
v-model="inquire.time[0]" v-model="inquire.time[0]"
type="date" type="date"
placeholder="开始时间" placeholder="开始时间"
format="YYYY-MM-DD 00:00:00"
> >
</el-date-picker> </el-date-picker>
</div> </div>
@@ -49,6 +67,7 @@
v-model="inquire.time[1]" v-model="inquire.time[1]"
type="date" type="date"
placeholder="结束时间" placeholder="结束时间"
format="YYYY-MM-DD 23:59:59"
> >
</el-date-picker> </el-date-picker>
</div> </div>
@@ -84,6 +103,7 @@
style="width: 100%; margin-top: 25px" style="width: 100%; margin-top: 25px"
> >
<el-table-column type="index" width="100" align="center" label="序号" /> <el-table-column type="index" width="100" align="center" label="序号" />
<el-table-column prop="partitionDesc" align="center" label="分区" />
<el-table-column prop="guildId" align="center" label="公会ID" /> <el-table-column prop="guildId" align="center" label="公会ID" />
<el-table-column prop="guildName" align="center" label="公会昵称" /> <el-table-column prop="guildName" align="center" label="公会昵称" />
<el-table-column prop="ownerErbanNo" align="center" label="公会长ID" /> <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
@@ -108,6 +128,7 @@
import { import {
diamondStatistics, diamondStatistics,
diamondStatisticsExport, diamondStatisticsExport,
listPartitionInfo,
} from "@/api/relAgency/relAgency"; } from "@/api/relAgency/relAgency";
// @ts-ignore // @ts-ignore
import { dateFormat } from "@/utils/system-helper"; import { dateFormat } from "@/utils/system-helper";
@@ -123,6 +144,8 @@ export default {
guildId: "", guildId: "",
guildBoosId: "", guildBoosId: "",
time: [], time: [],
partitionId: "",
partitionArr: [],
}, },
// 表格 // 表格
tableData: [], tableData: [],
@@ -136,6 +159,10 @@ export default {
}, },
created() { created() {
// this.getData(); // this.getData();
listPartitionInfo().then((res) => {
this.inquire.partitionArr = res.data;
this.inquire.partitionId = this.inquire.partitionArr[0].id;
});
}, },
methods: { methods: {
// 查询接口 // 查询接口
@@ -144,7 +171,6 @@ export default {
let time = this.inquire.time; let time = this.inquire.time;
let startTime = null; let startTime = null;
let endTime = null; let endTime = null;
console.log(this.inquire.time, 111111);
if (time.length > 0) { if (time.length > 0) {
startTime = this.inquire.time[0] startTime = this.inquire.time[0]
? dateFormat(this.inquire.time[0], "yyyy-MM-dd") ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
@@ -156,6 +182,7 @@ export default {
diamondStatistics({ diamondStatistics({
guildId: this.inquire.guildId, guildId: this.inquire.guildId,
ownerErbanNo: this.inquire.guildBoosId, ownerErbanNo: this.inquire.guildBoosId,
partitionId: this.inquire.partitionId,
startTime: startTime, startTime: startTime,
endTime: endTime, endTime: endTime,
pageNo: this.currentPage, pageNo: this.currentPage,
@@ -180,8 +207,8 @@ export default {
let startTime = ""; let startTime = "";
let endTime = ""; let endTime = "";
if (time && time.length > 0) { if (time && time.length > 0) {
startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss"); startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss"); endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
} }
diamondStatisticsExport({ diamondStatisticsExport({
guildId: this.inquire.guildId, guildId: this.inquire.guildId,

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -24,12 +24,13 @@
<option value="">请选择...</option> <option value="">请选择...</option>
<option value="0">金币</option> <option value="0">金币</option>
<option value="1">背包礼物</option> <option value="1">背包礼物</option>
<option value="2">web-api金币</option>
</select> </select>
</div> </div>
<label class="col-sm-2 control-label">统计时间:</label> <label class="col-sm-2 control-label">统计时间:</label>
<div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"> <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"></div>
</div><span class="col-sm-1"></span> <span class="col-sm-1"></span>
<div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div> <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
</div> </div>
@@ -110,24 +111,7 @@
<script> <script>
import TableHelper from '@/utils/bootstrap-table-helper'; import TableHelper from '@/utils/bootstrap-table-helper';
var picker1 = $("#beginTime").datetimepicker({
format: 'yyyy-mm-dd hh:ii:00',
autoclose: true,
todayBtn: true,
});
var picker2 = $("#endTime").datetimepicker({
format: 'yyyy-mm-dd hh:ii:00',
autoclose: true,
todayBtn: true
});
var picker3 = $('#editEndTime').datetimepicker({
format: 'yyyy-mm-dd hh:ii:00',
autoclose: true
})
var picker4 = $('#editStartTime').datetimepicker({
format: 'yyyy-mm-dd hh:ii:00',
autoclose: true
})
/*picker1.on('changeDate', function () { /*picker1.on('changeDate', function () {
var date = $('#beginDate').datetimepicker('getDate'); var date = $('#beginDate').datetimepicker('getDate');
@@ -163,6 +147,8 @@ export default {
formatter: function (val, row, index) { formatter: function (val, row, index) {
if (row.type == 0) { if (row.type == 0) {
return '金币' return '金币'
}else if(row.type == 2){
return 'web-api金币';
} else { } else {
return '背包礼物'; return '背包礼物';
} }
@@ -287,7 +273,16 @@ export default {
console.log("load fail"); console.log("load fail");
} }
}); });
var picker1 = $("#beginTime").datetimepicker({
format: 'yyyy-mm-dd hh:mm:ss',
autoclose: true,
todayBtn: true,
});
var picker2 = $("#endTime").datetimepicker({
format: 'yyyy-mm-dd hh:mm:ss',
autoclose: true,
todayBtn: true
});
// 查询刷新 // 查询刷新
$('#btnSearch').on('click', function () { $('#btnSearch').on('click', function () {
TableHelper.doRefresh('#table'); TableHelper.doRefresh('#table');

View File

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

View File

@@ -156,6 +156,7 @@
<input type="checkbox" name="partitionFlag" value="1"/>英语区<br> <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
<input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br> <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
<input type="checkbox" name="partitionFlag" value="4"/>华语区<br> <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
<input type="checkbox" name="partitionFlag" value="8"/>土耳其区<br>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -654,6 +655,7 @@ export default {
{field: 'giftName.zh', title: '礼物名称', align: 'center', width: '15%'}, {field: 'giftName.zh', title: '礼物名称', align: 'center', width: '15%'},
{field: 'giftName.ar', title: '阿语礼物名称', align: 'center', width: '10%'}, {field: 'giftName.ar', title: '阿语礼物名称', align: 'center', width: '10%'},
{field: 'giftName.en', title: '英语礼物名称', align: 'center', width: '10%'}, {field: 'giftName.en', title: '英语礼物名称', align: 'center', width: '10%'},
{field: 'giftName.tr', title: '土耳其礼物名称', align: 'center', width: '10%'},
{ {
field: 'partitionFlag', field: 'partitionFlag',
title: '地区', title: '地区',
@@ -670,6 +672,9 @@ export default {
if ((val & 4) != 0) { if ((val & 4) != 0) {
value += '华语区<br>'; value += '华语区<br>';
} }
if ((val & 8) != 0) {
value += '土耳其<br>';
}
return value; return value;
} }
}, },

View File

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

View File

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