Skip to content

Commit 2fa09f0

Browse files
YunaiVYunaiV
committed
mall + pay：
1. 微信支付配置，补全 apiclient_cert.p12 证书
1 parent f1231e2 commit 2fa09f0

File tree

2 files changed

+94
-32
lines changed

2 files changed

+94
-32
lines changed

‎src/views/pay/app/components/wechatChannelForm.vue

Lines changed: 70 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<template slot="append">%</template>
99
</el-input>
1010
</el-form-item>
11-
<el-form-item label-width="180px" label="公众号APPID" prop="weChatConfig.appId">
12-
<el-input v-model="form.weChatConfig.appId" placeholder="请输入公众号APPID" clearable :style="{width: '100%'}">
11+
<el-form-item label-width="180px" label="公众号 APPID" prop="weChatConfig.appId">
12+
<el-input v-model="form.weChatConfig.appId" placeholder="请输入公众号 APPID" clearable :style="{width: '100%'}">
1313
</el-input>
1414
</el-form-item>
1515
<el-form-item label-width="180px" label="商户号" prop="weChatConfig.mchId">
@@ -29,29 +29,41 @@
2929
</el-radio>
3030
</el-radio-group>
3131
</el-form-item>
32-
<el-form-item label-width="180px" label="商户密钥" prop="weChatConfig.mchKey"
33-
v-if="form.weChatConfig.apiVersion === 'v2'">
34-
<el-input v-model="form.weChatConfig.mchKey" placeholder="请输入商户密钥" clearable
35-
:style="{width: '100%'}" type="textarea" :autosize="{minRows: 8, maxRows: 8}"></el-input>
36-
</el-form-item>
32+
<div v-if="form.weChatConfig.apiVersion === 'v2'">
33+
<el-form-item label-width="180px" label="商户密钥" prop="weChatConfig.mchKey">
34+
<el-input v-model="form.weChatConfig.mchKey" placeholder="请输入商户密钥" clearable
35+
:style="{width: '100%'}" type="textarea" :autosize="{minRows: 8, maxRows: 8}"></el-input>
36+
</el-form-item>
37+
<el-form-item label-width="180px" label="apiclient_cert.p12 证书" prop="weChatConfig.keyContent">
38+
<el-input v-model="form.weChatConfig.keyContent" type="textarea"
39+
placeholder="请上传 apiclient_cert.p12 证书"
40+
readonly :autosize="{minRows: 8, maxRows: 8}" :style="{width: '100%'}"></el-input>
41+
</el-form-item>
42+
<el-form-item label-width="180px" label="">
43+
<el-upload :limit="1" accept=".p12" action=""
44+
:before-upload="p12FileBeforeUpload"
45+
:http-request="keyContentUpload">
46+
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
47+
</el-upload>
48+
</el-form-item>
49+
</div>
3750
<div v-if="form.weChatConfig.apiVersion === 'v3'">
38-
<el-form-item label-width="180px" label="API V3密钥" prop="weChatConfig.apiV3Key">
39-
<el-input v-model="form.weChatConfig.apiV3Key" placeholder="请输入API V3密钥" clearable
51+
<el-form-item label-width="180px" label="API V3 密钥" prop="weChatConfig.apiV3Key">
52+
<el-input v-model="form.weChatConfig.apiV3Key" placeholder="请输入 API V3 密钥" clearable
4053
:style="{width: '100%'}" type="textarea" :autosize="{minRows: 8, maxRows: 8}"></el-input>
4154
</el-form-item>
42-
<el-form-item label-width="180px" label="apiclient_key.perm证书" prop="weChatConfig.privateKeyContent">
55+
<el-form-item label-width="180px" label="apiclient_key.perm 证书" prop="weChatConfig.privateKeyContent">
4356
<el-input v-model="form.weChatConfig.privateKeyContent" type="textarea"
44-
placeholder="请上传apiclient_key.perm证书"
57+
placeholder="请上传 apiclient_key.perm 证书"
4558
readonly :autosize="{minRows: 8, maxRows: 8}" :style="{width: '100%'}"></el-input>
4659
</el-form-item>
4760
<el-form-item label-width="180px" label="" prop="privateKeyContentFile">
4861
<el-upload ref="privateKeyContentFile"
4962
:limit="1"
50-
:accept="fileAccept"
51-
:headers="header"
63+
accept=".pem"
5264
action=""
5365
:before-upload="pemFileBeforeUpload"
54-
:http-request="privateKeyUpload"
66+
:http-request="privateKeyContentUpload"
5567
>
5668
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
5769
</el-upload>
@@ -64,18 +76,17 @@
6476
<el-form-item label-width="180px" label="" prop="privateCertContentFile">
6577
<el-upload ref="privateCertContentFile"
6678
:limit="1"
67-
:accept="fileAccept"
68-
:headers="header"
79+
accept=".pem"
6980
action=""
7081
:before-upload="pemFileBeforeUpload"
71-
:http-request="privateCertUpload"
82+
:http-request="privateCertContentUpload"
7283
>
7384
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
7485
</el-upload>
7586
</el-form-item>
7687
</div>
7788
<el-form-item label-width="180px" label="备注" prop="remark">
78-
<el-input v-model="form.remark" :style="{width: '100%'}"></el-input>
89+
<el-input v-model="form.remark" :style="{width: '100%'}" />
7990
</el-form-item>
8091
</el-form>
8192
<div slot="footer" class="dialog-footer">
@@ -100,6 +111,7 @@ const defaultForm = {
100111
mchId: '',
101112
apiVersion: '',
102113
mchKey: '',
114+
keyContent: '',
103115
privateKeyContent: '',
104116
privateCertContent: '',
105117
apiV3Key:'',
@@ -159,27 +171,27 @@ export default {
159171
message: '请输入商户密钥',
160172
trigger: 'blur'
161173
}],
174+
'weChatConfig.keyContent': [{
175+
required: true,
176+
message: '请上传 apiclient_cert.p12 证书',
177+
trigger: 'blur'
178+
}],
162179
'weChatConfig.privateKeyContent': [{
163180
required: true,
164-
message: '请上传apiclient_key.perm证书',
181+
message: '请上传 apiclient_key.perm 证书',
165182
trigger: 'blur'
166183
}],
167184
'weChatConfig.privateCertContent': [{
168185
required: true,
169-
message: '请上传apiclient_cert.perm证书',
186+
message: '请上传 apiclient_cert.perm证 书',
170187
trigger: 'blur'
171188
}],
172189
'weChatConfig.apiV3Key': [{
173190
required: true,
174-
message: '请上传apiV3密钥值',
191+
message: '请上传 api V3 密钥值',
175192
trigger: 'blur'
176193
}],
177194
},
178-
// 文件上传的header
179-
header: {
180-
"Authorization": null
181-
},
182-
fileAccept: ".pem",
183195
// 渠道状态 数据字典
184196
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
185197
versionDictDatas: getDictDatas(DICT_TYPE.PAY_CHANNEL_WECHAT_VERSION),
@@ -218,6 +230,7 @@ export default {
218230
this.form.weChatConfig.apiVersion = config.apiVersion;
219231
this.form.weChatConfig.mchId = config.mchId;
220232
this.form.weChatConfig.mchKey = config.mchKey;
233+
this.form.weChatConfig.keyContent = config.keyContent;
221234
this.form.weChatConfig.privateKeyContent = config.privateKeyContent;
222235
this.form.weChatConfig.privateCertContent = config.privateCertContent;
223236
this.form.weChatConfig.apiV3Key = config.apiV3Key;
@@ -241,7 +254,6 @@ export default {
241254
this.$modal.msgSuccess("修改成功");
242255
this.close();
243256
}
244-
245257
})
246258
} else {
247259
@@ -255,10 +267,14 @@ export default {
255267
}
256268
});
257269
},
258-
pemFileBeforeUpload(file) {
270+
/**
271+
* apiclient_cert.p12、apiclient_cert.pem、apiclient_key.pem 上传前的校验
272+
*/
273+
fileBeforeUpload(file, fileAccept) {
259274
let format = '.' + file.name.split(".")[1];
260-
if (format !== this.fileAccept) {
261-
this.$message.error('请上传指定格式"' + this.fileAccept + '"文件');
275+
if (format !== fileAccept) {
276+
debugger
277+
this.$message.error('请上传指定格式"' + fileAccept + '"文件');
262278
return false;
263279
}
264280
let isRightSize = file.size / 1024 / 1024 < 2
@@ -267,19 +283,41 @@ export default {
267283
}
268284
return isRightSize
269285
},
270-
privateKeyUpload(event) {
286+
p12FileBeforeUpload(file) {
287+
this.fileBeforeUpload(file, '.p12')
288+
},
289+
pemFileBeforeUpload(file) {
290+
this.fileBeforeUpload(file, '.pem')
291+
},
292+
/**
293+
* 读取 apiclient_key.pem 到 privateKeyContent 字段
294+
*/
295+
privateKeyContentUpload(event) {
271296
const readFile = new FileReader()
272297
readFile.onload = (e) => {
273298
this.form.weChatConfig.privateKeyContent = e.target.result
274299
}
275300
readFile.readAsText(event.file);
276301
},
277-
privateCertUpload(event) {
302+
/**
303+
* 读取 apiclient_cert.pem 到 privateCertContent 字段
304+
*/
305+
privateCertContentUpload(event) {
278306
const readFile = new FileReader()
279307
readFile.onload = (e) => {
280308
this.form.weChatConfig.privateCertContent = e.target.result
281309
}
282310
readFile.readAsText(event.file);
311+
},
312+
/**
313+
* 读取 apiclient_cert.p12 到 keyContent 字段
314+
*/
315+
keyContentUpload(event) {
316+
const readFile = new FileReader()
317+
readFile.onload = (e) => {
318+
this.form.weChatConfig.keyContent = e.target.result.split(',')[1]
319+
}
320+
readFile.readAsDataURL(event.file); // 读成 base64
283321
}
284322
}
285323
}

‎src/views/pay/app/index.vue

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,30 @@
143143
</el-button>
144144
</template>
145145
</el-table-column>
146+
<el-table-column :label="payChannelEnum.WX_NATIVE.name" align="center">
147+
<template v-slot="scope">
148+
<el-button type="success" icon="el-icon-check" circle
149+
v-if="judgeChannelExist(scope.row.channelCodes,payChannelEnum.WX_NATIVE.code)"
150+
@click="handleUpdateChannel(scope.row,payChannelEnum.WX_NATIVE.code,payType.WECHAT)">
151+
</el-button>
152+
<el-button v-else
153+
type="danger" icon="el-icon-close" circle
154+
@click="handleCreateChannel(scope.row,payChannelEnum.WX_NATIVE.code,payType.WECHAT)">
155+
</el-button>
156+
</template>
157+
</el-table-column>
158+
<el-table-column :label="payChannelEnum.WX_BAR.name" align="center">
159+
<template v-slot="scope">
160+
<el-button type="success" icon="el-icon-check" circle
161+
v-if="judgeChannelExist(scope.row.channelCodes,payChannelEnum.WX_BAR.code)"
162+
@click="handleUpdateChannel(scope.row,payChannelEnum.WX_BAR.code,payType.WECHAT)">
163+
</el-button>
164+
<el-button v-else
165+
type="danger" icon="el-icon-close" circle
166+
@click="handleCreateChannel(scope.row,payChannelEnum.WX_BAR.code,payType.WECHAT)">
167+
</el-button>
168+
</template>
169+
</el-table-column>
146170
</el-table-column>
147171
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
148172
<template v-slot="scope">

0 commit comments

Comments
 (0)