From b89e4c85fe786778c420d076e3381deab9ed1573 Mon Sep 17 00:00:00 2001 From: lihui Date: Mon, 7 Jul 2025 10:50:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(consume):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=87=91=E5=B8=81?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/addCoinConsume.vue | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index c07cbf4..e1b4611 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -69,8 +69,8 @@ const rules = reactive({ sumGold: [ {required: true, message: "消费金币总数不能为空", trigger: "blur"}, { - pattern: /^\d+(\.\d{1})?$/, - message: "只能输入最多一个小数点的数字", + pattern: /^\d+(\.\d+)?$/, + message: "请检查输入的数字格式是否正确", trigger: "blur" } ], @@ -109,13 +109,16 @@ function validateInput() { addConsume.value.sumGold = null; return false; } - // 验证金币数值 - if (user.value.jwcode && (isNaN(sumGold) || sumGold <= 0)) { - ElMessage.warning("消费金币总数必须是大于0的数字"); - // 将sumGold设置为null - addConsume.value.sumGold = null; - return false; - } + + /* 这块逻辑加到规则里面 + // 验证金币数值 + if (user.value.jwcode && (isNaN(sumGold) || sumGold <= 0)) { + ElMessage.warning("消费金币总数必须是大于0的数字"); + // 将sumGold设置为null + addConsume.value.sumGold = null; + return false; + } + */ // 验证金币总和 From 791883fc742638fdbfd93f5ee4b375926841bd62 Mon Sep 17 00:00:00 2001 From: lihui Date: Mon, 7 Jul 2025 10:54:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=87=91?= =?UTF-8?q?=E5=B8=81=E6=B6=88=E8=B4=B9=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/addCoinConsume.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index e1b4611..17ce5fe 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -70,7 +70,7 @@ const rules = reactive({ {required: true, message: "消费金币总数不能为空", trigger: "blur"}, { pattern: /^\d+(\.\d+)?$/, - message: "请检查输入的数字格式是否正确", + message: "存在负数或数字格式不正确，请输入正数", trigger: "blur" } ], From 7e7b60f97e57f65ea22efa43322f4418a06d6c12 Mon Sep 17 00:00:00 2001 From: lihui Date: Mon, 7 Jul 2025 11:28:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(consume):=20=E4=BC=98=E5=8C=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重置用户信息：当用户不存在时，清空用户信息并重置表单 --- src/views/consume/addCoinConsume.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue index 17ce5fe..be945f8 100644 --- a/src/views/consume/addCoinConsume.vue +++ b/src/views/consume/addCoinConsume.vue @@ -107,6 +107,7 @@ function validateInput() { if (user.value.jwcode == null) { ElMessage.warning("请先查询用户信息"); addConsume.value.sumGold = null; + user.value = {}; return false; } @@ -288,7 +289,7 @@ const getUser = async function (jwcode) { // 发送POST请求 const result = await request({ // url: "user/selectUser", - url: "/user/selectUser", // todo 服务器改回无ip的 + url: "/user/selectUser", data: { // 只需要传精网号 jwcode: addConsume.value.jwcode, @@ -296,7 +297,7 @@ const getUser = async function (jwcode) { }); console.log("请求成功", result); - if (result.code === 200) { + if (result.code === 200 && result.data !== null) { user.value = result.data; user.value.nowPermanentGold = result.data.nowPermanentGold / 100; user.value.nowFreeGold = result.data.nowFreeGold / 100; @@ -309,11 +310,13 @@ const getUser = async function (jwcode) { user.value.historyPermanentGold = (result.data.historyPermanentGold) / 100; user.value.historyFreeGold = (result.data.historyFreeGold) / 100; user.value.historyTaskGold = (result.data.historyTaskGold) / 100; + } else if (result.data == null){ + ElMessage.warning("用户不存在"); + // 重置表单 + resetForm(); } - if (result.code === 0) { + else if (result.code === 0 ) { ElMessage.warning("请检查查询参数") - } else if (result.data === null) { - ElMessage.error("用户不存在"); } else { console.log("用户信息", user.value); ElMessage.success(result.msg);