From 50fafa9b7f4360ba6399b1b9a16fcaf0230c904f Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 19 Mar 2025 17:23:11 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/14159 --- app/src/config/account.ts | 64 ++++++++++++++++++++++++++---- app/src/mobile/settings/account.ts | 2 +- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/app/src/config/account.ts b/app/src/config/account.ts index ece1f94da..b6c14eae5 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -5,12 +5,13 @@ import {fetchPost} from "../util/fetch"; import {repos} from "./repos"; import {confirmDialog} from "../dialog/confirmDialog"; import {hasClosestByClassName} from "../protyle/util/hasClosest"; -import {getEventName, isIPad} from "../protyle/util/compatibility"; +import {getEventName, isInIOS} from "../protyle/util/compatibility"; import {processSync} from "../dialog/processSystem"; import {needSubscribe} from "../util/needSubscribe"; import {syncGuide} from "../sync/syncGuide"; import {hideElements} from "../protyle/ui/hideElements"; import {getCloudURL, getIndexURL} from "./util/about"; +import {genUUID} from "../util/genID"; const genSVGBG = () => { let html = ""; @@ -29,11 +30,29 @@ const genSVGBG = () => { export const account = { element: undefined as Element, genHTML: (onlyPayHTML = false) => { - const hideIPad = isIPad() ? " fn__none" : ""; - const payHTML = ` + const isIOS = isInIOS(); + let payHTML + if (isIOS) { + // 已付费 + if (window.siyuan.user?.userSiYuanOneTimePayStatus === 1) { + payHTML = `` + } else { + payHTML = ` +
+` + } + } else { + payHTML = `
${window.siyuan.languages[window.siyuan.user?.userSiYuanOneTimePayStatus === 1 ? "account4" : "account1"]} - -
+` + } + payHTML += `
${window.siyuan.languages.freeSub} @@ -87,7 +106,7 @@ ${genSVGBG()} ${window.siyuan.languages.account6} ${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))} ${window.siyuan.languages.day} - ${window.siyuan.languages.clickMeToRenew} + ${isIOS ? `${window.siyuan.languages.clickMeToRenew}` : `${window.siyuan.languages.clickMeToRenew}`} `; if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) { subscriptionHTML = `
${window.siyuan.languages.onepay}
@@ -122,8 +141,8 @@ ${renewHTML}