From cde26b76b1aacfebe579615720206842910b05bb Mon Sep 17 00:00:00 2001 From: MaysWind Date: Wed, 28 May 2025 22:22:03 +0800 Subject: [PATCH] don't show exchange rates data provider when use user custom exchange rates data --- src/views/base/AboutPageBase.ts | 5 +++++ src/views/desktop/AboutPage.vue | 13 +++++++++++-- src/views/mobile/AboutPage.vue | 15 ++++++++++++--- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/views/base/AboutPageBase.ts b/src/views/base/AboutPageBase.ts index 68bbdf8e..8a213934 100644 --- a/src/views/base/AboutPageBase.ts +++ b/src/views/base/AboutPageBase.ts @@ -27,12 +27,16 @@ export function useAboutPageBase() { return formatUnixTimeToLongDateTime(parseInt(time)); }); + const exchangeRatesData = computed(() => exchangeRatesStore.latestExchangeRates.data); + const isUserCustomExchangeRates = computed(() => exchangeRatesStore.isUserCustomExchangeRates); + const mapProviderName = computed(() => { const provider = getMapProvider(); return provider ? tt(`mapprovider.${provider}`) : ''; }); const mapProviderWebsite = computed(() => getMapWebsite()); + const licenseLines = computed(() => getLicense().replaceAll(/\r/g, '').split('\n')); const thirdPartyLicenses = computed(() => getThirdPartyLicenses()); @@ -42,6 +46,7 @@ export function useAboutPageBase() { // computed states buildTime, exchangeRatesData, + isUserCustomExchangeRates, mapProviderName, mapProviderWebsite, licenseLines, diff --git a/src/views/desktop/AboutPage.vue b/src/views/desktop/AboutPage.vue index da8fb9fe..f2dc4948 100644 --- a/src/views/desktop/AboutPage.vue +++ b/src/views/desktop/AboutPage.vue @@ -53,7 +53,7 @@ - + @@ -124,5 +124,14 @@ import { useI18n } from '@/locales/helpers.ts'; import { useAboutPageBase } from '@/views/base/AboutPageBase.ts'; const { tt } = useI18n(); -const { version, buildTime, exchangeRatesData, mapProviderName, mapProviderWebsite, licenseLines, thirdPartyLicenses } = useAboutPageBase(); +const { + version, + buildTime, + exchangeRatesData, + isUserCustomExchangeRates, + mapProviderName, + mapProviderWebsite, + licenseLines, + thirdPartyLicenses +} = useAboutPageBase(); diff --git a/src/views/mobile/AboutPage.vue b/src/views/mobile/AboutPage.vue index 68d277c4..3c528722 100644 --- a/src/views/mobile/AboutPage.vue +++ b/src/views/mobile/AboutPage.vue @@ -12,8 +12,8 @@ - {{ tt('Exchange Rates Data') }} - + {{ tt('Exchange Rates Data') }} + @@ -62,7 +62,16 @@ import { useI18n } from '@/locales/helpers.ts'; import { useAboutPageBase } from '@/views/base/AboutPageBase.ts'; const { tt } = useI18n(); -const { version, buildTime, exchangeRatesData, mapProviderName, mapProviderWebsite, licenseLines, thirdPartyLicenses } = useAboutPageBase(); +const { + version, + buildTime, + exchangeRatesData, + isUserCustomExchangeRates, + mapProviderName, + mapProviderWebsite, + licenseLines, + thirdPartyLicenses +} = useAboutPageBase();