From 9c51402dca077b76486588d3bfeb75d216ab86f9 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 9 Mar 2024 17:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E7=A0=81=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                        |  6 +++++-
 src/views/user/member/exchangeCode.vue | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 599ebd8..d4dd6e9 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -456,10 +456,14 @@ export function exchangeCodeBatchList() {
 export function exchangeCodeEditForm() {
   return request.get('user/exchangeCode/editForm')
 }
-// 会员卡兑换码 - 激活表单
+// 会员卡兑换码 - 分配表单
 export function exchangeCodeActivateForm() {
   return request.get('user/exchangeCode/activateForm')
 }
+// 会员卡兑换码 - 作废
+export function exchangeCodeCancelForm() {
+  return request.get('user/exchangeCode/cancelForm')
+}
 
 
 
diff --git a/src/views/user/member/exchangeCode.vue b/src/views/user/member/exchangeCode.vue
index 598fcb4..d349798 100644
--- a/src/views/user/member/exchangeCode.vue
+++ b/src/views/user/member/exchangeCode.vue
@@ -20,6 +20,7 @@
           <el-button size="small" type="primary" @click="getList(1)">搜索</el-button>
           <el-button size="small" type="success" @click="addExchangeCode">添加兑换码</el-button>
           <el-button size="small" type="warning" @click="activateExchangeCode">分配给商户</el-button>
+          <el-button size="small" type="danger" @click="cancelExchangeCode">作废兑换码</el-button>
           <el-button size="small" type="info" @click="exports">导出兑换码</el-button>
           <el-button size="small" type="info" @click="exports('down')">下载二维码</el-button>
         </div>
@@ -38,6 +39,7 @@
             <el-tag v-if="scope.row.status == 0" type="info" effect="dark">{{ scope.row.exchange_code }}</el-tag>
             <el-tag v-else-if="scope.row.status == 1" type="primary" effect="dark">{{ scope.row.exchange_code }}</el-tag>
             <el-tag v-else-if="scope.row.status == 2" type="success" effect="dark">{{ scope.row.exchange_code }}</el-tag>
+            <el-tag v-else-if="scope.row.status == 3" type="danger" effect="dark">{{ scope.row.exchange_code }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="状态" min-width="150" align="center">
@@ -59,6 +61,9 @@
                 {{scope.row.use_time}}
               </el-tag>
             </template>
+            <template v-else-if="scope.row.status == 3">
+              <el-tag type="danger">已作废</el-tag>
+            </template>
           </template>
         </el-table-column>
         <el-table-column label="添加时间" prop="create_time" min-width="130" align="center"/>
@@ -102,7 +107,13 @@
 </template>
 
 <script>
-import {exchangeCodeActivateForm, exchangeCodeBatchList, exchangeCodeEditForm, exchangeCodeList} from "@/api/user";
+import {
+  exchangeCodeActivateForm,
+  exchangeCodeBatchList,
+  exchangeCodeCancelForm,
+  exchangeCodeEditForm,
+  exchangeCodeList
+} from "@/api/user";
 import createWorkBook from "@/utils/newToExcel";
 import QRCodeOld from "qrcodejs2";
 import QRCode from "qrcode";
@@ -189,6 +200,10 @@ export default {
     activateExchangeCode(){
       this.$modalForm(exchangeCodeActivateForm()).then(() => this.getList(''));
     },
+    // 作废
+    cancelExchangeCode(){
+      this.$modalForm(exchangeCodeCancelForm()).then(() => this.getList(''));
+    },
     // 导出 - 导出信息
     async exports(type = 'excel'){
       let _this = this;