From b598bac32618bc27a67875e811657144d568e2fd Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Wed, 21 Jan 2026 17:12:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=80=80=E6=AC=BE):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel=E6=97=B6=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9C=AA=E5=B1=95=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复coinRefundDetail.vue中导出Excel时refundUser未展开导致参数丢失的问题 同时将auditTime字段改为createTime以保持一致性 优化addCoinConsume.vue中的用户查询逻辑，增加区域提示并完善错误处理 --- src/views/consume/gold/addCoinConsume.vue | 55 ++++++++++++++++++------------ src/views/refund/gold/coinRefundDetail.vue | 10 +++--- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue index 7348091..67427c1 100644 --- a/src/views/consume/gold/addCoinConsume.vue +++ b/src/views/consume/gold/addCoinConsume.vue @@ -499,7 +499,10 @@ const getUser = async function (jwcode) { console.log("请求成功", result); - if (result.code === 200 && result.data) { + const { code, data } = result; + const region = data && data.market; + + if (data && Object.keys(data).length > 0) { // 查询成功后，重置表单（保留精网号），防止上一个用户的数据干扰 const currentJwcode = addConsume.value.jwcode; resetForm(); @@ -507,37 +510,47 @@ const getUser = async function (jwcode) { // 处理用户数据 user.value = { - ...result.data, + ...data, // 统一处理所有黄金数值，除以100 - nowPermanentGold: result.data.nowPermanentGold, - nowFreeGold: result.data.nowFreeGold, - nowSumGold: result.data.nowSumGold, - nowTaskGold: result.data.nowTaskGold, - nowFreeJune: result.data.nowFreeJune, - nowFreeDecember: result.data.nowFreeDecember, - historySumGold: result.data.historySumGold, - historyPermanentGold: result.data.historyPermanentGold, - historyFreeGold: result.data.historyFreeGold, - historyTaskGold: result.data.historyTaskGold + nowPermanentGold: data.nowPermanentGold, + nowFreeGold: data.nowFreeGold, + nowSumGold: data.nowSumGold, + nowTaskGold: data.nowTaskGold, + nowFreeJune: data.nowFreeJune, + nowFreeDecember: data.nowFreeDecember, + historySumGold: data.historySumGold, + historyPermanentGold: data.historyPermanentGold, + historyFreeGold: data.historyFreeGold, + historyTaskGold: data.historyTaskGold }; - ElMessage.success(t('elmessage.searchSuccess')); + if (code === 0 && region) { + ElMessage.info({ + message: t('elmessage.userRegionHint', { region }), + customClass: 'custom-blue-message' + }); + return; + } - // 如果当前开启了红包模式，获取红包列表 - if (addConsume.value.redMoney === 1) { + if (code === 200) { + ElMessage.success(t('elmessage.searchSuccess')); + + // 如果当前开启了红包模式，获取红包列表 + if (addConsume.value.redMoney === 1) { getRedList() + } + + // 验证输入 + validateInput() + } else { + ElMessage.warning(result.msg || t('elmessage.checkQueryParams')); } - // 验证输入 - validateInput() - - } else if (!result.data) { + } else { ElMessage.warning(t('elmessage.noUser')); user.value.jwcode = null addConsume.value.jwcode = null // resetForm(); // 重置表单 - } else { - ElMessage.warning(result.msg || t('elmessage.checkQueryParams')); } } catch (error) { console.error("请求失败", error); diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue index 7d64066..a50ad59 100644 --- a/src/views/refund/gold/coinRefundDetail.vue +++ b/src/views/refund/gold/coinRefundDetail.vue @@ -637,11 +637,11 @@ const getMarket = async function () { - - - + + +