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)