li.shaoyi 2 年之前
父節點
當前提交
617048c0b2

+ 18 - 5
src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -153,15 +153,28 @@ const formSubmit = () => {
                 router.back()
             })
         }).catch((err) => {
-            // 超时特殊处理,待优化返回 code 来判断
-            if (err === '请求超时,请稍后再试') {
+            let isComplete = false // 请求是否结束
+            const complete = () => {
+                isComplete = true
                 hideLoading()
-                dialog('提交成功,请稍后确认结果').finally(() => {
+                dialog('提交成功,请稍后确认结果').then(() => {
                     router.back()
                 })
-            } else {
-                hideLoading('提交失败:' + err, 'fail')
             }
+
+            const t = setTimeout(() => complete(), 2000)
+
+            onSubmit().then(() => {
+                complete()
+            }).catch((err) => {
+                if (isComplete) {
+                    hideLoading()
+                } else {
+                    hideLoading('提交失败:' + err, 'fail')
+                }
+            }).finally(() => {
+                window.clearTimeout(t)
+            })
         })
     })
 }

+ 13 - 7
src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -87,21 +87,27 @@ const formSubmit = () => {
     })
     formData.extend_info = JSON.stringify(obj)
     fullloading((hideLoading) => {
-        onSubmit().then(() => {
+        let isComplete = false // 请求是否结束
+        const complete = () => {
+            isComplete = true
             hideLoading()
-            dialog('提交成功,请等待审核').finally(() => {
+            dialog('提交成功,请稍后确认结果').then(() => {
                 router.back()
             })
+        }
+
+        const t = setTimeout(() => complete(), 2000)
+
+        onSubmit().then(() => {
+            complete()
         }).catch((err) => {
-            // 超时特殊处理,待优化返回 code 来判断
-            if (err === '请求超时,请稍后再试') {
+            if (isComplete) {
                 hideLoading()
-                dialog('提交成功,请稍后确认结果').finally(() => {
-                    router.back()
-                })
             } else {
                 hideLoading('提交失败:' + err, 'fail')
             }
+        }).finally(() => {
+            window.clearTimeout(t)
         })
     })
 }

+ 14 - 8
src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -94,19 +94,25 @@ const formSubmit = () => {
                 obj['certificate_photo_url'] = certificate_photo_url.value
                 formData.extend_info = JSON.stringify(obj)
 
-                onSubmit().then(() => {
-                    ElMessage.success('提交成功,请等待审核')
+                let isComplete = false // 请求是否结束
+                const complete = () => {
+                    isComplete = true
+                    loading.value = false
+                    ElMessage.success('提交成功,请稍后确认结果')
                     onCancel()
+                }
+
+                const t = setTimeout(() => complete(), 2000)
+
+                onSubmit().then(() => {
+                    complete()
                 }).catch((err) => {
-                    // 超时特殊处理,待优化返回 code 来判断
-                    if (err === '请求超时,请稍后再试') {
-                        ElMessage.success('提交成功,请稍后确认结果')
-                        onCancel()
-                    } else {
+                    if(!isComplete){
                         ElMessage.error('提交失败:' + err)
                     }
+                }).finally(() => {
+                    window.clearTimeout(t)
                 })
-
             } else {
                 ElMessage.error('未签约')
             }

+ 14 - 7
src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -81,17 +81,24 @@ const formSubmit = () => {
             })
             formData.extend_info = JSON.stringify(obj)
             if (formData.CusBankID) {
-                onSubmit().then(() => {
-                    ElMessage.success('提交成功,请等待审核')
+                let isComplete = false // 请求是否结束
+                const complete = () => {
+                    isComplete = true
+                    loading.value = false
+                    ElMessage.success('提交成功,请稍后确认结果')
                     onCancel()
+                }
+
+                const t = setTimeout(() => complete(), 2000)
+
+                onSubmit().then(() => {
+                    complete()
                 }).catch((err) => {
-                    // 超时特殊处理,待优化返回 code 来判断
-                    if (err === '请求超时,请稍后再试') {
-                        ElMessage.success('提交成功,请稍后确认结果')
-                        onCancel()
-                    } else {
+                    if(!isComplete){
                         ElMessage.error('提交失败:' + err)
                     }
+                }).finally(() => {
+                    window.clearTimeout(t)
                 })
             } else {
                 ElMessage.error('未签约')

+ 5 - 0
vue.config.js

@@ -20,6 +20,11 @@ module.exports = defineConfig({
       }
     }
   },
+  devServer: {
+    client: {
+      overlay: false
+    }
+  },
   css: {
     extract: true, // 是否使用css分离插件 ExtractTextPlugin
     sourceMap: false,