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

src/views/recharge/addCoinRecharge.vue

@@ -225,22 +225,27 @@ const rules = reactive({
     trigger: 'blur'
   }],
   
-  money: [{
-    required: true,
-    message: '请输入充值金额',
-    trigger: 'blur'
-  }, {
-    validator: (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入充值金额'));
-      } else if (value < 0) {
-        callback(new Error('金额不能小于0'));
-      } else {
-        callback();
-      }
-    },
-    trigger: 'blur'
-  }],
+  money: [
+    { required: true, message: '请输入充值金额', trigger: 'blur' },
+    {
+      validator: (rule, value, callback) => {
+        // 检查是否包含特殊符号
+        if (/[^0-9.]/.test(value)) {
+          callback(new Error('不能包含特殊符号或负数'));
+          return;
+        }
+        const numValue = Number(value);
+        if (isNaN(numValue)) {
+          callback(new Error('请输入有效的数字'));
+        } else if (numValue < 0) {
+          callback(new Error('输入金额不能小于0'));
+        } else {
+          callback();
+        }
+      },
+      trigger: 'blur'
+    }
+  ],
   payModel: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
   payTime: [{ required: true, message: '请选择交款时间', trigger: 'blur' }]
 });
@@ -260,10 +265,12 @@ const getUser = async function (jwcode) {
     })
     console.log('请求成功', result)
 
+    
     if (result.code === 0) {
       ElMessage.error(result.msg);
     } else if (result.data === null) {
       ElMessage.error("用户不存在");
+      recharge.value.jwcode = ''
     } else {
       user.value = result.data;
       console.log("用户信息", user.value);
@@ -272,32 +279,32 @@ const getUser = async function (jwcode) {
   } catch (error) {
     console.log("请求失败", error);
     ElMessage.error("查询失败，请检查精网号是否正确");
-    // 在这里可以处理错误逻辑，比如显示错误提示等
+    recharge.value.jwcode = ''
   }
 }
 
 // 这是查询活动的接口，一期没有调用这个接口
 const activity = ref([])
