diff --git a/src/api/relAgency/relAgency.js b/src/api/relAgency/relAgency.js index d728cfa..2b25d18 100644 --- a/src/api/relAgency/relAgency.js +++ b/src/api/relAgency/relAgency.js @@ -271,4 +271,109 @@ export const exportRoomHourDiamondList = query => { params: query, responseType: 'blob' }); +}; +// 主播游戏薪资操作(不用分区) +export const getAnchorGameSalaryBill = query => { + return request({ + url: '/anchorGameSalaryBill/anchorSummary/list', + method: 'get', + params: query + }); +}; +// salaryType 1钻石兑换薪资明细 2 薪资转赠充值代理 明细 3薪资转增公会长明细 4官方提现 6 薪资兑换金币明细 +export const anchorGameSalaryBillDetail = query => { + return request({ + url: '/anchorGameSalaryBill/detail/list', + method: 'get', + params: query + }); +}; + +// 游戏薪资官方提现记录 列表 +export const gameUsdWithdrawExamineList = query => { + return request({ + url: '/gameUsdWithdrawExamine/list', + method: 'get', + params: query + }); +}; +// 游戏薪资官方提现记录 导出 +export const gameUsdWithdrawExamineExport = query => { + return request({ + url: `/gameUsdWithdrawExamine/export`, + method: 'post', + params: query, + responseType: 'blob' + }); +}; + +// 游戏薪资官方提现记录 结算 +export const gameUsdWithdrawExamineSet = query => { + return request({ + url: '/gameUsdWithdrawExamine/batchSettle', + method: 'post', + params: query + }); +}; +// 游戏薪资官方提现记录 批量驳回 +export const batchGameUsdWithdrawExamineReject = query => { + return request({ + url: '/gameUsdWithdrawExamine/batchReject', + method: 'post', + params: query + }); +}; +// 充值代理转增游戏薪资 +export const chargeGameAgentList = query => { + return request({ + url: '/anchorGameSalaryBill/chargeAgent/list', + method: 'get', + params: query + }); +}; +// 充值代理转增薪资 总值 +export const chargeGameAgentSum = query => { + return request({ + url: '/anchorGameSalaryBill/chargeAgent/sum', + method: 'get', + params: query + }); +}; +// 充值代理转增薪资导出 +export const chargeGameAgentExport = query => { + window.location.href = `/anchorGameSalaryBill/chargeAgent/export?${genQueryParam(query)}`; + return; +}; + +// 游戏薪资明细 +export const getGameUsdList = query => { + return request({ + url: '/gameUsd/detail', + method: 'get', + params: query + }); +}; +// 游戏薪资官方提现方式配置渠道 列表 +export const getGamelistAccountType = query => { + return request({ + url: '/admin/gameUsdWithdrawAccountConfig/listAccountType', + method: 'get', + params: query + }); +}; +// 游戏薪资官方提现方式配置 列表 +export const getGameAccountConfigList = query => { + return request({ + url: '/admin/gameUsdWithdrawAccountConfig/page', + method: 'get', + params: query + }); +}; +// 游戏薪资官方提现方式配置 编辑 +export const saveGameAccountConfig = query => { + return request({ + url: '/admin/gameUsdWithdrawAccountConfig/save', + method: 'get', + params: query + }); }; \ No newline at end of file diff --git a/src/views/guildOperationManagement/agentSendGameSalary.vue b/src/views/guildOperationManagement/agentSendGameSalary.vue new file mode 100644 index 0000000..2045405 --- /dev/null +++ b/src/views/guildOperationManagement/agentSendGameSalary.vue @@ -0,0 +1,318 @@ + + + + + diff --git a/src/views/guildOperationManagement/anchorGameSalaryOperation.vue b/src/views/guildOperationManagement/anchorGameSalaryOperation.vue new file mode 100644 index 0000000..5c9eba0 --- /dev/null +++ b/src/views/guildOperationManagement/anchorGameSalaryOperation.vue @@ -0,0 +1,657 @@ + + + + + diff --git a/src/views/guildOperationManagement/gameSalaryDetails.vue b/src/views/guildOperationManagement/gameSalaryDetails.vue new file mode 100644 index 0000000..3d7c70c --- /dev/null +++ b/src/views/guildOperationManagement/gameSalaryDetails.vue @@ -0,0 +1,181 @@ + + + + + + diff --git a/src/views/guildOperationManagement/officialGameSalaryWithdrawalRecord.vue b/src/views/guildOperationManagement/officialGameSalaryWithdrawalRecord.vue new file mode 100644 index 0000000..f926cdc --- /dev/null +++ b/src/views/guildOperationManagement/officialGameSalaryWithdrawalRecord.vue @@ -0,0 +1,651 @@ + + + + + diff --git a/src/views/guildOperationManagement/officialWithdrawalGameMethodConfiguration.vue b/src/views/guildOperationManagement/officialWithdrawalGameMethodConfiguration.vue new file mode 100644 index 0000000..5e83d14 --- /dev/null +++ b/src/views/guildOperationManagement/officialWithdrawalGameMethodConfiguration.vue @@ -0,0 +1,330 @@ + + + + diff --git a/src/views/record/OfficialGoldBusTypeView.vue b/src/views/record/OfficialGoldBusTypeView.vue index 487b1fe..ed33990 100644 --- a/src/views/record/OfficialGoldBusTypeView.vue +++ b/src/views/record/OfficialGoldBusTypeView.vue @@ -20,6 +20,8 @@ + + @@ -67,6 +69,8 @@ + + @@ -134,6 +138,8 @@ export default { if (val == 17) { return "活动奖励钻石" } if (val == 20) { return "公款充值钻石" } if (val == 51) { return "官方钻石消除" } + if (val == 65) { return "官方消除游戏薪资" } + if (val == 66) { return "官方赠送游戏薪资" } if (val == 63) { return "官方消除薪资" } if (val == 64) { return "官方赠送薪资" } return val; diff --git a/src/views/record/OfficicalGoldView.vue b/src/views/record/OfficicalGoldView.vue index cfeb62d..a370670 100644 --- a/src/views/record/OfficicalGoldView.vue +++ b/src/views/record/OfficicalGoldView.vue @@ -441,6 +441,7 @@ function initUserInfoTable () { { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' }, { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' }, { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' }, + { field: 'gameUsdNum', title: '游戏薪资', align: 'center', width: '5%', valign: 'middle' }, { field: 'guildUsdNum', title: '薪资', align: 'center', width: '5%', valign: 'middle' } ], cache: false, @@ -503,7 +504,8 @@ function initGoldRecordTable () { formatter: function (val, row, index) { // 根据条件判断显示哪个字段 // 示例:根据typeCn字段的值来决定显示什么 - if (row.currencyType == 0 || row.currencyType == 4) { + if (row.currencyType == 0 || row.currencyType == 4 || row.currencyType == 5) { + if(row.currencyType == 0 && row.diamondNum == null){ return row.goldNum }else{ diff --git a/src/views/refund/goldDiamondOperationRecord.vue b/src/views/refund/goldDiamondOperationRecord.vue index 8c24ab1..8c8f68d 100644 --- a/src/views/refund/goldDiamondOperationRecord.vue +++ b/src/views/refund/goldDiamondOperationRecord.vue @@ -97,6 +97,14 @@ }} + + + + + + + + @@ -147,6 +155,8 @@ export default { { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" }, { desc: "官方赠送钻石", id: "OFFICAL_GOLD" }, { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" }, + { desc: "官方消除游戏薪资", id: "OFFICAL_MINUS_GAME_USD" }, + { desc: "官方赠送游戏薪资", id: "OFFICAL_PLUS_GAME_USD" }, { desc: "官方消除薪资", id: "OFFICAL_MINUS_GUILD_USD" }, { desc: "官方赠送薪资", id: "OFFICAL_PLUS_GUILD_USD" }, ],