diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 830aa38..25ed284 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -39,14 +39,13 @@ 今 昨 近7天 + 重置 + 查询 - - 重置 - 查询 - + diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index 781e868..3e66086 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -38,13 +38,11 @@ 今 昨 近7天 + 重置 + 查询 - - 重置 - 查询 - diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index 3b4a05f..02230ee 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -87,7 +87,7 @@ const getAdminData = async function () { data: {}, }); adminData.value = result; - addConsume.value.adminId = adminData.value.adminId; + addConsume.value.adminId = adminData.value.id; addConsume.value.name = adminData.value.name; console.log("请求成功", result); console.log("用户信息", adminData.value); @@ -231,7 +231,7 @@ function resetForm() { permanentGold: null, taskGold: null, remark: "", - adminId: adminData.value.adminId, + adminId: adminData.value.id, adminName: adminData.value.adminName, }; diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue index 65e8369..1650c80 100644 --- a/src/views/recharge/addCoinRecharge.vue +++ b/src/views/recharge/addCoinRecharge.vue @@ -10,7 +10,7 @@ import { range, re } from 'mathjs' import { utils, read } from 'xlsx' import throttle from 'lodash/throttle' // 定义 fixedAdminId -const fixedAdminId = 1; +// const fixedAdminId = 1; // 精网号去空格 const trimJwCode = () => { @@ -37,6 +37,7 @@ const imageUrl = ref('') const voucher = ref('') const Rate = ref() const adminData = ref({}) +// 获取管理员信息 const getAdminData = async function () { try { const result = await API({ @@ -44,7 +45,7 @@ const getAdminData = async function () { data: {} }) adminData.value = result - recharge.value.adminId = adminData.value.adminId + recharge.value.adminId = adminData.value.id recharge.value.market = adminData.value.market console.log('请求成功', result) console.log('用户信息', user.value) @@ -73,10 +74,7 @@ const recharge = ref({ const add = async function () { try { - const formattedRecharge = { ...recharge.value, - // 添加固定的 adminId - adminId: fixedAdminId - } + const formattedRecharge = { ...recharge.value} // 将永久金币数、免费金币数和充值金额数乘以 100 if (formattedRecharge.permanentGold) { @@ -110,7 +108,7 @@ const add = async function () { ElMessage.success('添加成功') // 重置表单 recharge.value = {} - recharge.value.adminId = adminData.value.adminId + recharge.value.adminId = adminData.value.id recharge.value.market = adminData.value.market recharge.value.voucher = '' recharge.value.rechargeWay = '客服充值' @@ -250,7 +248,7 @@ const getUser = async function (jwcode) { } } -// 这是查询活动的接口 +// 这是查询活动的接口，一期没有调用这个接口 const activity = ref([]) const getActivity = async function () { try { @@ -365,8 +363,8 @@ function handleActivityChange(value) { //这是重置重置表单的方法 const deleteRecharge = function () { recharge.value = { - // adminId: adminData.value.adminId, - adminId: fixedAdminId, + adminId: adminData.value.id, + //adminId: fixedAdminId, market: adminData.value.market, voucher: '', rechargeWay: '客服充值', @@ -383,7 +381,7 @@ const deleteRecharge = function () { onMounted(async function () { await getAdminData() // await getCurrency() - await getActivity() + await getActivity()// 现在的活动就是文字输入框，不需要请求接口，具体等后续需求 }) @@ -409,7 +407,7 @@ onMounted(async function () { >查询 - + + + @@ -548,14 +553,14 @@ onMounted(async function () {

- {{ Number(user.historySumGold ) }} + {{ Number(user.historySumGold ) /100 }}

(永久金币:{{ user.historyPermanentGold }};免费金币:{{ - (user.historyFreeGold) - }};任务金币:{{ user.historyTaskGold }}) + >(永久金币:{{ user.historyPermanentGold /100 }};免费金币:{{ + (user.historyFreeGold) /100 + }};任务金币:{{ user.historyTaskGold /100}})

