From e4931b0067057b2eb046182cbc71449d528d9797 Mon Sep 17 00:00:00 2001 From: leon <916117771@qq.com> Date: Tue, 28 Apr 2026 19:12:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"ui(dashboard):=20=E7=AD=9B=E5=8F=B7?= =?UTF-8?q?=E5=99=A8=E5=8F=B7=E7=A0=81=E6=8C=89=E7=94=9F=E8=82=96=E5=88=86?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=AF=8F=E8=A1=8C=E4=B8=80=E4=B8=AA=E7=94=9F?= =?UTF-8?q?=E8=82=96=E7=AB=96=E5=90=91=E6=8E=92=E5=88=97"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 49eea49fa923f0d0db62ef46405593f162598a3f. --- public/assets/js/backend/history.js | 45 +++++++++-------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/public/assets/js/backend/history.js b/public/assets/js/backend/history.js index 335fae0..62a7396 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', '750px'], + area: ['700px', '600px'], content: html, shadeClose: true, success: function (layero, index) { @@ -830,39 +830,20 @@ 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; - for (var num = 1; num <= 49; num++) { - var animal = Controller.api.getAnimalByNum(num); - 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 += '
'; + 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 + '
' + + '
'; } $('#nf-numbers', layero).html(html); },