Merge branch 'main' of http://192.168.0.60:3000/coin/fundHoldAdmin

src/views/business/merchantVerification/index.vue

@@ -277,7 +277,7 @@ export default {
           { required: true,pattern: /^\d+$/, message: "身份证号只能为数字", trigger: "blur" }
         ],
         failureReason: [
-          { required: true, message: "审核失败原因不能为空", trigger: "blur" }
+          {  }
         ],
       }
     };
@@ -430,6 +430,9 @@ export default {
     },
     /** 审核拒绝*/
     submitRefuse() {
+      this.rules.failureReason = [
+              { required: true, message: '拒绝原因不能为空！', trigger: 'blur' }
+            ];
       this.$refs["auditForm"].validate(valid => {
         if (valid) {
           this.$modal.confirm('是否【拒绝】商户"' + this.auditForm.merchantName + '"的认证申请？').then(() => {
@@ -450,6 +453,7 @@ export default {
     submitPass() {
       this.buttonLoading = true;
       this.auditForm.status = "1";
+      this.$refs["auditForm"].clearValidate("failureReason");
       this.$modal.confirm('是否【通过】商户"' + this.auditForm.merchantName + '"的认证申请？').then(() => {
           merchantAudit(this.auditForm).then(response => {
             this.$modal.msgSuccess("审核结果：通过");

src/views/business/userVerification/index.vue

@@ -297,7 +297,7 @@ export default {
           { required: true, message: "手持身份证照不能为空", trigger: "blur" }
         ],
         failureReason: [
-          { required: true, message: "审核失败原因不能为空", trigger: "blur" }
+          {}
         ],
       }
     };
@@ -450,6 +450,9 @@ export default {
     },
     /** 审核拒绝*/
     submitRefuse() {
+      this.rules.failureReason = [
+              { required: true, message: '拒绝原因不能为空！', trigger: 'blur' }
+            ];
       this.$refs["auditForm"].validate(valid => {
         if (valid) {
           this.$modal.confirm('是否【拒绝】用户"' + this.auditForm.userInfoName + '"的认证申请？').then(() => {
@@ -468,6 +471,8 @@ export default {
     },
     /** 审核通过*/
     submitPass() {
+
+      this.$refs["auditForm"].clearValidate("failureReason");
       this.$modal.confirm('是否【通过】用户"' + this.auditForm.userInfoName + '"的认证申请？').then(() => {
         this.buttonLoading = true;
         this.auditForm.status = "1";