Merge branch 'main' of http://18.167.251.121:10003/aidlab/lanecarford_front

src/utils/request.ts

@@ -89,8 +89,7 @@ service.interceptors.response.use(
         position: 'top',
         icon: 'none'
       })
-
-      return Promise.reject(new Error('error'))
+      return Promise.reject(new Error(res.errMsg || res.message || 'error'))
     } else {
       // 默认只返回data，不返回状态码和message
       // 通过 meta 中的 responseAll 配置来取决后台是否返回所有数据(包括状态码，message和data)

src/views/login/SignupPage.vue

@@ -88,38 +88,31 @@ const validatePassword = (password: string) => {
 
 // 验证表单
 const validateForm = () => {
-  let isValid = true
-
-  // 重置错误信息
-  formErrors.name = ''
-  formErrors.email = ''
-  formErrors.password = ''
-
   // 验证邮箱
   if (!formData.name) {
-    formErrors.name = '请输入姓名'
-    isValid = false
+    showToast('Please input your name')
+    return false
   }
 
   // 验证邮箱
   if (!formData.email) {
-    formErrors.email = '请输入邮箱地址'
-    isValid = false
+    showToast('Please input your email')
+    return false
   } else if (!validateEmail(formData.email)) {
-    formErrors.email = '请输入有效的邮箱地址'
-    isValid = false
+    showToast('Please input valid email')
+    return false
   }
 
   // 验证密码
   if (!formData.password) {
-    formErrors.password = '请输入密码'
-    isValid = false
+    showToast('Please input password')
+    return false
   } else if (!validatePassword(formData.password)) {
-    formErrors.password = '密码至少需要6位字符'
-    isValid = false
+    showToast('Password must be at least 6 characters')
+    return false
   }
 
-  return isValid
+  return true
 }
 
 // 返回上一页
@@ -130,7 +123,6 @@ const goBack = () => {
 // 处理注册
 const handleConfirm = async () => {
   if (!validateForm()) {
-    showToast('请检查输入信息')
     return
   }