From 4cab5d1219c7ea01e60a0629bf0e9e062be029d1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 16:00:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
index 3c585e0..d368dd8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html
@@ -97,6 +97,7 @@
                         <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>
                     </template>
                 </el-table-column>
                 <el-table-column

--
Gitblit v1.9.1