From 046a840914f6520749b85438e39c3061208c8441 Mon Sep 17 00:00:00 2001 From: xiaoyu <17601026937@163.com> Date: Fri, 19 Nov 2021 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E5=B7=B2=E5=85=B3=E9=97=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/mchApp/MchPayConfigAddOrEdit.vue | 11 +++-------- .../src/views/mchApp/MchPayIfConfigList.vue | 4 +++- .../src/views/mchApp/custom/AlipayPayConfig.vue | 9 ++------- .../src/views/mchApp/custom/WxpayPayConfig.vue | 9 ++------- .../src/views/order/pay/PayOrderList.vue | 4 ++-- jeepay-ui-merchant/src/views/mchApp/List.vue | 2 +- .../src/views/mchApp/MchPayConfigAddOrEdit.vue | 11 +++-------- .../src/views/mchApp/MchPayIfConfigList.vue | 4 +++- .../src/views/mchApp/custom/AlipayPayConfig.vue | 9 ++------- .../src/views/mchApp/custom/WxpayPayConfig.vue | 9 ++------- .../src/views/order/pay/PayOrderList.vue | 4 ++-- 11 files changed, 25 insertions(+), 51 deletions(-) diff --git a/jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue b/jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue index 248de92..2eab699 100644 --- a/jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue +++ b/jeepay-ui-manager/src/views/mchApp/MchPayConfigAddOrEdit.vue @@ -10,11 +10,6 @@ > - - - - - @@ -102,8 +97,8 @@ export default { ifParams: {}, // 参数配置对象 rules: { infoId: [{ required: true, trigger: 'blur' }], - ifCode: [{ required: true, trigger: 'blur' }], - ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] + ifCode: [{ required: true, trigger: 'blur' }] + // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] }, ifParamsRules: {} } @@ -189,7 +184,7 @@ export default { const reqParams = {} reqParams.infoId = that.saveObject.infoId reqParams.ifCode = that.saveObject.ifCode - reqParams.ifRate = that.saveObject.ifRate + // reqParams.ifRate = that.saveObject.ifRate reqParams.state = that.saveObject.state reqParams.remark = that.saveObject.remark // 支付参数配置不能为空 diff --git a/jeepay-ui-manager/src/views/mchApp/MchPayIfConfigList.vue b/jeepay-ui-manager/src/views/mchApp/MchPayIfConfigList.vue index be1c464..d759e47 100644 --- a/jeepay-ui-manager/src/views/mchApp/MchPayIfConfigList.vue +++ b/jeepay-ui-manager/src/views/mchApp/MchPayIfConfigList.vue @@ -171,7 +171,9 @@ export default { }, // 刷新支付接口card列表 refCardList () { - this.$refs.infoCard.refCardList() + if (this.$refs.infoCard) { + this.$refs.infoCard.refCardList() + } }, // 请求支付通道数据 reqTableDataFunc (params) { diff --git a/jeepay-ui-manager/src/views/mchApp/custom/AlipayPayConfig.vue b/jeepay-ui-manager/src/views/mchApp/custom/AlipayPayConfig.vue index 3ee439f..21e0e06 100644 --- a/jeepay-ui-manager/src/views/mchApp/custom/AlipayPayConfig.vue +++ b/jeepay-ui-manager/src/views/mchApp/custom/AlipayPayConfig.vue @@ -10,11 +10,6 @@ > - - - - - @@ -162,7 +157,7 @@ export default { saveObject: {}, // 保存的对象 ifParams: {}, // 参数配置对象 rules: { - ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] + // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] }, ifParamsRules: { appId: [{ trigger: 'blur', @@ -284,7 +279,7 @@ export default { const reqParams = {} reqParams.infoId = that.saveObject.infoId reqParams.ifCode = that.saveObject.ifCode - reqParams.ifRate = that.saveObject.ifRate + // reqParams.ifRate = that.saveObject.ifRate reqParams.state = that.saveObject.state reqParams.remark = that.saveObject.remark // 支付参数配置不能为空 diff --git a/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue b/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue index f966c12..dd7566d 100644 --- a/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue +++ b/jeepay-ui-manager/src/views/mchApp/custom/WxpayPayConfig.vue @@ -10,11 +10,6 @@ > - - - - - @@ -157,7 +152,7 @@ export default { saveObject: {}, // 保存的对象 ifParams: { apiVersion: 'V2' }, // 参数配置对象 rules: { - ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] + // ifRate: [{ required: false, pattern: /^(([1-9]{1}\d{0,1})|(0{1}))(\.\d{1,4})?$/, message: '请输入0-100之间的数字，最多四位小数', trigger: 'blur' }] }, ifParamsRules: { mchId: [{ trigger: 'blur', @@ -290,7 +285,7 @@ export default { const reqParams = {} reqParams.infoId = that.saveObject.infoId reqParams.ifCode = that.saveObject.ifCode - reqParams.ifRate = that.saveObject.ifRate + // reqParams.ifRate = that.saveObject.ifRate reqParams.state = that.saveObject.state reqParams.remark = that.saveObject.remark // 支付参数配置不能为空 diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue index 417d883..fc93c0d 100644 --- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue +++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue @@ -81,7 +81,7 @@