From 6922917abd80d12a5d87cc2f8d0390c55694a95a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:04:47 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html | 8 ++++++++
1 files changed, 8 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..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,6 +82,14 @@
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>
+ </template>
+ </el-table-column>
+ <el-table-column
label="签到类型"
show-overflow-tooltip>
<template slot-scope="scope">
--
Gitblit v1.9.1