From 59ee3d8cebc4065dfcc5a1c4de3a16bf0e2bdeda Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 8 Jul 2025 13:48:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E9=98=85=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/composables/usePWAInstall.ts | 32 +++++++++++------------ src/locales/zh-CN.ts | 6 ++--- src/views/subscribe/SubscribeListView.vue | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/composables/usePWAInstall.ts b/src/composables/usePWAInstall.ts index b04c5684..b702abca 100644 --- a/src/composables/usePWAInstall.ts +++ b/src/composables/usePWAInstall.ts @@ -96,54 +96,54 @@ export function usePWAInstall() { const ua = navigator.userAgent const isIOS = /iPad|iPhone|iPod/.test(ua) && !(window as any).MSStream const isAndroid = /Android/.test(ua) - const isSafari = /Safari/.test(ua) && !/Chrome/.test(ua) + const isSafari = /Safari/.test(ua) && !/Chrome/.test(ua) && !/Edg/.test(ua) const isChrome = /Chrome/.test(ua) && !/Edg/.test(ua) const isEdge = /Edg/.test(ua) const isFirefox = /Firefox/.test(ua) - if (isIOS && isSafari) { + if (isEdge) { return { - platform: 'ios', + platform: 'Microsoft Edge', + platformKey: 'edge', + } + } else if (isIOS && isSafari) { + return { + platform: 'iOS Safari', platformKey: 'ios', } } else if (isAndroid && isChrome) { return { - platform: 'android', + platform: 'Android Chrome', platformKey: 'android', } - } else if (isEdge) { - return { - platform: 'edge', - platformKey: 'edge', - } } else if (isFirefox && isAndroid) { return { - platform: 'firefox', - platformKey: 'android', // Firefox on Android uses similar steps to Chrome + platform: 'Android Firefox', + platformKey: 'android', } } else if (isFirefox) { return { - platform: 'firefox', + platform: 'Firefox', platformKey: 'firefox', } } else if (isChrome) { return { - platform: 'chrome', + platform: 'Chrome', platformKey: 'chrome', } } else if (isSafari) { return { - platform: 'safari', + platform: 'Safari', platformKey: 'safari', } } else if (isAndroid) { return { - platform: 'mobile', + platform: 'Mobile Browser', platformKey: 'mobile', } } else { return { - platform: 'desktop', + platform: 'Desktop Browser', platformKey: 'desktop', } } diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 8ee58a58..b1097ad2 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -187,9 +187,9 @@ export default { '点击"安装"确认', ], edge: [ - '点击地址栏右侧的应用图标', - '选择"安装此站点为应用"', - '点击"安装"确认', + '点击地址栏右侧的"应用可用"图标', + '在弹出的面板中点击"安装"按钮', + '在确认对话框中点击"安装"', ], firefox: [ '点击地址栏右侧的安装图标', diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue index e9c00bb6..20b79a89 100644 --- a/src/views/subscribe/SubscribeListView.vue +++ b/src/views/subscribe/SubscribeListView.vue @@ -183,7 +183,7 @@ useDynamicButton({ :error-description="keyword ? t('subscribe.noFilterData') : t('subscribe.noSubscribeData')" /> - +