diff --git a/public/assets/js/backend/history.js b/public/assets/js/backend/history.js index 62a7396..335fae0 100644 --- a/public/assets/js/backend/history.js +++ b/public/assets/js/backend/history.js @@ -789,7 +789,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Layer.open({ type: 1, title: '筛号器', - area: ['700px', '600px'], + area: ['700px', '750px'], content: html, shadeClose: true, success: function (layero, index) { @@ -830,20 +830,39 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin * 渲染筛号器号码网格 */ renderNumberFilterGrid: function (layero) { + var zodiacOrder = ['鼠', '牛', '虎', '兔', '龙', '蛇', '马', '羊', '猴', '鸡', '狗', '猪']; + var zodiacNums = {}; + for (var i = 0; i < zodiacOrder.length; i++) { + zodiacNums[zodiacOrder[i]] = []; + } var colorMap = Controller.api.colorMap; - var html = ''; for (var num = 1; num <= 49; num++) { - var colorHex = Controller.api.getColorByNum(num); - var colorRaw = colorMap[num] || ''; var animal = Controller.api.getAnimalByNum(num); - var colorLabel = ''; - if (colorRaw.indexOf('红') !== -1) colorLabel = '红'; - else if (colorRaw.indexOf('蓝') !== -1) colorLabel = '蓝'; - else if (colorRaw.indexOf('绿') !== -1) colorLabel = '绿'; - html += '
' + - '' + num + '' + - '
' + animal + '
' + - '
'; + if (!zodiacNums[animal]) zodiacNums[animal] = []; + zodiacNums[animal].push(num); + } + var html = ''; + for (var z = 0; z < zodiacOrder.length; z++) { + var zodiac = zodiacOrder[z]; + var nums = zodiacNums[zodiac]; + if (nums.length === 0) continue; + html += '
'; + html += '
' + zodiac + '
'; + html += '
'; + for (var i = 0; i < nums.length; i++) { + var num = nums[i]; + var colorHex = Controller.api.getColorByNum(num); + var colorRaw = colorMap[num] || ''; + var colorLabel = ''; + if (colorRaw.indexOf('红') !== -1) colorLabel = '红'; + else if (colorRaw.indexOf('蓝') !== -1) colorLabel = '蓝'; + else if (colorRaw.indexOf('绿') !== -1) colorLabel = '绿'; + html += '
' + + '' + num + '' + + '
' + zodiac + '
' + + '
'; + } + html += '
'; } $('#nf-numbers', layero).html(html); },