diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index d170d21..2c46ff6 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -349,7 +349,7 @@ const resetSearch = function () {
startTime: "",
endTime: "",
market: "",
- auditStatus: "0"
+ // auditStatus: "0"
}
getTime.value = []
getRecharge()
diff --git a/src/views/consume/addCoinConsume.vue b/src/views/consume/addCoinConsume.vue
index 458c54b..5c0ad41 100644
--- a/src/views/consume/addCoinConsume.vue
+++ b/src/views/consume/addCoinConsume.vue
@@ -144,9 +144,30 @@ function validateInput() {
return false;
}
- // 小数位数限制 2位
+// 小数位数限制 2位，整数位数限制 6位
if (addConsume.value.sumGold) {
const sumGoldStr = addConsume.value.sumGold.toString();
+
+ // 检查整数部分长度
+ if (sumGoldStr.includes('.')) {
+ const integerPart = sumGoldStr.split('.')[0];
+ if (integerPart.length > 6) {
+ // 截断整数部分到6位并提示
+ const truncatedInteger = integerPart.slice(0, 6);
+ addConsume.value.sumGold = parseFloat(truncatedInteger);
+ ElMessage.info('整数部分最多允许6位');
+ return; // 直接返回，不再处理小数部分
+ }
+ } else {
+ // 纯整数情况
+ if (sumGoldStr.length > 6) {
+ addConsume.value.sumGold = parseFloat(sumGoldStr.slice(0, 6));
+ ElMessage.info('整数部分最多允许6位');
+ return;
+ }
+ }
+
+ // 处理小数部分
if (sumGoldStr.includes('.')) {
const decimalPart = sumGoldStr.split('.')[1];
if (decimalPart.length > 2) {
@@ -160,7 +181,6 @@ function validateInput() {
-
// 验证金币总和
const totalAvailableGold = (user.value.nowSumGold)
if (user.value.jwcode && sumGold > totalAvailableGold) {
@@ -323,48 +343,61 @@ const addBefore = () => {
};
// 查询客户信息（通过精网号）
const getUser = async function (jwcode) {
- trimJwCode();
try {
+ // 验证精网号
+ if (!jwcode) {
+ ElMessage.warning('精网号不能为空');
+ return;
+ }
+
+ // 验证精网号是否为数字
+ if (!/^\d+$/.test(jwcode)) {
+ ElMessage.warning('精网号必须为数字');
+ resetForm()
+ return;
+ }
+
// 发送POST请求
const result = await request({
- // url: "user/selectUser",
url: "/user/selectUser",
- data: {
- // 只需要传精网号
- jwcode: addConsume.value.jwcode,
- },
+ data: { jwcode }
});
+
console.log("请求成功", result);
- 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;
- user.value.nowSumGold = result.data.nowSumGold / 100;
- user.value.nowTaskGold = result.data.nowTaskGold / 100;
- user.value.nowFreeJune = (result.data.nowFreeJune) / 100;
- user.value.nowFreeDecember = (result.data.nowFreeDecember) / 100;
-
- user.value.historySumGold = (result.data.historySumGold) / 100;
- 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) {
+ if (result.code === 200 && result.data) {
+ // 处理用户数据
+ user.value = {
+ ...result.data,
+ // 统一处理所有黄金数值，除以100
+ nowPermanentGold: result.data.nowPermanentGold / 100,
+ nowFreeGold: result.data.nowFreeGold / 100,
+ nowSumGold: result.data.nowSumGold / 100,
+ nowTaskGold: result.data.nowTaskGold / 100,
+ nowFreeJune: result.data.nowFreeJune / 100,
+ nowFreeDecember: result.data.nowFreeDecember / 100,
+ historySumGold: result.data.historySumGold / 100,
+ historyPermanentGold: result.data.historyPermanentGold / 100,
+ historyFreeGold: result.data.historyFreeGold / 100,
+ historyTaskGold: result.data.historyTaskGold / 100
+ };
+
+ ElMessage.success("查询成功");
+ // 检查，sumGold
+ validateInput()
+
+ } else if (!result.data) {
ElMessage.warning("用户不存在");
- // 重置表单
- resetForm();
- } else if (result.code === 0) {
- ElMessage.warning("请检查查询参数")
+ user.value.jwcode = null
+ addConsume.value.jwcode = null
+ // resetForm(); // 重置表单
} else {
- console.log("用户信息", user.value);
- ElMessage.success(result.msg);
+ ElMessage.warning(result.msg || "请检查查询参数");
}
} catch (error) {
- console.log("请求失败", error);
- ElMessage.error("查询失败，请检查精网号是否正确");
- // 重置表单
- resetForm();
- // 在这里可以处理错误逻辑，比如显示错误提示等
+ console.error("请求失败", error);
+ ElMessage.error("查询失败，请检查网络连接或精网号是否正确");
+ resetForm(); // 重置表单
}
};
// 获取商品信息(三楼接口)
diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 9f59687..c995ecc 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -280,12 +280,27 @@ function handleInput(value) {
value = value.substring(1);
}
- // 最多两位小数，超过时才显示提示
+// 最多两位小数，超过时才显示提示
if (value.includes('.')) {
const parts = value.split('.')
+ // 限制整数部分最多六位
+ if (parts[0].length > 6) {
+ parts[0] = parts[0].slice(0, 6)
+ ElMessage.info('整数部分最多允许六位')
+ }
+ // 限制小数部分最多两位
if (parts[1].length > 2) {
- value = parts[0] + '.' + parts[1].slice(0, 2)
+ parts[1] = parts[1].slice(0, 2)
+ value = parts[0] + '.' + parts[1]
ElMessage.info('最多允许两位小数')
+ } else {
+ value = parts[0] + '.' + parts[1]
+ }
+ } else {
+ // 纯整数时限制最多六位
+ if (value.length > 6) {
+ value = value.slice(0, 6)
+ ElMessage.info('整数部分最多允许六位')
}
}
@@ -424,19 +439,19 @@ onMounted(async function () {
/>
+
- :1
-
+ :1
+
(提示：当前规则每
{{ rateEdit.num }}
- {{ rateEdit.rateName }}
- 可兑换 1 新币)
-
+ {{ rateEdit.rateName }}可兑换 1 新币)
+