From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Fri, 09 Apr 2021 14:34:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 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 31062c8..8c2f2e4 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,12 +82,30 @@ show-overflow-tooltip> </el-table-column> <el-table-column - prop="cumulativeDay" - label="连续签到天数" + label="状态" show-overflow-tooltip> + <template slot-scope="scope"> + <span v-if="scope.row.state == 1">待领取</span> + <span v-if="scope.row.state == 2">已领取</span> + </template> </el-table-column> <el-table-column - label="奖励类型"> + label="签到类型" + show-overflow-tooltip> + <template slot-scope="scope"> + <span v-if="scope.row.awardRule == 1">日常奖励</span> + <span v-if="scope.row.awardRule == 2">累计签到奖励</span> + </template> + </el-table-column> + <el-table-column + label="连续签到天数" + show-overflow-tooltip> + <template slot-scope="scope"> + <span v-if="scope.row.awardRule == 2">{{scope.row.cumulativeDay}}</span> + </template> + </el-table-column> + <el-table-column + label="奖品类型"> <template slot-scope="scope"> <span v-if="scope.row.awardType == 1">自定义礼品</span> <span v-if="scope.row.awardType == 2">积分</span> -- Gitblit v1.9.1