Merge branch 'feature/pay-0704-ch' into msb_test

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 16:30:11
+ * @LastEditTime: 2022-07-07 16:38:06
  * @Description: file content
 -->
 <template>
@@ -69,14 +69,14 @@
         aliFormEl.value && aliFormEl.value.resetFields();
         let id = route.params.id;
         if (id && form.id !== id) {
-            handlelLoadDetail();
+            handlelLoadDetail(id);
         }
     };
     onActivated(init);
     /**
      * 如果是编辑需要加载初始数据加载
      */
-    const handlelLoadDetail = async () => {
+    const handlelLoadDetail = async (id) => {
         let res = await store.dispatch('merchant/detail', id);
         if (res.mchCode === 'alipay') {
             const publicKey = res.aliMchData.publicKey;