@@ -571,15 +576,15 @@ onMounted(async function () { style="color: #2fa1ff; margin-right: 5px" v-if="user.nowPermanentGold !== undefined" >{{ - (user.nowSumGold) + (user.nowSumGold) /100 }} (永久金币:{{ user.nowPermanentGold}};免费金币:{{ - (user.nowFreeGold) - }};任务金币:{{ user.nowTaskGold }})(永久金币:{{ user.nowPermanentGold /100}};免费金币:{{ + (user.nowFreeGold) /100 + }};任务金币:{{ user.nowTaskGold /100}}) diff --git a/src/views/recharge/beanRecharge.vue b/src/views/recharge/beanRecharge.vue index 2a5f0ef..0b56e8e 100644 --- a/src/views/recharge/beanRecharge.vue +++ b/src/views/recharge/beanRecharge.vue @@ -12,7 +12,7 @@ const getAdminData = async function () { try { const result = await API({ url: '/admin/userinfo', data: {} }) adminData.value = result - rechargeVo.value.adminId = adminData.value.adminId + rechargeVo.value.adminId = adminData.value.id console.log('请求成功', result) console.log('用户信息', adminData.value) } catch (error) { @@ -25,7 +25,7 @@ const tableData = ref([]) // 搜索=========================================== // 搜索recharge const rechargeVo = ref({ - adminId: adminData.value.adminId + adminId: adminData.value.id }) // 搜索对象 const getObj = ref({ diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue index 38846a2..ff1ddf5 100644 --- a/src/views/recharge/coinRechargeDetail.vue +++ b/src/views/recharge/coinRechargeDetail.vue @@ -12,7 +12,7 @@ const getAdminData = async function () { try { const result = await API({ url: '/admin/userinfo', data: {} }) adminData.value = result - rechargeUser.value.adminId = adminData.value.adminId + rechargeUser.value.adminId = adminData.value.id console.log('请求成功', result) console.log('用户信息', adminData.value) } catch (error) { @@ -25,7 +25,7 @@ const tableData = ref([]) // 搜索=========================================== // 搜索recharge const rechargeUser = ref({ - adminId: adminData.value.adminId + adminId: adminData.value.id }) // 搜索对象 const getObj = ref({ @@ -205,8 +205,8 @@ const get = async function (val) { const data = resultTotalGold.data console.log('获取到的金币数据:', data) - permanentGolds.value = (Number(data.permanentGolds) || 0) / 100 - freeGolds.value = (Number(data.freeGolds) || 0) / 100 + permanentGolds.value = (Number(data.permanentGolds) || 0) + freeGolds.value = (Number(data.freeGolds) || 0) } @@ -352,7 +352,7 @@ const handleSortChange = (column) => { } else if (column.prop === 'permanentGold') { sortField.value = 'permanentGold' } - sortOrder.value = column.order === 'ascending' ? '1' : '0' + sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' console.log('传递给后端的排序字段：', sortField.value) console.log('传递给后端的排序方式：', sortOrder.value) get() @@ -418,9 +418,9 @@ const handleSortChange = (column) => {
- 充值金额：{{ (permanentGolds + freeGolds).toFixed(2) }}新币，永久金币：{{ - permanentGolds.toFixed(2) - }}金币，免费金币：{{ freeGolds }}金币 + 充值金额：{{ (permanentGolds ) /100 }}新币，永久金币：{{ + permanentGolds /100 + }}金币，免费金币：{{ freeGolds /100 }}金币
diff --git a/src/views/refund/addCoinRefund.vue b/src/views/refund/addCoinRefund.vue index 58711a4..7bf0614 100644 --- a/src/views/refund/addCoinRefund.vue +++ b/src/views/refund/addCoinRefund.vue @@ -22,7 +22,7 @@ const getAdminData = async function () { try { const result = await API({ url: '/admin/userinfo', data: {} }) adminData.value = result - addRefund.value.adminId = adminData.value.adminId + addRefund.value.adminId = adminData.value.id console.log('请求成功', result) console.log('用户信息', user.value) } catch (error) { @@ -61,7 +61,7 @@ const cancel = function () { taskGold: '', sumGold: 0, remark: '', - adminId: adminData.value.adminId + adminId: adminData.value.id } addRe.value.typeR = '0' } @@ -81,8 +81,7 @@ const add = async function () { permanentGold: (Number(addRefund.value.permanentGold) || 0) * 100, freeGold: (Number(addRefund.value.freeGold) || 0) * 100, taskGold: (Number(addRefund.value.taskGold) || 0) * 100, - sumGold: (Number(addRefund.value.sumGold) || 0) * 100, - adminId: 1 + sumGold: (Number(addRefund.value.sumGold) || 0) * 100 } // 发送POST请求 @@ -272,6 +271,16 @@ const selectedGoodsGold = ref({ taskGold: 0 }) +// 处理退款方式切换，当部分退款切换全部退款时，退款金额应自动重新填充 +const handleRefundModelChange = () =>{ + if (addRe.value.typeR === '0') { + // 全部退款时 + addRefund.value.permanentGold = selectedGoodsGold.value.permanentGold; + addRefund.value.freeGold = selectedGoodsGold.value.freeGold; + addRefund.value.taskGold = selectedGoodsGold.value.taskGold; + } +} + const handleSelectionChange = (selectedOption) => { if (selectedOption) { // 更新商品名称 @@ -298,6 +307,11 @@ const validateGoldInput = (type, value) => { if (isNaN(inputValue)) { return 0; } + if (inputValue > maxValue) { + // 当输入金额大于商品金额时，显示提示信息 + ElMessage.warning('所填金额大于该类金币余额'); + return maxValue; + } return Math.min(inputValue, maxValue); } @@ -321,7 +335,7 @@ const calculatedRechargeGoods = computed(() => { const permanentGold = addRefund.value.permanentGold === '' ? 0 : +addRefund.value.permanentGold; const freeGold = addRefund.value.freeGold === '' ? 0 : +addRefund.value.freeGold; const taskGold = addRefund.value.taskGold === '' ? 0 : +addRefund.value.taskGold; - return permanentGold + freeGold + taskGold; + return Number((permanentGold + freeGold + taskGold).toFixed(8)); }) watch(calculatedRechargeGoods, (newVal) => { @@ -393,8 +407,8 @@ onMounted(async function () { - - 全部退款 + + 全部退款 部分退款 diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue index 64802e1..070a24b 100644 --- a/src/views/refund/coinRefundDetail.vue +++ b/src/views/refund/coinRefundDetail.vue @@ -63,7 +63,7 @@ const freeGolds = ref(0) const taskGolds = ref(0) // 计算总金币数 -const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value) +const sumGolds = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value) // 退款类型 const refundType = ref([]) @@ -182,6 +182,7 @@ const reset = function () { sortField.value = '' sortOrder.value = '' getTime.value = {} + getSelectBy() } // 今天 const getToday = function () { @@ -346,15 +347,17 @@ const handleSortChange = (column) => { console.log('排序字段：', column.prop) console.log('排序方式：', column.order) if (column.prop === 'permanentGold') { - sortField.value = 'permanent_gold' + sortField.value = 'permanentGold' } else if (column.prop === 'taskGold') { - sortField.value = 'task_gold' + sortField.value = 'taskGold' } else if (column.prop === 'freeGold') { - sortField.value = 'free_gold' + sortField.value = 'freeGold' } else if (column.prop === 'createTime') { - sortField.value = 'create_time' + sortField.value = 'createTime' } else if (column.prop === 'auditTime') { - sortField.value = 'audit_time' + sortField.value = 'auditTime' + } else if (column.prop === 'sumGold') { + sortField.value = 'sumGold' } sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' getSelectBy() @@ -478,7 +481,7 @@ const handleCurrentChange = function (val) {
- 退款金币总数：{{ Math.abs(sumGold) / 100 }}，永久金币：{{ + 退款金币总数：{{ Math.abs(sumGolds) / 100 }}，永久金币：{{ Math.abs(permanentGolds) / 100 }}，免费金币：{{ Math.abs(freeGolds) / 100 }}，任务金币：{{ Math.abs(taskGolds) / 100 @@ -521,13 +524,21 @@ const handleCurrentChange = function (val) { - + + + + - + - +