From c3912280d98761d6a28570eae1c212bd4ce69477 Mon Sep 17 00:00:00 2001 From: fanfan Date: Wed, 31 Jul 2024 22:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=20=20=E6=B1=87=E8=87=B3?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/goods/distributionPrice/Index.vue | 1078 +++++++++-------- src/views/goods/memberPrice/Index.vue | 1074 ++++++++-------- src/views/setting/payment/template/Update.vue | 276 +++-- 3 files changed, 1272 insertions(+), 1156 deletions(-) diff --git a/src/views/goods/distributionPrice/Index.vue b/src/views/goods/distributionPrice/Index.vue index a5b167e..78252d3 100644 --- a/src/views/goods/distributionPrice/Index.vue +++ b/src/views/goods/distributionPrice/Index.vue @@ -1,66 +1,111 @@ diff --git a/src/views/goods/memberPrice/Index.vue b/src/views/goods/memberPrice/Index.vue index 705f694..a54f156 100644 --- a/src/views/goods/memberPrice/Index.vue +++ b/src/views/goods/memberPrice/Index.vue @@ -1,65 +1,108 @@ diff --git a/src/views/setting/payment/template/Update.vue b/src/views/setting/payment/template/Update.vue index 66f0696..ad23168 100644 --- a/src/views/setting/payment/template/Update.vue +++ b/src/views/setting/payment/template/Update.vue @@ -2,13 +2,7 @@
{{ $route.meta.title }}
- + 数字越小越靠前 - + {{ PaymentMethodEnum.WECHAT.name }} {{ PaymentMethodEnum.ALIPAY.name }} @@ -50,10 +40,7 @@

支付宝开发者平台: - https://open.alipay.com/dev/workspace + https://open.alipay.com/dev/workspace

@@ -88,10 +75,7 @@
-
+
- 微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID + 微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID
@@ -119,11 +105,7 @@ prop="config.wechat.normal.apiKey" :rules="[{ required: true, message: '请填写支付密钥 (APIKEY)' }]" > - +
"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"
@@ -160,10 +142,7 @@
-
+
- +
"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"
@@ -208,7 +183,9 @@ >
- 微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID + 微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID
@@ -313,7 +290,7 @@
-
+
- +
普通商户 - 子商户 (服务商模式) +
+ +
+ 微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID +
+
+ - +
微信小程序或者微信公众号的APPID,需要在哪个客户端支付就填写哪个,APP支付需要填写开放平台的应用APPID - + - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+
- + + + + + + +
"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"
@@ -440,57 +432,71 @@
- +
请填写微信支付服务商的AppID
- - +
- 微信支付服务商的商户号,纯数字格式;例如:1600000109 + 请填写微信支付服务商的AppID
- - -
- "微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥" -
+ +
- + + + + + + + + + + +
"微信支付商户平台"" - "账户中心" - "API安全" - "设置API密钥"
- 微信支付的商户号,纯数字格式;例如:1600000109
-
+ -->
@@ -562,8 +568,8 @@ const defaultData = { subAppId: '', subMchId: '', spApiclientCert: '', - spApiclientKey: '' - } + spApiclientKey: '', + }, }, [PaymentMethodEnum.ALIPAY.value]: { appId: '', @@ -573,23 +579,29 @@ const defaultData = { appCertPublicKey: '', alipayCertPublicKey: '', alipayRootCert: '', - merchantPrivateKey: '' + 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: '', @@ -597,14 +609,14 @@ const defaultData = { // spApiclientKey: '', }, }, - } + }, } export default { components: { - InputFile + InputFile, }, - data () { + data() { return { // 正在加载 isLoading: false, @@ -635,48 +647,47 @@ export default { '$route.query.templateId': { // 首次加载的时候执行函数 immediate: true, - handler (val) { + handler(val) { // 记录当前模板ID this.templateId = val // 获取当前记录 this.getDetail() - } - } + }, + }, }, - created () { }, + created() {}, methods: { - // 获取当前记录 - getDetail () { + getDetail() { this.isLoading = true Api.detail(this.templateId) - .then(result => { + .then((result) => { // 当前记录 this.record = { ...defaultData, ...result.data.detail } }) - .finally(() => this.isLoading = false) + .finally(() => (this.isLoading = false)) }, // 移除表单项的校验结果 - clearValidate () { + clearValidate() { this.$refs.myForm.clearValidate() }, // 点击表单提交 - handleSubmit (e) { + handleSubmit(e) { e.preventDefault() - this.$refs.myForm.validate(valid => { + this.$refs.myForm.validate((valid) => { if (valid) { this.onSubmitForm() } else { console.log('validate error') return false } - }); + }) }, // 上传文件后记录到 uploadFiles中 - onChangeInputFile (name, args, key) { + onChangeInputFile(name, args, key) { const { uploadFiles } = this if (args[1] !== null) { uploadFiles[key] = args[1] @@ -684,12 +695,12 @@ export default { }, // 表单数据提交到后端 - onSubmitForm () { + onSubmitForm() { this.isLoading = true this.isBtnLoading = true const formData = this.buildFormData() Api.edit(formData) - .then(result => { + .then((result) => { // 显示成功 this.$message.success(result.message, 1.5) // 跳转到列表页 @@ -697,12 +708,12 @@ export default { this.$router.push('./index') }, 1500) }) - .catch(() => this.isBtnLoading = false) - .finally(() => this.isLoading = false) + .catch(() => (this.isBtnLoading = false)) + .finally(() => (this.isLoading = false)) }, // 生成表单数据 FormData格式 - buildFormData () { + buildFormData() { const { record, uploadFiles, templateId } = this const formData = new FormData() formData.append('templateId', templateId) @@ -717,9 +728,8 @@ export default { } } return formData - } - - } + }, + }, }