From e80a46118263101c87eeb0d5902c8c0ee7f8830d Mon Sep 17 00:00:00 2001 From: yml Date: Tue, 17 Nov 2026 19:12:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(site):=20=E4=BF=AE=E5=A4=8D=E8=A7=A3?= =?UTF-8?q?=E5=BF=A7=E7=AB=99=E7=82=B9=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 5 ++-- frontend/public/jieyou-apple-touch-icon.png | Bin 0 -> 7125 bytes frontend/public/jieyou-favicon.svg | 8 ++++++ frontend/public/site-bootstrap.js | 24 ++++++++++++++++++ .../composables/useDesktopNotification.ts | 7 +++-- frontend/src/sites/dachui/index.ts | 2 +- frontend/src/sites/siteBrand.spec.ts | 2 ++ frontend/src/stores/distributionSite.ts | 21 ++++++++++++--- 8 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 frontend/public/jieyou-apple-touch-icon.png create mode 100644 frontend/public/jieyou-favicon.svg create mode 100644 frontend/public/site-bootstrap.js diff --git a/frontend/index.html b/frontend/index.html index 1e4ccfcd..a74ea65a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,8 +4,9 @@ 大锤商行 - - + + +
diff --git a/frontend/public/jieyou-apple-touch-icon.png b/frontend/public/jieyou-apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dba7774848d2dc757721877930e20dda648a4dc1 GIT binary patch literal 7125 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 Tg@D$-DK#ZIHQ5@lY4CpmIHiov literal 0 HcmV?d00001 diff --git a/frontend/public/jieyou-favicon.svg b/frontend/public/jieyou-favicon.svg new file mode 100644 index 00000000..c18f85f8 --- /dev/null +++ b/frontend/public/jieyou-favicon.svg @@ -0,0 +1,8 @@ + + 解忧商行印章 + 解忧商行方形朱砂印章 + + + 解 + 忧 + diff --git a/frontend/public/site-bootstrap.js b/frontend/public/site-bootstrap.js new file mode 100644 index 00000000..1ef6d290 --- /dev/null +++ b/frontend/public/site-bootstrap.js @@ -0,0 +1,24 @@ +/* global document, URLSearchParams, window */ + +(() => { + const host = window.location.hostname.toLowerCase() + const params = new URLSearchParams(window.location.search) + const tenantHint = (params.get('tenant_code') || params.get('tenant') || '').toLowerCase() + const isJieyou = + host === 'zuhaox.com' || + host.endsWith('.zuhaox.com') || + host.startsWith('jieyou.') || + tenantHint === 'jieyou' + if (!isJieyou) return + + document.title = '解忧商行 - 官方租号平台' + const icon = document.getElementById('site-icon') + if (icon) { + icon.href = '/jieyou-favicon.svg' + icon.type = 'image/svg+xml' + } + const appleIcon = document.getElementById('site-apple-touch-icon') + if (appleIcon) { + appleIcon.href = '/jieyou-apple-touch-icon.png' + } +})() diff --git a/frontend/src/features/chats/composables/useDesktopNotification.ts b/frontend/src/features/chats/composables/useDesktopNotification.ts index 2e87e890..31a7f5b3 100644 --- a/frontend/src/features/chats/composables/useDesktopNotification.ts +++ b/frontend/src/features/chats/composables/useDesktopNotification.ts @@ -96,10 +96,13 @@ export function useDesktopNotification(scope: 'user' | 'admin') { if (shouldNotify(event.conversation_id, currentConversationId)) { try { + const notificationIcon = + document.querySelector("link[rel='icon']")?.href || + '/apple-touch-icon.png' const notification = new Notification(title, { body: body.length > 100 ? body.substring(0, 100) + '...' : body, - icon: '/favicon.ico', - badge: '/favicon.ico', + icon: notificationIcon, + badge: notificationIcon, tag: `chat-${event.conversation_id}`, // 相同会话的通知会被替换 requireInteraction: false, silent: false, diff --git a/frontend/src/sites/dachui/index.ts b/frontend/src/sites/dachui/index.ts index 11c966d5..c762ddbe 100644 --- a/frontend/src/sites/dachui/index.ts +++ b/frontend/src/sites/dachui/index.ts @@ -7,7 +7,7 @@ export const dachuiSite: SiteBrand = { name: '大锤商行', mark: '锤', themeColor: '#ff6a00', - favicon: '', + favicon: '/apple-touch-icon.png', storefrontText: defaultStorefrontText, logos: { light: '', diff --git a/frontend/src/sites/siteBrand.spec.ts b/frontend/src/sites/siteBrand.spec.ts index 8f1a0f1f..dec0bb14 100644 --- a/frontend/src/sites/siteBrand.spec.ts +++ b/frontend/src/sites/siteBrand.spec.ts @@ -7,6 +7,7 @@ describe('site branding registry', () => { expect(resolveSiteKey('jieyou')).toBe('jieyou') expect(siteBrandFor('jieyou').name).toBe('解忧商行') expect(siteBrandFor('jieyou').logos.seal).toMatch(/^data:image\/svg\+xml/) + expect(siteBrandFor('jieyou').favicon).toMatch(/^data:image\/svg\+xml/) }) it('falls back to Dachui for main, legacy distribution and ops contexts', () => { @@ -14,5 +15,6 @@ describe('site branding registry', () => { expect(resolveSiteKey('')).toBe('dachui') expect(resolveSiteKey('legacy_site')).toBe('dachui') expect(siteBrandFor('').mark).toBe('锤') + expect(siteBrandFor('').favicon).toBe('/apple-touch-icon.png') }) }) diff --git a/frontend/src/stores/distributionSite.ts b/frontend/src/stores/distributionSite.ts index fc68448b..9df5674f 100644 --- a/frontend/src/stores/distributionSite.ts +++ b/frontend/src/stores/distributionSite.ts @@ -474,6 +474,8 @@ export const useDistributionSiteStore = defineStore('distributionSite', { localStorage.removeItem('hfb_site_code') localStorage.removeItem('hfb_site_name') document.title = '大锤商行 - 官方租号平台' + this.faviconUrl = siteBrandFor('dachui').favicon + this.applyFavicon() }, applyTenantContext(info: TenantSiteContext) { @@ -551,13 +553,24 @@ export const useDistributionSiteStore = defineStore('distributionSite', { applyFavicon() { if (!this.faviconUrl || typeof document === 'undefined') return - let link = document.querySelector("link[rel*='icon']") as HTMLLinkElement | null - if (!link) { - link = document.createElement('link') + const iconLinks = Array.from( + document.querySelectorAll("link[rel='icon'], link[rel='apple-touch-icon']") + ) + if (iconLinks.length === 0) { + const link = document.createElement('link') link.rel = 'icon' document.head.appendChild(link) + iconLinks.push(link) + } + for (const link of iconLinks) { + if (link.rel === 'apple-touch-icon' && this.siteKey === 'jieyou') { + link.href = '/jieyou-apple-touch-icon.png' + link.type = 'image/png' + continue + } + link.href = this.faviconUrl + link.type = this.faviconUrl.endsWith('.svg') ? 'image/svg+xml' : 'image/png' } - link.href = this.faviconUrl }, }, })