Skip to content

Commit 9f21e6c

Browse files
committed
【功能优化】pay:微信支付使用 certSerialNo 替代 privateCertContent
1 parent 3627fd8 commit 9f21e6c

File tree

1 file changed

+9
-31
lines changed

1 file changed

+9
-31
lines changed

src/views/pay/app/components/weixinChannelForm.vue

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div v-if="formData.config.apiVersion === 'v2'">
3333
<el-form-item label-width="180px" label="商户密钥" prop="config.mchKey">
3434
<el-input v-model="formData.config.mchKey" placeholder="请输入商户密钥" clearable
35-
:style="{width: '100%'}" type="textarea" :autosize="{minRows: 8, maxRows: 8}"></el-input>
35+
:style="{width: '100%'}"></el-input>
3636
</el-form-item>
3737
<el-form-item label-width="180px" label="apiclient_cert.p12 证书" prop="config.keyContent">
3838
<el-input v-model="formData.config.keyContent" type="textarea"
@@ -50,7 +50,7 @@
5050
<div v-if="formData.config.apiVersion === 'v3'">
5151
<el-form-item label-width="180px" label="API V3 密钥" prop="config.apiV3Key">
5252
<el-input v-model="formData.config.apiV3Key" placeholder="请输入 API V3 密钥" clearable
53-
:style="{width: '100%'}" type="textarea" :autosize="{minRows: 8, maxRows: 8}"></el-input>
53+
:style="{width: '100%'}"></el-input>
5454
</el-form-item>
5555
<el-form-item label-width="180px" label="apiclient_key.pem 证书" prop="config.privateKeyContent">
5656
<el-input v-model="formData.config.privateKeyContent" type="textarea"
@@ -68,21 +68,9 @@
6868
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
6969
</el-upload>
7070
</el-form-item>
71-
<el-form-item label-width="180px" label="apiclient_cert.perm证书" prop="config.privateCertContent">
72-
<el-input v-model="formData.config.privateCertContent" type="textarea"
73-
placeholder="请上传apiclient_cert.perm证书"
74-
readonly :autosize="{minRows: 8, maxRows: 8}" :style="{width: '100%'}"></el-input>
75-
</el-form-item>
76-
<el-form-item label-width="180px" label="" prop="privateCertContentFile">
77-
<el-upload ref="privateCertContentFile"
78-
:limit="1"
79-
accept=".pem"
80-
action=""
81-
:before-upload="pemFileBeforeUpload"
82-
:http-request="privateCertContentUpload"
83-
>
84-
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
85-
</el-upload>
71+
<el-form-item label-width="180px" label="证书序列号" prop="config.certSerialNo">
72+
<el-input v-model="formData.config.certSerialNo"
73+
placeholder="请输入证书序列号" :style="{width: '100%'}"></el-input>
8674
</el-form-item>
8775
</div>
8876
<el-form-item label-width="180px" label="备注" prop="remark">
@@ -120,7 +108,7 @@ export default {
120108
mchKey: '',
121109
keyContent: '',
122110
privateKeyContent: '',
123-
privateCertContent: '',
111+
certSerialNo: '',
124112
apiV3Key:'',
125113
}
126114
},
@@ -133,7 +121,7 @@ export default {
133121
'config.mchKey': [{ required: true, message: '请输入商户密钥', trigger: 'blur' }],
134122
'config.keyContent': [{ required: true, message: '请上传 apiclient_cert.p12 证书', trigger: 'blur' }],
135123
'config.privateKeyContent': [{ required: true, message: '请上传 apiclient_key.pem 证书', trigger: 'blur' }],
136-
'config.privateCertContent': [{ required: true, message: '请上传 apiclient_cert.perm证 书', trigger: 'blur' }],
124+
'config.certSerialNo': [{ required: true, message: '证书序列号不能为空', trigger: 'blur' }],
137125
'config.apiV3Key': [{ required: true, message: '请上传 api V3 密钥值', trigger: 'blur' }],
138126
},
139127
}
@@ -194,14 +182,14 @@ export default {
194182
mchKey: '',
195183
keyContent: '',
196184
privateKeyContent: '',
197-
privateCertContent: '',
185+
certSerialNo: '',
198186
apiV3Key:'',
199187
}
200188
}
201189
this.resetForm('form')
202190
},
203191
/**
204-
* apiclient_cert.p12、apiclient_cert.pem、apiclient_key.pem 上传前的校验
192+
* apiclient_cert.p12、apiclient_key.pem 上传前的校验
205193
*/
206194
fileBeforeUpload(file, fileAccept) {
207195
let format = '.' + file.name.split(".")[1];
@@ -232,16 +220,6 @@ export default {
232220
}
233221
readFile.readAsText(event.file);
234222
},
235-
/**
236-
* 读取 apiclient_cert.pem 到 privateCertContent 字段
237-
*/
238-
privateCertContentUpload(event) {
239-
const readFile = new FileReader()
240-
readFile.onload = (e) => {
241-
this.formData.config.privateCertContent = e.target.result
242-
}
243-
readFile.readAsText(event.file);
244-
},
245223
/**
246224
* 读取 apiclient_cert.p12 到 keyContent 字段
247225
*/

0 commit comments

Comments
 (0)