大屏项目初始化

screen-vue/src/components/Layout/components/editPswd.vue

@@ -58,52 +58,27 @@ const pwdRules = reactive({
 })
 
 const submitForm = async () => {
-  if (!isMounted.value || !pwdFormRef.value) return
-  if (submitPromise) {
-    submitPromise = null
-    return
-  }
-
-  submitPromise = new Promise(async (resolve) => {
-    try {
-      let valid = true
-      await pwdFormRef.value.validate().catch(() => {
-        valid = false
-        ElMessage.error('表单验证失败，请检查输入内容')
-      })
-
-      if (!valid || !isMounted.value) {
-        submitPromise = null
-        return resolve(false)
-      }
-
-      let confirmResult = false
-      if (!confirmResult || !isMounted.value) {
-        submitPromise = null
-        return resolve(false)
-      }
-	  const reqParams = {
-		  oldPasswd :pwdForm.oldPassword,
-		  password : pwdForm.newPassword,
-		  userId : userStore.loginUser?.userId || '',
-	  }
-	  const res = await updatePasswd(reqParams);
-      await new Promise(res => setTimeout(res, 800))
-      if (isMounted.value) {
-        emit('success')
-        resolve(true)
-      }
-    } catch (error) {
-      if (isMounted.value) {
-		  console.log(error)
-      }
-      resolve(false)
-    } finally {
+  if (!isMounted.value || !pwdFormRef.value || submitPromise) return
+  try {
+    submitPromise = true
+    await pwdFormRef.value.validate()
+    const reqParams = {
+      oldPasswd: pwdForm.oldPassword,
+      password: pwdForm.newPassword,
+      userId: userStore.loginUser?.userId || ''
+    }
+    const res = await updatePasswd(reqParams)
+    await new Promise(res => setTimeout(res, 800))
+    isMounted.value && emit('success')
+    return true
+  } catch (error) {
+	  console.error('修改密码接口异常：', error)
+    return false
+  } finally {
+    if (isMounted.value) {
       submitPromise = null
     }
-  })
-
-  return submitPromise
+  }
 }
 
 const resetForm = () => {