From 8435717a58a02911e87fe54c5549d7f24c364465 Mon Sep 17 00:00:00 2001 From: HenryDu8133 <813367384@qq.com> Date: Fri, 10 Jul 2026 13:25:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(web,=20ticketmachine):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?web=E8=AE=BE=E5=A4=87ID=E5=8C=B9=E9=85=8D=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整web端设备ID匹配正则，支持带#前缀的数字ID 移除ticketmachine.lua中未使用的变量和工具函数 替换界面成本显示文本，将$改为cogs: --- ticketmachine.lua | 23 +---------------------- web/ic-card-admin.js | 2 +- web/ic-card-search.js | 2 +- web/index.js | 4 ++-- web/ticket-board.html | 2 +- web/ticket-route.js | 2 +- web/ticket-search.js | 2 +- 7 files changed, 8 insertions(+), 29 deletions(-) diff --git a/ticketmachine.lua b/ticketmachine.lua index 6c5d31c..7247f37 100644 --- a/ticketmachine.lua +++ b/ticketmachine.lua @@ -12,8 +12,6 @@ local function jsonDecode(str) end local serverConnected = nil -local serverLastChangeTs = 0 -local expectedMachineVersion = nil local versionMismatch = nil local function normalizeVersionTag(v) @@ -1227,7 +1225,7 @@ local function showSingleSegmentSelection() local x = colIdx == 0 and bx1 or bx2 local y = by + rowIdx * 4 - local label = seg.lineName .. ' $' .. tostring(seg.cost) + local label = seg.lineName .. ' cogs:' .. tostring(seg.cost) if #label > bw then label = label:sub(1, bw) end local isSelected = (state.singleSegment == seg) addButton(x, y, label, bw, 3, {isSelected and colors.green or colors.blue, colors.white}, function() @@ -2159,25 +2157,6 @@ local function generateTicketId() return generateNumericCode('TK', 8) end -local function ensureTicketIdFormat(id) - if id == nil then return '' end - local s = tostring(id) - s = s:gsub('%s+', '') - if #s == 0 then return '' end - local prefix, num = s:match('^([A-Za-z][A-Za-z])%-?([0-9]+)$') - if prefix and num then - prefix = prefix:upper() - if #num < 8 then - num = string.rep('0', 8 - #num) .. num - elseif #num > 8 then - num = num:sub(-8) - end - return prefix .. '-' .. num - end - return s:lower() -end - - local function showDone() if state.productMode == 'card' then diff --git a/web/ic-card-admin.js b/web/ic-card-admin.js index 4a1ae37..f54d7c9 100644 --- a/web/ic-card-admin.js +++ b/web/ic-card-admin.js @@ -198,7 +198,7 @@ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { diff --git a/web/ic-card-search.js b/web/ic-card-search.js index a9058c9..3bd6537 100644 --- a/web/ic-card-search.js +++ b/web/ic-card-search.js @@ -97,7 +97,7 @@ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { diff --git a/web/index.js b/web/index.js index 197b458..1dd3c5f 100644 --- a/web/index.js +++ b/web/index.js @@ -355,7 +355,7 @@ createApp({ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else { @@ -471,7 +471,7 @@ createApp({ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { diff --git a/web/ticket-board.html b/web/ticket-board.html index 7abf260..e364487 100644 --- a/web/ticket-board.html +++ b/web/ticket-board.html @@ -327,7 +327,7 @@ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else if (type === 'topup' || type === 'refill' || action === 'topup' || type === '充值') { diff --git a/web/ticket-route.js b/web/ticket-route.js index 314aadd..0b9a4e1 100644 --- a/web/ticket-route.js +++ b/web/ticket-route.js @@ -235,7 +235,7 @@ createApp({ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else { diff --git a/web/ticket-search.js b/web/ticket-search.js index 6e75866..4244654 100644 --- a/web/ticket-search.js +++ b/web/ticket-search.js @@ -117,7 +117,7 @@ deviceId = '闸机'; } else if (dStr === 'refill_machine') { deviceId = '充值机'; - } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { + } else if (dStr === 'ticket_machine' || dStr === 'ticket_vending_machine' || /^#?\d+$/.test(dStr) || dStr.includes('computer') || dStr === 'unknown') { if (type === 'entry' || action === 'entry' || type === 'exit' || action === 'exit' || type === 'check') { deviceId = '闸机'; } else {