-const getActivity = async function () {
-  try {
-    // 发送POST请求
-    const result = await API({
-      url: '/general/activity',
-      data: {
+// const getActivity = async function () {
+//   try {
+//     // 发送POST请求
+//     const result = await API({
+//       url: '/general/activity',
+//       data: {
         
-      }
-    })
-
-    // 将响应结果存储到响应式数据中
-    console.log('请求成功', result)
-    // 存储表格数据
-    activity.value = result.data
-    console.log('活动信息', activity.value)
-  } catch (error) {
-    console.log('activity请求失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
+//       }
+//     })
+
+//     // 将响应结果存储到响应式数据中
+//     console.log('请求成功', result)
+//     // 存储表格数据
+//     activity.value = result.data
+//     console.log('活动信息', activity.value)
+//   } catch (error) {
+//     console.log('activity请求失败', error)
+//     // 在这里可以处理错误逻辑，比如显示错误提示等
+//   }
+// }
 
 
 
@@ -467,7 +474,7 @@ onMounted(() => {
     class="add-form"
   >
     <el-form-item prop="jwcode" label="精网号">
-      <el-input v-model="recharge.jwcode" style="width: 220px" />
+      <el-input v-model="recharge.jwcode" style="width: 220px"  @blur="getUser(recharge.jwcode)" />
       <el-button
         type="primary"
         @click="getUser(recharge.jwcode)"

src/views/refund/addCoinRefund.vue

@@ -192,6 +192,7 @@ const getUser = async function (jwcode) {
       ElMessage.error(result.msg);
     } else if (result.data === null) {
       ElMessage.error("用户不存在");
+      addRefund.value.jwcode = ''; // 精网号清空
     } else {
       // 对传过来的金币数除以 100
       const processedData = {
@@ -209,6 +210,7 @@ const getUser = async function (jwcode) {
   } catch (error) {
     console.log("请求失败", error);
     ElMessage.error("查询失败，请检查精网号是否正确");
+    addRefund.value.jwcode = ''; // 精网号清空
     
   }
 }
@@ -216,30 +218,30 @@ const getUser = async function (jwcode) {
 
 
 
-// 退款类型
-const refundType = ref([])
+// 退款类型，写死为商品退款
+const refundType = ref([{ value: '商品退款', label: '商品退款' }]);
 
 // 获取退款类型
-const getRefundTypes = async function () {
-  try {
-    // 发送请求获取退款类型
-    const result = await API({ 
-      url: '/refund/refundType', //这里应该写上一个退款类型的接口
-      data: {} })
-    console.log('退款类型请求成功', result)
-    // 检查返回的数据是否为数组
-    if (Array.isArray(result.data)) {
-      // 将字符串数组转换为 { value, label } 格式
-      refundType.value = result.data.map(item => ({ value: item, label: item }));
-    } else {
-      console.error('退款类型数据格式错误', result)
-      ElMessage.error('退款类型数据格式错误，请联系管理员')
-    }
-    console.log('退款类型', refundType.value)
-  } catch (error) {
-    console.log('退款类型请求失败', error)
-  }
-}
+// const getRefundTypes = async function () {
+//   try {
+//     // 发送请求获取退款类型
+//     const result = await API({ 
+//       url: '/refund/refundType', //这里应该写上一个退款类型的接口
+//       data: {} })
+//     console.log('退款类型请求成功', result)
+//     // 检查返回的数据是否为数组
+//     if (Array.isArray(result.data)) {
+//       // 将字符串数组转换为 { value, label } 格式
+//       refundType.value = result.data.map(item => ({ value: item, label: item }));
+//     } else {
+//       console.error('退款类型数据格式错误', result)
+//       ElMessage.error('退款类型数据格式错误，请联系管理员')
+//     }
+//     console.log('退款类型', refundType.value)
+//   } catch (error) {
+//     console.log('退款类型请求失败', error)
+//   }
+// }
 
 
 
@@ -395,7 +397,7 @@ watch(calculatedRechargeGoods, (newVal) => {
 // 挂载
 onMounted(async function () {
   await getAdminData()
-  await getRefundTypes()
+  // await getRefundTypes()
   // await getGoods()
 })
 </script>
@@ -416,6 +418,7 @@ onMounted(async function () {
         v-model="addRefund.jwcode"
         style="width: 220px"
         @change="getGoods(addRefund.jwcode)"
+        @blur="getUser(addRefund.jwcode)"
       />
       <el-button
         type="primary"

src/views/refund/coinRefundDetail.vue

@@ -390,32 +390,13 @@ const handleCurrentChange = function (val) {
               />
             </div>
           </el-col>
+          
           <el-col :span="6">
             <div class="head-card-element">
-              <el-text class="mx-1"  >退款类型：</el-text>
-              <el-select
-                v-model="refundUser.refundType"
-                placeholder="请选择退款类型"
-                 
-                style="width: 180px"
-                clearable
-              >
-<!--                todo 这需要改-->
-                <el-option
-                  v-for="item in refundType"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="6">
-            <div class="head-card-element">
-              <el-text class="mx-1"  >退款商品：</el-text>
+              <el-text class="mx-1"  >商品名称：</el-text>
               <el-select
                 v-model="refundUser.goodsName"
-                placeholder="请选择退款商品"
+                placeholder="请选择商品名称"
                  
                 style="width: 180px"
                 clearable
@@ -449,6 +430,26 @@ const handleCurrentChange = function (val) {
               </el-select>
             </div>
           </el-col>
+          <el-col :span="6">
+            <div class="head-card-element">
+              <el-text class="mx-1"  >退款类型：</el-text>
+              <el-select
+                v-model="refundUser.refundType"
+                placeholder="请选择退款类型"
+                 
+                style="width: 180px"
+                clearable
+              >
+<!--                todo 这需要改-->
+                <el-option
+                  v-for="item in refundType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="21">