From 49eea49fa923f0d0db62ef46405593f162598a3f Mon Sep 17 00:00:00 2001
From: leon <916117771@qq.com>
Date: Tue, 28 Apr 2026 19:07:07 +0800
Subject: [PATCH] =?UTF-8?q?ui(dashboard):=20=E7=AD=9B=E5=8F=B7=E5=99=A8?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E6=8C=89=E7=94=9F=E8=82=96=E5=88=86=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E6=AF=8F=E8=A1=8C=E4=B8=80=E4=B8=AA=E7=94=9F=E8=82=96?=
 =?UTF-8?q?=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

号码按鼠牛虎兔龙蛇马羊猴鸡狗猪顺序排列，每行左侧显示生肖标签，
右侧横向排列该生肖下的所有号码球。弹窗高度从600px增加到750px。
---
 public/assets/js/backend/history.js | 43 +++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 12 deletions(-)

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 += '<div class="nf-number" data-num="' + num + '" data-color="' + colorLabel + '" data-animal="' + animal + '" data-tail="' + (num % 10) + '" style="text-align:center;background:#f9f9f9;padding:6px 4px;border-radius:6px;min-width:60px;transition:opacity 0.2s;">' +
-                        '<span style="display:inline-block;width:36px;height:36px;line-height:36px;text-align:center;border-radius:50%;color:#fff;background-color:' + colorHex + ';font-weight:bold;">' + num + '</span>' +
-                        '<div style="font-size:10px;color:#666;line-height:1.2;">' + animal + '</div>' +
-                        '</div>';
+                    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 += '<div class="nf-zodiac-row" style="display:flex;align-items:center;gap:10px;margin-bottom:8px;">';
+                    html += '<div style="font-weight:bold;font-size:14px;width:30px;text-align:center;">' + zodiac + '</div>';
+                    html += '<div style="display:flex;flex-wrap:wrap;gap:8px;flex:1;">';
+                    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 += '<div class="nf-number" data-num="' + num + '" data-color="' + colorLabel + '" data-animal="' + zodiac + '" data-tail="' + (num % 10) + '" style="text-align:center;background:#f9f9f9;padding:6px 4px;border-radius:6px;min-width:55px;transition:opacity 0.2s;">' +
+                            '<span style="display:inline-block;width:36px;height:36px;line-height:36px;text-align:center;border-radius:50%;color:#fff;background-color:' + colorHex + ';font-weight:bold;">' + num + '</span>' +
+                            '<div style="font-size:10px;color:#666;line-height:1.2;">' + zodiac + '</div>' +
+                            '</div>';
+                    }
+                    html += '</div></div>';
                 }
                 $('#nf-numbers', layero).html(html);
             },