From 82826229ef06372b9e254a4b874a35ed474eefd8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 2 Mar 2024 17:24:18 +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=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/api/user.js b/src/api/user.js
index ffc7cf6..599ebd8 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -456,6 +456,10 @@ export function exchangeCodeBatchList() {
 export function exchangeCodeEditForm() {
   return request.get('user/exchangeCode/editForm')
 }
+// 会员卡兑换码 - 激活表单
+export function exchangeCodeActivateForm() {
+  return request.get('user/exchangeCode/activateForm')
+}
 
 
 
diff --git a/src/views/user/member/exchangeCode.vue b/src/views/user/member/exchangeCode.vue
index 4aa1905..449cae2 100644
--- a/src/views/user/member/exchangeCode.vue
+++ b/src/views/user/member/exchangeCode.vue
@@ -19,13 +19,14 @@
           </el-form>
           <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="info" @click="exports">导出</el-button>
         </div>
       </div>
       <!--表格信息-->
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
         <el-table-column label="ID" prop="id" min-width="80" align="center"/>
-        <el-table-column label="归属批次" min-width="150" align="center">
+        <el-table-column label="归属批次" min-width="130" align="center">
           <template slot-scope="scope">
             {{ scope.row.batch_title }}<br />
             {{ scope.row.batch_unique }}
@@ -38,14 +39,25 @@
             <el-tag v-else-if="scope.row.status == 2" type="success" effect="dark">{{ scope.row.exchange_code }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="状态" min-width="100" align="center">
+        <el-table-column label="状态" min-width="150" align="center">
+          <template slot="header" slot-scope="scope">
+            状态<br />
+            激活时间 / 使用时间
+          </template>
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 0" type="info">待激活</el-tag>
-            <el-tag v-else-if="scope.row.status == 1" type="primary">已激活</el-tag>
+            <template v-else-if="scope.row.status == 1">
+              <el-tag type="primary">
+                已激活<br />
+                {{scope.row.activate}}
+              </el-tag>
+            </template>
             <el-tag v-else-if="scope.row.status == 2" type="success">已使用</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="添加时间" prop="create_time" min-width="130" align="center"/>
+        <el-table-column label="绑定商户" prop="mer_name" min-width="100" align="center"/>
+        <el-table-column label="绑定会员卡" prop="svip_name" min-width="100" align="center"/>
       </el-table>
       <!--分页-->
       <div class="block">
@@ -65,7 +77,7 @@
 </template>
 
 <script>
-import {exchangeCodeBatchList, exchangeCodeEditForm, exchangeCodeList} from "@/api/user";
+import {exchangeCodeActivateForm, exchangeCodeBatchList, exchangeCodeEditForm, exchangeCodeList} from "@/api/user";
 import createWorkBook from "@/utils/newToExcel";
 
 export default {
@@ -111,11 +123,11 @@ export default {
     },
     pageUserChange(page) {
       this.tableFrom.page = page;
-      this.getUserList('');
+      this.getList('');
     },
     handleUserSizeChange(val) {
       this.tableFrom.limit = val;
-      this.getUserList('');
+      this.getList('');
     },
     // 批次列表
     getBatchList(){
@@ -130,6 +142,10 @@ export default {
     addExchangeCode(){
       this.$modalForm(exchangeCodeEditForm()).then(() => this.getList(''));
     },
+    // 激活
+    activateExchangeCode(){
+      this.$modalForm(exchangeCodeActivateForm()).then(() => this.getList(''));
+    },
     // 导出 - 导出信息
     async exports(){
       let _this = this;