diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html index 4f1349e08..0eac32e16 100644 --- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html +++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html @@ -23,10 +23,10 @@ - - - - +
  • + + +
  • diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html index ca08dcef3..bdd0e2901 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html @@ -40,7 +40,11 @@
  • - +
  • @@ -143,6 +147,7 @@ var prefix = ctx + "activity/award/record"; var datas = [[${@dict.getType('prizeLevel')}]]; var prizetypes = [[${@dict.getType('prizeType')}]]; + var drawResults = [[${@dict.getType('drawResult')}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; @@ -193,7 +198,10 @@ }, { field: 'awardresult', - title: '发奖结果' + title: '发奖结果', + formatter: function (value, row, index) { + return $.table.selectDictLabel(drawResults, value); + } }, { field: 'awardtime', diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html index 4e7455ede..d84105c45 100644 --- a/sino-activity/src/main/resources/templates/activity/record/record.html +++ b/sino-activity/src/main/resources/templates/activity/record/record.html @@ -32,7 +32,11 @@
  • - +
  • @@ -127,6 +131,7 @@ var prefix = ctx + "activity/record"; var datas = [[${@dict.getType('prizeLevel')}]]; var prizetypes = [[${@dict.getType('prizeType')}]]; + var drawResults = [[${@dict.getType('drawResult')}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; @@ -167,7 +172,10 @@ }, { field: 'drawresult', - title: '抽奖结果' + title: '抽奖结果', + formatter: function (value, row, index) { + return $.table.selectDictLabel(drawResults, value); + } }, { field: 'prizecode',