From 9f316c9c326758146563c939daa60d7af674ec2b Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Wed, 14 Jan 2026 09:34:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E7=8E=B0=E9=87=91?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E5=8F=8A?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/zh-CN.js | 2 +- src/global.css | 12 ++- src/views/consume/gold/addCoinConsume.vue | 80 +++++++++------- src/views/consume/gold/coinConsumeDetail.vue | 1 - .../moneyManage/financialAccount/cashFlow.vue | 104 ++++++++++++++++++++- src/views/recharge/gold/addCoinRecharge.vue | 28 ++++-- src/views/refund/gold/addCoinRefund.vue | 53 +++++++---- 7 files changed, 209 insertions(+), 71 deletions(-) diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index bf3cec9..e4204d7 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -205,7 +205,7 @@ export default { searchSuccess: "查询成功", searchFailed: "查询失败", requestFailed: "请求失败", - jwcodeError: "精网号错误", + jwcodeError: "精网号有误！请检查", customerSuccess: "客户信息查询成功", customerNotExist: "客户不存在", addFailedUnknown: "添加失败，未知错误", diff --git a/src/global.css b/src/global.css index 6ba147f..29d7796 100644 --- a/src/global.css +++ b/src/global.css @@ -1,3 +1,13 @@ body { font-family: 'Microsoft YaHei UI'; -} \ No newline at end of file +} + +/* 自定义蓝色消息提示样式 */ +.custom-blue-message { + /* 纯蓝色背景，白色文字 */ + --el-message-bg-color: #409eff; + --el-message-border-color: #409eff; + --el-message-text-color: #ffffff; + --el-message-icon-color: #ffffff; + --el-message-close-icon-color: #ffffff; +} diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue index f43bb3b..c9291f8 100644 --- a/src/views/consume/gold/addCoinConsume.vue +++ b/src/views/consume/gold/addCoinConsume.vue @@ -449,48 +449,56 @@ const getUser = async function (jwcode) { }); console.log("请求成功", result); + const { code, data } = result + const region = data && data.market + + if (!data || Object.keys(data).length === 0) { + user.value = {} + // addConsume.value.jwcode = null // Optional: clear input or keep it for correction + ElMessage.error(t('elmessage.jwcodeError')) + return + } - if (result.code === 200 && result.data) { - // 处理用户数据 - user.value = { - ...result.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 - }; - - ElMessage.success(t('elmessage.searchSuccess')); - // 检查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; - } + // 处理用户数据 + user.value = { + ...data, + // 统一处理所有黄金数值，除以100 + 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 + }; + + // 检查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; } + } - - } else if (!result.data) { - ElMessage.warning(t('elmessage.noUser')); - user.value.jwcode = null - addConsume.value.jwcode = null - // resetForm(); // 重置表单 - } else { - ElMessage.warning(result.msg || t('elmessage.checkQueryParams')); + if (code === 0 && region) { + ElMessage.info({ + message: `该用户属于【${region}】地区`, + customClass: 'custom-blue-message' + }) + return } + + ElMessage.success(t('elmessage.searchSuccess')); + } catch (error) { console.error("请求失败", error); - ElMessage.error(t('elmessage.queryFailed')); + ElMessage.error(t('elmessage.jwcodeError')); resetForm(); // 重置表单 } }; diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index a8f29ad..295810f 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -665,7 +665,6 @@ const getMarket = async function () { -_list + + + + diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue index 5d78f43..c5062cf 100644 --- a/src/views/recharge/gold/addCoinRecharge.vue +++ b/src/views/recharge/gold/addCoinRecharge.vue @@ -439,16 +439,26 @@ const getUser = async function (jwcode) { } }) + const { code, data } = result + const region = data && data.market - if (result.code === 0) { - ElMessage.error(result.msg); - } else if (result.data === null) { - ElMessage.error(t('elmessage.noUser')); - } else { - user.value = result.data; - console.log("用户信息", user.value); - ElMessage.success(t('elmessage.searchSuccess')); + if (!data || Object.keys(data).length === 0) { + user.value = {} + ElMessage.error(t('elmessage.jwcodeError')) + return + } + + user.value = data + + if (code === 0 && region) { + ElMessage.info({ + message: `该用户属于【${region}】地区`, + customClass: 'custom-blue-message' + }) + return } + + ElMessage.success(t('elmessage.searchSuccess')) } catch (error) { console.log("请求失败", error); ElMessage.error(t('elmessage.jwcodeError')); @@ -969,4 +979,4 @@ p { height: 50px; text-align: center; } - \ No newline at end of file + diff --git a/src/views/refund/gold/addCoinRefund.vue b/src/views/refund/gold/addCoinRefund.vue index 0abb825..8469654 100644 --- a/src/views/refund/gold/addCoinRefund.vue +++ b/src/views/refund/gold/addCoinRefund.vue @@ -233,6 +233,7 @@ const getUser = async function (jwcode) { // 验证精网号是否为数字 if (!/^\d{1,9}$/.test(jwcode)) { + ElMessage.warning(t('elmessage.limitJwcodeNine')); cancel() return; } @@ -244,31 +245,43 @@ const getUser = async function (jwcode) { jwcode: addRefund.value.jwcode } }) - console.log('请求成功', result) + + const { code, data } = result + const region = data && data.market + if (!data || Object.keys(data).length === 0) { + user.value = {} + restGoods() + tableData.value = [] + ElMessage.error(t('elmessage.jwcodeError')) + return + } + + // 对传过来的金币数除以 100 + const processedData = { + ...data, + historySumGold: (Number(data.historySumGold) || 0), + nowSumGold: (Number(data.nowSumGold) || 0), + nowPermanentGold: (Number(data.nowPermanentGold) || 0), + nowFreeGold: (Number(data.nowFreeGold) || 0), + nowTaskGold: (Number(data.nowTaskGold) || 0) + } + user.value = processedData; + // 重置订单信息 restGoods() - //在此处错误逻辑的提示做了注释，在后续商品查询接口返回错误时，提示信息会显示在弹窗中 - if (result.code === 0) { - ElMessage.error(result.msg); - } else if (result.data === null) { - ElMessage.error(t('elmessage.noUser')); - } else { - // 对传过来的金币数除以 100 - const processedData = { - ...result.data, - historySumGold: (Number(result.data.historySumGold) || 0), - nowSumGold: (Number(result.data.nowSumGold) || 0), - nowPermanentGold: (Number(result.data.nowPermanentGold) || 0), - nowFreeGold: (Number(result.data.nowFreeGold) || 0), - nowTaskGold: (Number(result.data.nowTaskGold) || 0) - } - user.value = processedData; - console.log("用户信息", user.value); + tableData.value = [] + addRefund.value.refundType = '' - tableData.value = [] - addRefund.value.refundType = '' + if (code === 0 && region) { + ElMessage.info({ + message: `该用户属于【${region}】地区`, + customClass: 'custom-blue-message' + }) + return } + + ElMessage.success(t('elmessage.searchSuccess')) } catch (error) { console.log("请求失败", error); ElMessage.error(t('elmessage.jwcodeError'));