success Merge branch 'milestone-20250623-金币前端' into zhangrenyuan/feature-20250623164058-金币前端

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"
     }
   ],
@@ -107,15 +107,19 @@ function validateInput() {
   if (user.value.jwcode == null) {
     ElMessage.warning("请先查询用户信息");
     addConsume.value.sumGold = null;
+    user.value  =  {};
     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;
+    }
+    */
 
 
   // 验证金币总和
@@ -285,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,
@@ -293,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;
@@ -306,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);