From 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 16:45:27 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html |    1 +
 1 files changed, 1 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 da4a408..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
@@ -128,6 +128,7 @@
                     <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>

--
Gitblit v1.9.1