fix: #1819

src/common/methods/request/resultInfo.ts

@@ -45,48 +45,31 @@ export function commonResultInfo(fn: Promise<any>, sign: ResultInfo, loading: Re
  * @param messageInfo
  * @returns
  */
-export async function requestResultLoadingAndInfo(fn: any, param: any, loading: Ref<boolean>, messageInfo: [string, string] = ['成功', '失败']) {
+export async function requestResultLoadingAndInfo(fn: any, param: any, loading: Ref<boolean>, messageInfo: [string, string] = ['成功', '失败'], isDefaultMsg = false) {
     console.log('请求接口参数: ', param);
     const [sucInfo, errInfo] = messageInfo
     loading.value = true;
     return new Promise((resolve, reject) => {
-        if (param) {
-            fn(param).then((res: any) => {
-                message.success(sucInfo)
-                loading.value = false;
-                resolve(res);
-            }).catch((err: string) => {
-                loading.value = false;
-                const msg = '您的申请已提交，请稍后查询结果！'
-                if (err === msg) {
-                    message.success(msg)
-                    resolve('ok');
-                } else {
-                    console.warn(`${fn}调用失败： ${err}`);
-                    const temp = errInfo + err
-                    message.error(temp)
-                    reject(temp)
-                }
-            })
-        } else {
-            fn().then((res: any) => {
-                message.success(sucInfo)
-                loading.value = false;
-                resolve(res);
-            }).catch((err: string) => {
-                loading.value = false;
-                const msg = '您的申请已提交，请稍后查询结果！'
-                if (err === msg) {
-                    message.success(msg)
-                    resolve('ok');
-                } else {
-                    console.warn(`${fn}调用失败： ${err}`);
-                    const temp = errInfo + err
-                    message.error(temp)
-                    reject(temp)
-                }
-            })
-        }
+        const tempFN = param ? fn(param) : fn()
+        tempFN.then((res: any) => {
+            // 处理同一个请求，根据不同场景提现不同消息
+            const msg = isDefaultMsg ? res : sucInfo
+            message.success(msg)
+            loading.value = false;
+            resolve(res);
+        }).catch((err: string) => {
+            loading.value = false;
+            const msg = '您的申请已提交，请稍后查询结果！'
+            if (err === msg) {
+                message.success(msg)
+                resolve('ok');
+            } else {
+                console.warn(`${fn}调用失败： ${err}`);
+                const temp = errInfo + err
+                message.error(temp)
+                reject(temp)
+            }
+        })
     })
 }
 
@@ -123,27 +106,5 @@ export async function queryResultLoadingAndInfo(fn: Function, loading: Ref<boole
             reject(err)
         })
     })
-    // try {
-    //     const res = await param ? fn(param) : fn()
-    //     let result = res
-    //     if (Array.isArray(res)) {
-    //         // 列表数据需要一个key，要不然会报错，统一处理
-    //         result = res.map((e: any, i: number) => {
-    //             if (e.hasOwnProperty('key')) {
-    //                 return e
-    //             } else {
-    //                 return { ...e, key: String(i) };
-    //             }
-    //         })
-    //     }
-    //     console.log('查询数据成功：', result)
-    //     loading.value = false;
-    //     return Promise.resolve(result);
-    // } catch (err) {
-    //     loading.value = false;
-    //     console.error('查询数据失败：', err)
-    //     message.error(err.message)
-    //     return Promise.resolve(err)
-    // }
 }
 

src/views/account-manager/account-manager-agency/account-manager-agency-sub/add.vue

@@ -158,7 +158,7 @@ export default defineComponent({
                     OpenBankAccId: selectdBank.bankid, // 银行卡行号
                 };
                 const msg: [string, string] = ['您的申请已提交，请稍后查询结果！', '新增失败:'];
-                requestResultLoadingAndInfo(requestBankSign, param, loading, msg).then(() => {
+                requestResultLoadingAndInfo(requestBankSign, param, loading, msg, true).then(() => {
                     cancel(true);
                 });
             });

src/views/account-manager/account-manager-agency/account-manager-agency-sub/delete.vue

@@ -45,7 +45,7 @@ export default defineComponent({
                 ExtOperatorID: getTimeValue(), // 外部操作流水号
             };
             // 挂牌撤单请求
-            requestResultLoadingAndInfo(requestBankCancelSign, param, loading, ['删除成功', '删除失败:']).then(() => {
+            requestResultLoadingAndInfo(requestBankCancelSign, param, loading, ['删除成功', '删除失败:'], true).then(() => {
                 cancel(true);
             });
         }