From a027af29cc3d74e8d8c73c73e6fece842a45bcbe Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 25 Mar 2021 16:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/prizeInfo/info.html    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
index 780e59673..d7e25a0fd 100644
--- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
+++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
@@ -20,9 +20,9 @@
                             </li>
                             <li>
                                 <label>奖品类型：</label>
-                                <select name="PRIZETYPE">
+                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
@@ -39,9 +39,9 @@
 <!--                            </li>-->
                             <li>
                                 <label>状态：</label>
-                                <select name="STATUS">
+                                <select name="STATUS" th:with="type=${@dict.getType('status')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
@@ -81,7 +81,8 @@
         var editFlag = [[${@permission.hasPermi('activity:info:edit')}]];
         var removeFlag = [[${@permission.hasPermi('activity:info:remove')}]];
         var prefix = ctx + "activity/prize";
-
+        var datas = [[${@dict.getType('prizeType')}]];
+        var statusList = [[${@dict.getType('status')}]];
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -108,7 +109,10 @@
                 },
                 {
                     field: 'prizetype',
-                    title: '奖品类型'
+                    title: '奖品类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
                 },
                 {
                     field: 'prizevalue',
@@ -128,8 +132,11 @@
                 // },
                 {
                     field: 'status',
-                    title: '状态'
+                    title: '状态',
                     // 0 未启用，1 启用
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(statusList, value);
+                    }
                 },
                 {
                     field: 'integralprojectcode',