From e59945e0bb1acdfa218897624fbb4c7c421773e0 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 8 Jul 2025 18:16:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(consume):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/coinConsumeDetail.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index 9c55998..587e9c9 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -254,6 +254,7 @@ const reset = function () { consumeUser.value.startTime = '' consumeUser.value.endTime = '' + consumeUser.value.jwcode = null sortField.value = '' @@ -430,6 +431,14 @@ onMounted(async function () {
+ 精网号： + + +
+ + +
商品名称： From c6c1cde31eb18fbffc425449e87c0139f14d9b37 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 8 Jul 2025 18:29:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=B2=BE=E7=BD=91?= =?UTF-8?q?=E5=8F=B7=E7=AD=9B=E9=80=89=E6=80=BB=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/coinConsumeDetail.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index 587e9c9..18200db 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -95,6 +95,7 @@ const taskGolds = ref(0) const goods = ref([]) const totalGoldSearch = ref({ + jwcode: null, payPlatform: "", market: "", startTime: "", @@ -177,6 +178,7 @@ const ConsumeSelectBy = async function (val) { totalGoldSearch.value.payPlatform = consumeUser.value.payPlatform totalGoldSearch.value.market = consumeUser.value.market totalGoldSearch.value.goodsName = consumeUser.value.goodsName + totalGoldSearch.value.jwcode = consumeUser.value.jwcode // const resultTotalGold = await request({ // url: '/consume/statsGold', From ffe4eefe49c4067ae4b6ebe0dc3a4ed196f9f6ee Mon Sep 17 00:00:00 2001 From: lihui Date: Wed, 9 Jul 2025 09:57:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(consume):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8E=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=87=91=E5=B8=81=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/addCoinConsume.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index 5c0ad41..ce2f242 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -383,9 +383,20 @@ const getUser = async function (jwcode) { }; ElMessage.success("查询成功"); - // 检查，sumGold + // 检查sumGold是否有值，如果有则重新计算金币分配 + if (addConsume.value.sumGold) { + const parsedSumGold = parseFloat(addConsume.value.sumGold); + if (!isNaN(parsedSumGold) && parsedSumGold > 0) { + const {free, permanent, task} = calculateCoins(parsedSumGold); + addConsume.value.freeGold = free; + addConsume.value.permanentGold = permanent; + addConsume.value.taskGold = task; + } + } + // 验证输入 validateInput() + } else if (!result.data) { ElMessage.warning("用户不存在"); user.value.jwcode = null @@ -451,6 +462,7 @@ watch( onMounted(async function () { await getAdminData(); await getGoods(); + await getUser() }); From 54f2ad7a28fd309258357b1a2f29c1e6763f3016 Mon Sep 17 00:00:00 2001 From: lihui Date: Wed, 9 Jul 2025 10:23:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20-=20=E7=A7=BB=E9=99=A4=20addCoi?= =?UTF-8?q?nConsume=20=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=86=97?= =?UTF-8?q?=E4=BD=99=E5=87=BD=E6=95=B0=E8=B0=83=E7=94=A8=20-=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20coinRechargeDetail=20=E7=BB=84=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E5=88=97=E7=9A=84=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/addCoinConsume.vue | 2 -- src/views/recharge/coinRechargeDetail.vue | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index ce2f242..aaaf5e9 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -462,7 +462,6 @@ watch( onMounted(async function () { await getAdminData(); await getGoods(); - await getUser() }); @@ -489,7 +488,6 @@ onMounted(async function () { { - +