From 51775f4e705b711828f7b5902a132cbfd466212c Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Aug 2022 18:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E7=9A=84=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/standardsAssociationApi.js            |  4 +++
 .../CertificateManagement.vue                 | 30 +++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js
index 419d85b..3c0796e 100644
--- a/src/api/standardsAssociationApi.js
+++ b/src/api/standardsAssociationApi.js
@@ -76,6 +76,9 @@ const getCertificateById = (params) => getAction('/vinCertificate/vinCertificate
 // 撤回收费证书
 const withDrawChargeCertificate = (params) => postAction('/vinCertificate/vinCertificate/withdrawChargeCertificate', params)
 
+// 撤回免费证书
+const withDrawFreeCertificate = (params) => postAction('/vinCertificate/vinCertificate/withdrawFreeCertificate', params)
+
 /****证书缴费 列表页所用接口-结束 ****/
 
 // 会员申请授权
@@ -105,6 +108,7 @@ export {
   downNewestNotice,
   getCertificateById,
   withDrawChargeCertificate,
+  withDrawFreeCertificate,
 
   application,
   determineOrCancel,
diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index ef15ab1..f970235 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -226,7 +226,7 @@ import {RangeDateMixin} from '@/mixins/RangeDateMixin'
 import JDictSelectTag from '../../components/standardsAssociation/JDictSelectTag'
 // eslint-disable-next-line no-unused-vars
 import {downloadFile, getAction, getFileAccessHttpUrl} from '@/api/memberManage'
-import {withDrawChargeCertificate} from '@api/standardsAssociationApi'
+import {withDrawChargeCertificate,withDrawFreeCertificate} from '@api/standardsAssociationApi'
 import {CertificateModalityEnums, CertificateStatusEnums, ChargeTypeEnums} from '../../enums/memberEnums'
 import CheckCertificateModel from '@views/standardsAssociation/model/CheckCertificateModel'
 import BindMemberModel from '@views/standardsAssociation/model/BindMemberModel'
@@ -426,14 +426,26 @@ export default {
             certificateStatus: '2',
             code: record.code
           }
-          withDrawChargeCertificate(param).then(res => {
-            if (res.success) {
-              that.$message.success(res.message)
-              that.loadData()
-            } else {
-              that.$message.warning(res.message)
-            }
-          })
+          if(record.chargeType === 1){
+            withDrawFreeCertificate(param).then(res => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.loadData()
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+          }else {
+            withDrawChargeCertificate(param).then(res => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.loadData()
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+          }
+
         }
       })
     },