From 4f6fbf376adcb3a0a12a91f39536b746be44f4c3 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 8 Nov 2024 18:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/coupon_details.vue             | 29 +++++++++++++++----
 src/views/coupon_manage/coupon_list.vue       | 16 +++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue
index e36e8ba..6e11f0c 100644
--- a/src/views/coupon_manage/components/coupon_details.vue
+++ b/src/views/coupon_manage/components/coupon_details.vue
@@ -42,20 +42,38 @@
         <el-table v-loading="loading" :data="tableData.data">
 
           <el-table-column label="用户ID" prop="id" />
-          <el-table-column label="用户名" prop="name" />
+          <el-table-column label="用户名" prpo="name">
+            <template v-slot="scope">
+              <div>{{ scope.row.name ? scope.row.name : '-' }}</div>
+
+            </template>
+          </el-table-column>
           <el-table-column label="领取时间" prop="receiveTime" />
-          <el-table-column label="使用时间" prop="useTime" />
-          <el-table-column label="获得来源" prop="source" />
+          <el-table-column label="使用时间" prpo="useTime">
+            <template v-slot="scope">
+              <div>{{ scope.row.useTime ? scope.row.useTime : '-' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="获得来源" prpo="source">
+            <template v-slot="scope">
+              <div>{{ scope.row.source == 'activate' ? '充值活动' :
+                scope.row.source == 'invited' ? '好友分享' : '' }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="状态" align="status">
             <template v-slot="scope">
               <div style="display: flex;align-items: center;">
-                <div v-if="scope.row.overNum == scope.row.num" style="width: 30px;color: #FAAD14;">未使用</div>
+                <div v-if="scope.row.overNum == scope.row.num" style="color: #FAAD14;">未使用</div>
                 <div v-if="scope.row.num!=0&&scope.row.overNum != scope.row.num">{{ scope.row.overNum }}/{{ scope.row.num }}</div>
                 <div v-if="scope.row.overNum == 0" style="color: #52C41A;">已使用</div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="使用门店" prop="tableName" />
+          <el-table-column label="使用门店" prpo="useTime">
+            <template v-slot="scope">
+              <div>{{ scope.row.tableName ? scope.row.tableName : '-' }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="150">
             <template v-slot="scope">
               <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
@@ -68,7 +86,6 @@
               </el-popconfirm>
             </template>
           </el-table-column>
-
         </el-table>
       </div>
       <div class="head-container">
diff --git a/src/views/coupon_manage/coupon_list.vue b/src/views/coupon_manage/coupon_list.vue
index 7a7d802..d334361 100644
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@@ -22,11 +22,12 @@
             {{ `领券后${scope.row.validDays}天过期` }}
           </template>
         </el-table-column> -->
-        <el-table-column label="用户领取方式">
+        <!-- <el-table-column label="用户领取方式" prpo="source">
           <template v-slot="scope">
-            {{ `无` }}
+            <div>{{ scope.row.source == 'activate' ? '充值活动' :
+              scope.row.source == 'invited' ? '好友分享' : '' }}</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="总发放数量" prop="number" />
         <el-table-column label="已领取" align="center">
           <template v-slot="scope">
@@ -57,7 +58,7 @@
     <div class="head-container">
       <el-pagination
         :total="tableData.total"
-        :current-page="tableData.page + 1"
+        :current-page="tableData.page"
         :page-size="tableData.size"
         layout="total, sizes, prev, pager, next, jumper"
         @current-change="paginationChange"
@@ -90,7 +91,7 @@ export default {
     return {
       tableData: {
         data: [],
-        page: 0,
+        page: 1,
         size: 10,
         loading: false,
         total: 0
@@ -108,7 +109,7 @@ export default {
     },
     // 重置查询
     resetHandle() {
-      this.page = 0
+      this.page = 1
       this.getTableData()
     },
     // 分页大小改变
@@ -118,7 +119,8 @@ export default {
     },
     // 分页回调
     paginationChange(e) {
-      this.tableData.page = e - 1
+      console.log(e)
+      this.tableData.page = e
       this.getTableData()
     },
     // 获取优惠券列表