From 43d0db50bed72ff0f5c9f1279b26d77403f43faf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Apr 2021 18:23:06 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html | 27 ++++++++++++++++++++++++---
1 files changed, 24 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..57fa867 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,33 @@
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>
+ <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="奖励类型">
+ 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