From ebbe59b6ee3378fa296441cabe8bb81b2bc200b5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 26 Apr 2021 13:47:22 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html | 10 ++++++++++
1 files changed, 10 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 57fa867..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
@@ -121,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