From bda1c0165c6188056f2b33332008e6ecefb264c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 18:09:09 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
index 0540edb..8f1da03 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
@@ -82,6 +82,17 @@
                         show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
+                        label="状态"
+                        show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.state == 1">待领取</span>
+                        <span v-if="scope.row.state == 2">已领取</span>
+                        <span v-if="scope.row.state == 3">待配送</span>
+                        <span v-if="scope.row.state == 4">待收货</span>
+                        <span v-if="scope.row.state == 5">已失效</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
                         label="签到类型"
                         show-overflow-tooltip>
                     <template slot-scope="scope">
@@ -110,6 +121,16 @@
                         label="获得奖励"
                         show-overflow-tooltip>
                 </el-table-column>
+
+                <el-table-column
+                        label="奖励名称"
+                        show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        {{scope.row.awardName}}
+                        <span v-if="scope.row.awardType == 3">({{scope.row.couponName}})</span>
+                        <span v-if="scope.row.awardType == 2">(*{{scope.row.scoreCnt}})</span>
+                    </template>
+                </el-table-column>
             </el-table>
         </el-row>
         <el-row class="paginationStyle"  >

--
Gitblit v1.9.1