diff --git a/public/assets/js/backend/history.js b/public/assets/js/backend/history.js index fef71f0..335fae0 100644 --- a/public/assets/js/backend/history.js +++ b/public/assets/js/backend/history.js @@ -841,38 +841,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin if (!zodiacNums[animal]) zodiacNums[animal] = []; zodiacNums[animal].push(num); } - - var buildBall = function (num, zodiac) { - 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 = '绿'; - return '
' + - '' + num + '' + - '
' + zodiac + '
' + - '
'; - }; - var html = ''; for (var z = 0; z < zodiacOrder.length; z++) { var zodiac = zodiacOrder[z]; var nums = zodiacNums[zodiac]; if (nums.length === 0) continue; - var half = Math.ceil(nums.length / 2); - var leftNums = nums.slice(0, half); - var rightNums = nums.slice(half); - html += '
'; - html += '
'; - for (var i = 0; i < leftNums.length; i++) { - html += buildBall(leftNums[i], zodiac); - } - html += '
'; - html += '
' + zodiac + '
'; - html += '
'; - for (var i = 0; i < rightNums.length; i++) { - html += buildBall(rightNums[i], zodiac); + 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 += '
'; }