diff --git a/src/views/guildOperationManagement/anchorSalaryOperate.vue b/src/views/guildOperationManagement/anchorSalaryOperate.vue index 9c99c6e..a054e2c 100644 --- a/src/views/guildOperationManagement/anchorSalaryOperate.vue +++ b/src/views/guildOperationManagement/anchorSalaryOperate.vue @@ -142,6 +142,16 @@ + + + @@ -251,11 +261,11 @@ - - @@ -277,6 +287,30 @@ + + + + + + + + + + + @@ -440,6 +474,10 @@ export default { this.dialogTitle = "薪资兑换金币"; this.dialogType = 6; break; + case 9: + this.dialogTitle = "官方操作"; + this.dialogType = 9; + break; default: break; } diff --git a/src/views/record/OfficicalGoldView.vue b/src/views/record/OfficicalGoldView.vue index fa0adc6..5f2cd9a 100644 --- a/src/views/record/OfficicalGoldView.vue +++ b/src/views/record/OfficicalGoldView.vue @@ -418,7 +418,8 @@ function initUserInfoTable () { { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' }, { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' }, { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' }, - { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' } + { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' }, + { field: 'guildUsdNum', title: '薪资', align: 'center', width: '5%', valign: 'middle' } ], cache: false, striped: true, @@ -471,7 +472,26 @@ function initGoldRecordTable () { { field: 'erbanNo', title: '兔兔号', align: 'center', width: '5%', valign: 'middle' }, { field: 'nick', title: '昵称', align: 'center', width: '5%', valign: 'middle' }, { field: 'money', title: '余额', align: 'center', width: '5%', valign: 'middle' }, - { field: 'goldNum', title: '赠送数量', align: 'center', width: '5%', valign: 'middle' }, + { + field: 'goldNum', + title: '赠送数量', + align: 'center', + width: '5%', + valign: 'middle', + formatter: function (val, row, index) { + // 根据条件判断显示哪个字段 + // 示例:根据typeCn字段的值来决定显示什么 + if (row.currencyType == 0 || row.currencyType == 4) { + if(row.currencyType == 0 && row.diamondNum == null){ + return row.goldNum + }else{ + return row.diamondNum + } + }else if(row.currencyType == 1 || row.currencyType == 2){ + return row.goldNum + } + } + }, { field: 'typeCn', title: '赠送类型', align: 'center', width: '5%', valign: 'middle' }, { field: 'busName', title: '赠送分类', align: 'center', width: '5%', valign: 'middle' }, { field: 'remark', title: '备注', align: 'center', width: '10%', valign: 'middle' }, diff --git a/src/views/refund/goldDiamondOperationRecord.vue b/src/views/refund/goldDiamondOperationRecord.vue index 6a5628e..8c24ab1 100644 --- a/src/views/refund/goldDiamondOperationRecord.vue +++ b/src/views/refund/goldDiamondOperationRecord.vue @@ -79,6 +79,14 @@ border style="width: 100%; margin-top: 25px" > + + + + + + + + - - - - - - - - - - @@ -153,6 +147,8 @@ export default { { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" }, { desc: "官方赠送钻石", id: "OFFICAL_GOLD" }, { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" }, + { desc: "官方消除薪资", id: "OFFICAL_MINUS_GUILD_USD" }, + { desc: "官方赠送薪资", id: "OFFICAL_PLUS_GUILD_USD" }, ], time: "", },