【功能优化】商城：支持阿里接口内容加密，同时修复支付宝渠道配置前端校验不生效的问题 #IAKCU4

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-form-item label-width="180px" label="接口内容加密密钥" prop="config.encryptKey">
-            <el-input v-model="formData.config.encryptKey" placeholder="请输入接口内容加密密钥" clearable />
+            <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',
+      encryptType: '',
-      encryptKey: '',
+      encryptKey: ''
     }
   }
   formRef.value?.resetFields()

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"

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"

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
+            <el-input v-model="formData.config.mchKey" placeholder="请输入商户密钥" clearable />
-              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': [
+  'config.certSerialNo': [{ required: true, message: '请输入证书序列号', trigger: 'blur' }],
-    { required: true, message: '请输入证书序列号', trigger: 'blur' }
-  ],
   'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }]
 }
 const formRef = ref() // 表单 Ref