From 84db73c9b34f054ebeea98dab8b23d596476a2bf Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 7 Jul 2022 16:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/application/form.vue    | 33 ++++++++--------
 src/views/pay/application/index.vue   | 11 ++++--
 src/views/pay/merchant/form/index.vue | 56 +++++++++++++--------------
 src/views/pay/merchant/index.vue      |  9 +++--
 src/views/pay/payOrder/list.vue       | 15 ++++---
 src/views/pay/refundOrder/list.vue    | 14 ++++---
 6 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/src/views/pay/application/form.vue b/src/views/pay/application/form.vue
index 3602b35..ce770c6 100644
--- a/src/views/pay/application/form.vue
+++ b/src/views/pay/application/form.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:51:16
+ * @LastEditTime: 2022-07-07 16:26:45
  * @Description: file content
 -->
 <template>
@@ -131,24 +131,27 @@
         return meRules;
     });
 
-    const formEl = ref();
+    const formEl = ref(null);
 
-    store.dispatch('application/getMerchantList');
-    store.dispatch('application/getPayType');
-    onActivated(() => {
-        handlelLoadData();
-    });
-    /**
-     * 如果是编辑需要加载初始数据加载
-     */
-    const handlelLoadData = async () => {
+    const init = () => {
+        store.dispatch('application/getMerchantList');
+        store.dispatch('application/getPayType');
+        form.mchInfo = {};
+        formEl.value.resetFields();
         let id = route.params.id;
         if (id && form.id !== id) {
-            let res = await store.dispatch('application/detail', id);
-            res.payCodes = res.payCodes.split(',');
-            Object.assign(form, res);
+            handlelLoadDetail(id);
         }
     };
+    onActivated(init);
+    /**
+     * 编辑加载初始数据加载
+     */
+    const handlelLoadDetail = async (id) => {
+        let res = await store.dispatch('application/detail', id);
+        res.payCodes = res.payCodes.split(',');
+        Object.assign(form, res);
+    };
     /**
      * 切换商户时需要拿到当前商户信息，用来应用判断属于哪个平台
      */
@@ -191,8 +194,6 @@
         } catch (e) {}
     };
     const handleCancel = () => {
-        Object.assign(form, defaultForm);
-        formEl.value.resetFields();
         router.push({ name: 'PayApplication' });
     };
 </script>
diff --git a/src/views/pay/application/index.vue b/src/views/pay/application/index.vue
index eb21c8b..3e5c36c 100644
--- a/src/views/pay/application/index.vue
+++ b/src/views/pay/application/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 16:46:56
+ * @LastEditTime: 2022-07-07 16:32:44
  * @Description: file content
 -->
 <template>
@@ -92,10 +92,13 @@
         await store.dispatch('application/search', { ...state.condition });
         loading.value = false;
     };
+    const init = () => {
+        store.dispatch('application/getMerchantList');
+        store.dispatch('application/getPayType');
+        handleSearch();
+    };
 
-    store.dispatch('application/getMerchantList');
-    store.dispatch('application/getPayType');
-    onActivated(handleSearch);
+    onActivated(init);
     /**
      * 重置
      */
diff --git a/src/views/pay/merchant/form/index.vue b/src/views/pay/merchant/form/index.vue
index e22d9ed..4043884 100644
--- a/src/views/pay/merchant/form/index.vue
+++ b/src/views/pay/merchant/form/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-07-04 16:42:21
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:50:18
+ * @LastEditTime: 2022-07-07 16:30:11
  * @Description: file content
 -->
 <template>
@@ -62,34 +62,38 @@
     const aliFormEl = ref();
     const wxFormEl = ref();
 
-    store.dispatch('merchant/getMerchantPlatform');
-    onActivated(() => {
-        handlelLoadData();
-    });
+    const init = () => {
+        store.dispatch('merchant/getMerchantPlatform');
+        formEl.value.resetFields();
+        wxFormEl.value && wxFormEl.value.resetFields();
+        aliFormEl.value && aliFormEl.value.resetFields();
+        let id = route.params.id;
+        if (id && form.id !== id) {
+            handlelLoadDetail();
+        }
+    };
+    onActivated(init);
     /**
      * 如果是编辑需要加载初始数据加载
      */
