From 3309c42e5046569678db0ace51b97d1b2d6618ba Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 25 Mar 2021 15:24:28 +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    | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 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 57f16d8dc..780e59673 100644
--- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
+++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
@@ -29,16 +29,16 @@
                                 <label>奖品面额：</label>
                                 <input type="text" name="PRIZEVALUE"/>
                             </li>
+<!--                            <li>-->
+<!--                                <label>创建时间：</label>-->
+<!--                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>最后修改时间：</label>-->
+<!--                                <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>-->
+<!--                            </li>-->
                             <li>
-                                <label>创建时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>
-                            </li>
-                            <li>
-                                <label>最后修改时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>
-                            </li>
-                            <li>
-                                <label>状态 0 未启用，1 启用：</label>
+                                <label>状态：</label>
                                 <select name="STATUS">
                                     <option value="">所有</option>
                                     <option value="-1">代码生成请选择字典属性</option>
@@ -94,44 +94,45 @@
                     checkbox: true
                 },
                 {
-                    field: 'PRIZEID',
+                    field: 'prizeid',
                     title: '业务主键',
                     visible: false
                 },
                 {
-                    field: 'PRIZECODE',
+                    field: 'prizecode',
                     title: '奖品代码'
                 },
                 {
-                    field: 'PRIZENAME',
+                    field: 'prizename',
                     title: '奖品名称'
                 },
                 {
-                    field: 'PRIZETYPE',
+                    field: 'prizetype',
                     title: '奖品类型'
                 },
                 {
-                    field: 'PRIZEVALUE',
+                    field: 'prizevalue',
                     title: '奖品面额'
                 },
                 {
-                    field: 'COMMENTS',
+                    field: 'comments',
                     title: '备注'
                 },
+                // {
+                //     field: 'CREATETIMESTAMP',
+                //     title: '创建时间'
+                // },
+                // {
+                //     field: 'LASTUPDATETIMESTAMP',
+                //     title: '最后修改时间'
+                // },
                 {
-                    field: 'CREATETIMESTAMP',
-                    title: '创建时间'
+                    field: 'status',
+                    title: '状态'
+                    // 0 未启用，1 启用
                 },
                 {
-                    field: 'LASTUPDATETIMESTAMP',
-                    title: '最后修改时间'
-                },
-                {
-                    field: 'STATUS',
-                    title: '状态 0 未启用，1 启用'
-                },
-                {
-                    field: 'INTEGRALPROJECTCODE',
+                    field: 'integralprojectcode',
                     title: '积分项目编码'
                 },
                 {
@@ -139,8 +140,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.PRIZEID + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.PRIZEID + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prizeid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prizeid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]