Merge branch 'master' into confirmed

# Conflicts:
#	src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue

src/views/standardsAssociation/PaymentInfo/modules/CertificatePaymentInfoModal.vue

@@ -182,7 +182,7 @@
                 <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
                     :disabled="checkFlag||detailFlag"
-                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                    @change="(e) => {e.target.value = e.target.value.trim()}"
                     v-decorator="['bankAccount', validatorRules.bankAccount]"
                     placeholder="请输入银行账户"
                     :maxLength="50"></a-input>

src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue

@@ -413,7 +413,7 @@
                 <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
                     :disabled="checkFlag||detailFlag"
-                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                    @change="(e) => {e.target.value = e.target.value.trim()}"
                     v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:invoiceInfoObj.bankAccount}]"
                     placeholder="请输入银行账户"
                     :maxLength="50"></a-input>

src/views/standardsAssociation/memberInfo/MemberInfo.vue

@@ -279,7 +279,7 @@
               v-decorator="[ 'bankAccount', validatorRules.bankAccount]"
               placeholder="请输入银行账户"
               :maxLength="50"
-              @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+              @change="(e) => {e.target.value = e.target.value.trim()}"
             ></a-input>
           </a-form-item>
         </a-col>

src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue

@@ -1082,7 +1082,7 @@
               <a-col :span="12">
                 <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                    @change="(e) => {e.target.value = e.target.value.trim()}"
                     v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
                     placeholder="请输入银行账户"
                     :maxLength="50"></a-input>
@@ -1504,7 +1504,7 @@
                 <a-col :span="12">
                   <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input
-                      @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                      @change="(e) => {e.target.value = e.target.value.trim()}"
                       v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:memberInfoPayment.bankAccount}]"
                       placeholder="请输入银行账户"
                       :maxLength="50"></a-input>

src/views/standardsAssociation/register/Register.vue

@@ -265,7 +265,7 @@
                   <a-form-item label="银行账户" :labelCol="labelColTemp" :wrapperCol="wrapperColTemp">
                     <a-input v-decorator="[ 'bankAccount', validatorRules.bankAccount]" placeholder="请输入银行账户"
                              :maxLength="50"
-                             @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"></a-input>
+                             @change="(e) => {e.target.value = e.target.value.trim()}"></a-input>
                   </a-form-item>
                 </a-col>
               </a-row>