Skip to content

Commit 188b403

Browse files
committed
【功能优化】PAY:微信支付使用 certSerialNo 替代 privateCertContent
1 parent 145226d commit 188b403

File tree

1 file changed

+9
-48
lines changed

1 file changed

+9
-48
lines changed

src/views/pay/app/components/channel/WeixinChannelForm.vue

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
v-model="formData.config.mchKey"
5353
placeholder="请输入商户密钥"
5454
clearable
55-
:style="{ width: '100%' }"
56-
type="textarea"
57-
:autosize="{ minRows: 8, maxRows: 8 }"
5855
/>
5956
</el-form-item>
6057
<el-form-item
@@ -92,9 +89,6 @@
9289
v-model="formData.config.apiV3Key"
9390
placeholder="请输入 API V3 密钥"
9491
clearable
95-
:style="{ width: '100%' }"
96-
type="textarea"
97-
:autosize="{ minRows: 8, maxRows: 8 }"
9892
/>
9993
</el-form-item>
10094
<el-form-item
@@ -126,35 +120,13 @@
126120
</el-button>
127121
</el-upload>
128122
</el-form-item>
129-
<el-form-item
130-
label-width="180px"
131-
label="apiclient_cert.pem证书"
132-
prop="config.privateCertContent"
133-
>
123+
<el-form-item label-width="180px" label="证书序列号" prop="config.certSerialNo">
134124
<el-input
135-
v-model="formData.config.privateCertContent"
136-
type="textarea"
137-
placeholder="请上传apiclient_cert.pem证书"
138-
readonly
139-
:autosize="{ minRows: 8, maxRows: 8 }"
140-
:style="{ width: '100%' }"
125+
v-model="formData.config.certSerialNo"
126+
placeholder="请输入证书序列号"
127+
clearable
141128
/>
142129
</el-form-item>
143-
<el-form-item label-width="180px" label="" prop="privateCertContentFile">
144-
<el-upload
145-
ref="privateCertContentFile"
146-
:limit="1"
147-
accept=".pem"
148-
action=""
149-
:before-upload="pemFileBeforeUpload"
150-
:http-request="privateCertContentUpload"
151-
>
152-
<el-button type="primary">
153-
<Icon icon="ep:upload" class="mr-5px" />
154-
点击上传
155-
</el-button>
156-
</el-upload>
157-
</el-form-item>
158130
</div>
159131
<el-form-item label-width="180px" label="备注" prop="remark">
160132
<el-input v-model="formData.remark" :style="{ width: '100%' }" />
@@ -193,7 +165,7 @@ const formData = ref<any>({
193165
mchKey: '',
194166
keyContent: '',
195167
privateKeyContent: '',
196-
privateCertContent: '',
168+
certSerialNo: '',
197169
apiV3Key: ''
198170
}
199171
})
@@ -210,8 +182,8 @@ const formRules = {
210182
'config.privateKeyContent': [
211183
{ required: true, message: '请上传 apiclient_key.pem 证书', trigger: 'blur' }
212184
],
213-
'config.privateCertContent': [
214-
{ required: true, message: '请上传 apiclient_cert.pem证 书', trigger: 'blur' }
185+
'config.certSerialNo': [
186+
{ required: true, message: '请输入证书序列号', trigger: 'blur' }
215187
],
216188
'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }]
217189
}
@@ -278,15 +250,15 @@ const resetForm = (appId, code) => {
278250
mchKey: '',
279251
keyContent: '',
280252
privateKeyContent: '',
281-
privateCertContent: '',
253+
certSerialNo: '',
282254
apiV3Key: ''
283255
}
284256
}
285257
formRef.value?.resetFields()
286258
}
287259
288260
/**
289-
* apiclient_cert.p12、apiclient_cert.pem、apiclient_key.pem 上传前的校验
261+
* apiclient_cert.p12、apiclient_key.pem 上传前的校验
290262
*/
291263
const fileBeforeUpload = (file, fileAccept) => {
292264
let format = '.' + file.name.split('.')[1]
@@ -321,17 +293,6 @@ const privateKeyContentUpload = async (event) => {
321293
readFile.readAsText(event.file)
322294
}
323295
324-
/**
325-
* 读取 apiclient_cert.pem 到 privateCertContent 字段
326-
*/
327-
const privateCertContentUpload = async (event) => {
328-
const readFile = new FileReader()
329-
readFile.onload = (e: any) => {
330-
formData.value.config.privateCertContent = e.target.result
331-
}
332-
readFile.readAsText(event.file)
333-
}
334-
335296
/**
336297
* 读取 apiclient_cert.p12 到 keyContent 字段
337298
*/

0 commit comments

Comments
 (0)