-    const handlelLoadData = async () => {
-        let id = route.params.id;
-        if (id && form.id !== id) {
-            let res = await store.dispatch('merchant/detail', id);
-            if (res.mchCode === 'alipay') {
-                const publicKey = res.aliMchData.publicKey;
-                if (publicKey) {
-                    res.aliMchData.hasPublicKey = publicKey;
-                    delete res.aliMchData.publicKey;
-                }
-            } else {
-                const { apiKey, apiKeyV3, serialNo } = res.wxMchData;
-                res.wxMchData.hasApiKey = apiKey;
-                delete res.wxMchData.apiKey;
-                res.wxMchData.hasApiKeyV3 = apiKeyV3;
-                delete res.wxMchData.apiKeyV3;
-                res.wxMchData.hasSerialNo = serialNo;
-                delete res.wxMchData.serialNo;
+    const handlelLoadDetail = async () => {
+        let res = await store.dispatch('merchant/detail', id);
+        if (res.mchCode === 'alipay') {
+            const publicKey = res.aliMchData.publicKey;
+            if (publicKey) {
+                res.aliMchData.hasPublicKey = publicKey;
+                delete res.aliMchData.publicKey;
             }
-            Object.assign(form, res);
+        } else {
+            const { apiKey, apiKeyV3, serialNo } = res.wxMchData;
+            res.wxMchData.hasApiKey = apiKey;
+            delete res.wxMchData.apiKey;
+            res.wxMchData.hasApiKeyV3 = apiKeyV3;
+            delete res.wxMchData.apiKeyV3;
+            res.wxMchData.hasSerialNo = serialNo;
+            delete res.wxMchData.serialNo;
         }
+        Object.assign(form, res);
     };
     const handleSave = async () => {
         let validate = false;
@@ -108,10 +112,6 @@
             .catch(() => {});
     };
     const handleCancel = () => {
-        Object.assign(form, defaultForm);
-        wxFormEl.value && wxFormEl.value.resetFields();
-        aliFormEl.value && aliFormEl.value.resetFields();
-        formEl.value.resetFields();
         router.push({ name: 'PayMerchant' });
     };
 </script>
diff --git a/src/views/pay/merchant/index.vue b/src/views/pay/merchant/index.vue
index 8b6474c..a24118e 100644
--- a/src/views/pay/merchant/index.vue
+++ b/src/views/pay/merchant/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-06 14:34:01
+ * @LastEditTime: 2022-07-07 16:31:04
  * @Description: file content
 -->
 <template>
@@ -72,6 +72,11 @@
     const state = reactive({
         condition: { ..._condition },
     });
+    const init = () => {
+        store.dispatch('merchant/getMerchantPlatform');
+        handleSearch();
+    };
+    onActivated(init);
 
     /**
      * 搜索
@@ -82,8 +87,6 @@
         loading.value = false;
     };
 
-    store.dispatch('merchant/getMerchantPlatform');
-    onActivated(handleSearch);
     /**
      * 重置
      */
diff --git a/src/views/pay/payOrder/list.vue b/src/views/pay/payOrder/list.vue
index b1ff10e..ec435b6 100644
--- a/src/views/pay/payOrder/list.vue
+++ b/src/views/pay/payOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 14:38:28
+ * @LastEditTime: 2022-07-07 16:34:27
  * @Description: file content
 -->
 <template>
@@ -109,6 +109,14 @@
         condition: { ..._condition },
     });
 
+    store.dispatch('payOrder/getPayType');
+    const init = () => {
+        store.dispatch('payOrder/getMerchantList');
+        store.dispatch('payOrder/getApplicationList');
+        handleSearch();
+    };
+    onActivated(init);
+
     /**
      * 搜索
      */
@@ -123,11 +131,6 @@
         await store.dispatch('payOrder/search', par);
         loading.value = false;
     };
-
-    store.dispatch('payOrder/getMerchantList');
-    store.dispatch('payOrder/getApplicationList');
-    store.dispatch('payOrder/getPayType');
-    onActivated(handleSearch);
     /**
      * 重置
      */
diff --git a/src/views/pay/refundOrder/list.vue b/src/views/pay/refundOrder/list.vue
index 489e994..237e729 100644
--- a/src/views/pay/refundOrder/list.vue
+++ b/src/views/pay/refundOrder/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-06-15 17:29:32
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 15:30:13
+ * @LastEditTime: 2022-07-07 16:33:53
  * @Description: file content
 -->
 <template>
@@ -102,6 +102,14 @@
         condition: { ..._condition },
     });
 
+    store.dispatch('refundOrder/getPayType');
+    const init = () => {
+        store.dispatch('refundOrder/getMerchantList');
+        store.dispatch('refundOrder/getApplicationList');
+        handleSearch();
+    };
+    onActivated(init);
+
     /**
      * 搜索
      */
@@ -117,10 +125,6 @@
         loading.value = false;
     };
 
-    store.dispatch('refundOrder/getMerchantList');
-    store.dispatch('refundOrder/getApplicationList');
-    store.dispatch('refundOrder/getPayType');
-    onActivated(handleSearch);
     /**
      * 重置
      */