From 2eced58515ca6d4966c92ee5ccaaed27eeb9c31e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 28 Jul 2022 14:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaymentInfo/modules/CombinationPaymentModal.vue  | 12 ++++++------
 .../PaymentInfo/modules/PaymentInfoModal.vue         |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
index 1f1a605..c931319 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
@@ -54,7 +54,7 @@
       <a-form :form="form" style="margin-left: 10px">
         <!--缴费 方式 费用类型begin -->
         <a-divider orientation="left">
-          缴费信息<font color="red">（缴费时长5年可绑定两张证书）</font>
+          缴费信息
           <span
             v-if="isMember === 'member'"
             class="charge-notice"
@@ -544,7 +544,7 @@ export default {
               required: true, message: '请输入缴费金额'
             },
             {
-              pattern: /^[1-9](\d{1,8})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -556,7 +556,7 @@ export default {
               required: true, message: '请输入会员缴费金额'
             },
             {
-              pattern: /^[1-9](\d{1,7})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -568,7 +568,7 @@ export default {
               required: true, message: '请输入凭证金额'
             },
             {
-              pattern: /^[1-9](\d{1,7})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -580,7 +580,7 @@ export default {
               required: false, message: '请输入证书缴费金额'
             },
             {
-              pattern: /^[1-9](\d{1,8})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -590,7 +590,7 @@ export default {
           rules: [
             { required: true, validator: this.getByMemberTime },
             {
-              pattern: /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,11位正数'
             }
 
diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
index 9985727..ed95005 100644
--- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
@@ -582,7 +582,7 @@ export default {
               required: true, message: '请输入缴费金额'
             },
             {
-              pattern: /^[1-9](\d{1,8})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,8位正数'
             }
           ],
@@ -593,7 +593,7 @@ export default {
           rules: [
             { required: true, validator: this.getByMemberTime },
             {
-              pattern: /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,8}$|^0$/,
+              pattern: /^0(\.[0-9]{1,2})*$|^[1-9]\d{0,7}(\.\d{1,2})*$/,
               message: '请输入合法的金额数字，最多2位小数,11位正数'
             }
           ], validateTrigger: 'blur',