From 8bc5dfc51001f62329188c103a3e89adccb30c1f Mon Sep 17 00:00:00 2001 From: zyh Date: Sat, 30 Aug 2025 16:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=89=87=E9=93=BE=E6=8E=A5=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3=E4=BB=A5=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98=EF=BC=9B=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8C=BA=E5=9F=9F=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9EICP=E5=A4=87=E6=A1=88=E5=8F=B7=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B=E7=A7=BB=E9=99=A4=E9=93=BE=E6=8E=A5=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=89=A9=E4=BD=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/play/GamePage.vue | 8 ++++---- src/components/play/SelectRegion.vue | 1 + src/views/Play.vue | 6 +++--- src/views/links/LinkGenerate.vue | 19 ------------------- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/components/play/GamePage.vue b/src/components/play/GamePage.vue index 4aeb3ba..53b1069 100644 --- a/src/components/play/GamePage.vue +++ b/src/components/play/GamePage.vue @@ -21,19 +21,19 @@ diff --git a/src/components/play/SelectRegion.vue b/src/components/play/SelectRegion.vue index c3d787a..761b2d2 100644 --- a/src/components/play/SelectRegion.vue +++ b/src/components/play/SelectRegion.vue @@ -33,6 +33,7 @@

绝对安全保障!请耐心等待

温馨提示: 请选择正确区域

机器ID: {{ mecmachineId }}

+

桂ICP备2025067557号-2

diff --git a/src/views/Play.vue b/src/views/Play.vue index b1583f7..2ada9a1 100644 --- a/src/views/Play.vue +++ b/src/views/Play.vue @@ -7,7 +7,7 @@ @@ -23,7 +23,7 @@ :max-qr-retries="state.maxQrRetries" :qr-error="state.qrError" :submitting="state.submitting" - :mecmachine-id="state.mecmachineId" + :mecmachine-id="state.mecmachineId || state.machineId" @qr-image-error="handleQrImageError" @retry-qr-code="retryGetQrCode" @page-refresh="handlePageRefresh" @@ -53,7 +53,7 @@ diff --git a/src/views/links/LinkGenerate.vue b/src/views/links/LinkGenerate.vue index aa1d405..31d0ed1 100644 --- a/src/views/links/LinkGenerate.vue +++ b/src/views/links/LinkGenerate.vue @@ -270,13 +270,6 @@ {{ row.statusDesc }} - - - @@ -362,12 +355,6 @@ 积分 {{ item.totalPoints }} -
- 剩余时间 - 已过期 - {{ formatRemainingTime(item.remainingSeconds) }} - - -
@@ -749,7 +736,6 @@ const exportToExcel = () => { { key: 'times', label: '次数' }, { key: 'totalPoints', label: '总积分' }, { key: 'statusDesc', label: '状态' }, - { key: 'remainingTime', label: '剩余时间' }, { key: 'linkUrl', label: '链接地址' }, { key: 'expireAt', label: '过期时间' }, { key: 'createdAt', label: '创建时间' } @@ -757,7 +743,6 @@ const exportToExcel = () => { const data = linkList.value.map(item => ({ ...item, - remainingTime: item.isExpired ? '已过期' : (item.remainingSeconds > 0 ? formatRemainingTime(item.remainingSeconds) : '-'), linkUrl: generateLinkUrl(item.codeNo), expireAt: formatDateTime(item.expireAt), createdAt: formatDateTime(item.createdAt) @@ -894,7 +879,6 @@ const exportSelectedToExcel = () => { { key: 'times', label: '次数' }, { key: 'totalPoints', label: '总积分' }, { key: 'statusDesc', label: '状态' }, - { key: 'remainingTime', label: '剩余时间' }, { key: 'linkUrl', label: '链接地址' }, { key: 'expireAt', label: '过期时间' }, { key: 'createdAt', label: '创建时间' } @@ -902,7 +886,6 @@ const exportSelectedToExcel = () => { const data = selectedRows.value.map(item => ({ ...item, - remainingTime: item.isExpired ? '已过期' : (item.remainingSeconds > 0 ? formatRemainingTime(item.remainingSeconds) : '-'), linkUrl: generateLinkUrl(item.codeNo), expireAt: formatDateTime(item.expireAt), createdAt: formatDateTime(item.createdAt) @@ -1024,7 +1007,6 @@ const downloadCurrentBatch = async () => { { key: 'times', label: '次数' }, { key: 'totalPoints', label: '总积分' }, { key: 'statusDesc', label: '状态' }, - { key: 'remainingTime', label: '剩余时间' }, { key: 'linkUrl', label: '链接地址' }, { key: 'expireAt', label: '过期时间' }, { key: 'createdAt', label: '创建时间' } @@ -1032,7 +1014,6 @@ const downloadCurrentBatch = async () => { const data = currentBatchData.map(item => ({ ...item, - remainingTime: item.isExpired ? '已过期' : (item.remainingSeconds > 0 ? formatRemainingTime(item.remainingSeconds) : '-'), linkUrl: generateLinkUrl(item.codeNo), expireAt: formatDateTime(item.expireAt), createdAt: formatDateTime(item.createdAt)