diff --git a/src/common/enum/payment/Method.js b/src/common/enum/payment/Method.js index cc69562..eb32eed 100644 --- a/src/common/enum/payment/Method.js +++ b/src/common/enum/payment/Method.js @@ -7,5 +7,6 @@ import Enum from '../enum' export default new Enum([ { key: 'WECHAT', name: '微信支付', value: 'wechat' }, { key: 'ALIPAY', name: '支付宝', value: 'alipay' }, - { key: 'BALANCE', name: '余额支付', value: 'balance' } + { key: 'BALANCE', name: '余额支付', value: 'balance' }, + { key: 'HUIFU', name: '银联支付', value: 'huifu' } ]) diff --git a/src/views/setting/payment/template/Create.vue b/src/views/setting/payment/template/Create.vue index bd3e613..9557ea8 100644 --- a/src/views/setting/payment/template/Create.vue +++ b/src/views/setting/payment/template/Create.vue @@ -362,113 +362,142 @@ > 普通商户 - 子商户 (服务商模式) +
- -
+ + + + + + - + - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+
- -
+ + + + + + + +
- -
+ + - - -
+ + + + + + - - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+
- -
+ + + + + + + + + - 微信支付的商户号,纯数字格式;例如:1600000109
-
+ -->
@@ -554,20 +583,25 @@ const defaultData = { merchantPrivateKey: '', }, [PaymentMethodEnum.HUIFU.value]: { - // 微信商户号类型(normal普通商户 provider子商户) mchType: 'normal', normal: { sysId: '', - productId: '', - rsaMerchPrivateKey: '', - rsaHuifuPublicKey: '', + appkey: '', + mid: '', + tid: '', + msgSrcId: '', + msgSrc: '', + md5Secret: '', }, provider: { sysId: '', - productId: '', - rsaMerchPrivateKey: '', - rsaHuifuPublicKey: '', - // spSysId: '', + syAppkey: '', + syMid: '', + syTid: '', + syMsgSrcId: '', + syMsgSrc: '', + syMd5Secret: '', + // spAppid: '', // spProductId: '', // spRsaMerchPrivateKey: '', // spRsaHuifuPublicKey: '', diff --git a/src/views/setting/payment/template/Update.vue b/src/views/setting/payment/template/Update.vue index 66f0696..04e6817 100644 --- a/src/views/setting/payment/template/Update.vue +++ b/src/views/setting/payment/template/Update.vue @@ -384,113 +384,142 @@ > 普通商户 - 子商户 (服务商模式) +
- -
+ + + + + + - + - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+
- -
+ + + + + + + +
- -
+ + - - -
+ + + + + + - - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+
- -
+ + + + + + + + + - 微信支付的商户号,纯数字格式;例如:1600000109
-
+ -->
@@ -575,21 +604,27 @@ const defaultData = { alipayRootCert: '', merchantPrivateKey: '' }, - [PaymentMethodEnum.HUIFU.value]: { + [PaymentMethodEnum.HUIFU.value]: { // 微信商户号类型(normal普通商户 provider子商户) mchType: 'normal', normal: { sysId: '', - productId: '', - rsaMerchPrivateKey: '', - rsaHuifuPublicKey: '', + appkey: '', + mid: '', + tid: '', + msgSrcId: '', + msgSrc: '', + md5Secret: '', }, provider: { sysId: '', - productId: '', - rsaMerchPrivateKey: '', - rsaHuifuPublicKey: '', - // spSysId: '', + syAppkey: '', + syMid: '', + syTid: '', + syMsgSrcId: '', + syMsgSrc: '', + syMd5Secret: '', + // spAppid: '', // spProductId: '', // spRsaMerchPrivateKey: '', // spRsaHuifuPublicKey: '',