From e01883d58b6bda17c08fc17caad819347d3df80b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 18 Aug 2024 15:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E6=94=AF=E6=8C=81=E9=98=BF?=
 =?UTF-8?q?=E9=87=8C=E6=8E=A5=E5=8F=A3=E5=86=85=E5=AE=B9=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=E6=B8=A0=E9=81=93=E9=85=8D=E7=BD=AE=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#IAKCU4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/channel/AlipayChannelForm.vue  | 19 +++++++++++--------
 .../components/channel/MockChannelForm.vue    |  2 +-
 .../components/channel/WalletChannelForm.vue  |  2 +-
 .../components/channel/WeixinChannelForm.vue  | 12 +++---------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/views/pay/app/components/channel/AlipayChannelForm.vue b/src/views/pay/app/components/channel/AlipayChannelForm.vue
index 579d1eed..e5a36ec4 100644
--- a/src/views/pay/app/components/channel/AlipayChannelForm.vue
+++ b/src/views/pay/app/components/channel/AlipayChannelForm.vue
@@ -159,14 +159,17 @@
 
         <el-form-item label-width="180px" label="接口内容加密方式" prop="config.encryptType">
           <el-radio-group v-model="formData.config.encryptType">
-            <el-radio key="AES" label="AES">AES</el-radio>
             <el-radio key="NONE" label="">无加密</el-radio>
+            <el-radio key="AES" label="AES">AES</el-radio>
           </el-radio-group>
         </el-form-item>
-
         <div v-if="formData.config.encryptType === 'AES'">
-          <el-form-item label-width="180px" label="AES 密钥" prop="config.encryptKey">
-            <el-input v-model="formData.config.encryptKey" placeholder="请输入接口内容加密密钥" clearable />
+          <el-form-item label-width="180px" label="接口内容加密密钥" prop="config.encryptKey">
+            <el-input
+              v-model="formData.config.encryptKey"
+              placeholder="请输入接口内容加密密钥"
+              clearable
+            />
           </el-form-item>
         </div>
 
@@ -211,7 +214,7 @@ const formData = ref<any>({
     alipayPublicCertContent: '',
     rootCertContent: '',
     encryptType: '',
-    encryptKey: '',
+    encryptKey: ''
   }
 })
 const formRules = {
@@ -230,7 +233,7 @@ const formRules = {
     { required: true, message: '请上传支付宝公钥证书', trigger: 'blur' }
   ],
   'config.rootCertContent': [{ required: true, message: '请上传指定根证书', trigger: 'blur' }],
-  'config.encryptKey': [{required: true, message: '请输入接口内容加密密钥', trigger: 'blur'}],
+  'config.encryptKey': [{ required: true, message: '请输入接口内容加密密钥', trigger: 'blur' }]
 }
 const fileAccept = '.crt'
 const formRef = ref() // 表单 Ref
@@ -299,8 +302,8 @@ const resetForm = (appId, code) => {
       appCertContent: '',
       alipayPublicCertContent: '',
       rootCertContent: '',
-      encryptType: 'AES',
-      encryptKey: '',
+      encryptType: '',
+      encryptKey: ''
     }
   }
   formRef.value?.resetFields()
diff --git a/src/views/pay/app/components/channel/MockChannelForm.vue b/src/views/pay/app/components/channel/MockChannelForm.vue
index 49cb3abc..a2c7753c 100644
--- a/src/views/pay/app/components/channel/MockChannelForm.vue
+++ b/src/views/pay/app/components/channel/MockChannelForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Dialog v-model="dialogVisible" :title="dialogTitle" @closed="close" width="800px">
+    <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/pay/app/components/channel/WalletChannelForm.vue b/src/views/pay/app/components/channel/WalletChannelForm.vue
index cbdb542a..343237c7 100644
--- a/src/views/pay/app/components/channel/WalletChannelForm.vue
+++ b/src/views/pay/app/components/channel/WalletChannelForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Dialog v-model="dialogVisible" :title="dialogTitle" @closed="close" width="800px">
+    <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
         ref="formRef"
         :model="formData"
diff --git a/src/views/pay/app/components/channel/WeixinChannelForm.vue b/src/views/pay/app/components/channel/WeixinChannelForm.vue
index 3ab53e87..007c470e 100644
--- a/src/views/pay/app/components/channel/WeixinChannelForm.vue
+++ b/src/views/pay/app/components/channel/WeixinChannelForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Dialog v-model="dialogVisible" :title="dialogTitle" @close="close" width="800px">
+    <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px">
       <el-form
         ref="formRef"
         :model="formData"
@@ -48,11 +48,7 @@
         </el-form-item>
         <div v-if="formData.config.apiVersion === 'v2'">
           <el-form-item label-width="180px" label="商户密钥" prop="config.mchKey">
-            <el-input
-              v-model="formData.config.mchKey"
-              placeholder="请输入商户密钥"
-              clearable
-            />
+            <el-input v-model="formData.config.mchKey" placeholder="请输入商户密钥" clearable />
           </el-form-item>
           <el-form-item
             label-width="180px"
@@ -182,9 +178,7 @@ const formRules = {
   'config.privateKeyContent': [
     { required: true, message: '请上传 apiclient_key.pem 证书', trigger: 'blur' }
   ],
-  'config.certSerialNo': [
-    { required: true, message: '请输入证书序列号', trigger: 'blur' }
-  ],
+  'config.certSerialNo': [{ required: true, message: '请输入证书序列号', trigger: 'blur' }],
   'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }]
 }
 const formRef = ref() // 表单 Ref