diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 11c8b2527..ece1f94da 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -5,7 +5,7 @@ import {fetchPost} from "../util/fetch"; import {repos} from "./repos"; import {confirmDialog} from "../dialog/confirmDialog"; import {hasClosestByClassName} from "../protyle/util/hasClosest"; -import {getEventName} from "../protyle/util/compatibility"; +import {getEventName, isIPad} from "../protyle/util/compatibility"; import {processSync} from "../dialog/processSystem"; import {needSubscribe} from "../util/needSubscribe"; import {syncGuide} from "../sync/syncGuide"; @@ -29,10 +29,11 @@ const genSVGBG = () => { export const account = { element: undefined as Element, genHTML: (onlyPayHTML = false) => { - const payHTML = ` + const hideIPad = isIPad() ? " fn__none" : ""; + const payHTML = ` ${window.siyuan.languages[window.siyuan.user?.userSiYuanOneTimePayStatus === 1 ? "account4" : "account1"]} -
+
${window.siyuan.languages.freeSub} @@ -86,7 +87,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} + ${window.siyuan.languages.clickMeToRenew} `; if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) { subscriptionHTML = `
${window.siyuan.languages.onepay}
@@ -121,8 +122,8 @@ ${renewHTML}
- ${window.siyuan.languages.manage} - + ${window.siyuan.languages.manage} + diff --git a/app/src/mobile/settings/account.ts b/app/src/mobile/settings/account.ts index 68ecbc940..076bd078c 100644 --- a/app/src/mobile/settings/account.ts +++ b/app/src/mobile/settings/account.ts @@ -1,5 +1,5 @@ import {openModel} from "../menu/model"; -import {getEventName} from "../../protyle/util/compatibility"; +import {getEventName, isIPhone} from "../../protyle/util/compatibility"; import {fetchPost} from "../../util/fetch"; import {closePanel} from "../util/closePanel"; import {processSync} from "../../dialog/processSystem"; @@ -12,10 +12,11 @@ import {hideElements} from "../../protyle/ui/hideElements"; import {Constants} from "../../constants"; export const showAccountInfo = () => { - const payHTML = ` + const hideIphone = isIPhone() ? " fn__none" : ""; + const payHTML = ` ${window.siyuan.languages[window.siyuan.user?.userSiYuanOneTimePayStatus === 1 ? "account4" : "account1"]} -
+
${window.siyuan.languages.freeSub} @@ -44,7 +45,7 @@ export const showAccountInfo = () => { ${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} + ${window.siyuan.languages.clickMeToRenew}
`; if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) { subscriptionHTML = `
${window.siyuan.languages.onepay}
@@ -86,8 +87,8 @@ ${renewHTML}`;
- ${window.siyuan.languages.manage} - + ${window.siyuan.languages.manage} + @@ -119,6 +120,14 @@ ${renewHTML}`; bindLoginEvent(dialog.element.querySelector(".b3-dialog__body"), true); dialog.element.setAttribute("data-key", Constants.DIALOG_DEACTIVATEUSER); }); + const trialSubElement = modelMainElement.querySelector("#trialSub"); + if (trialSubElement) { + trialSubElement.addEventListener("click", () => { + fetchPost("/api/account/startFreeTrial", {}, () => { + modelMainElement.querySelector("#refresh").dispatchEvent(new Event("click")); + }); + }); + } const refreshElement = modelMainElement.querySelector("#refresh"); refreshElement.addEventListener("click", () => { const svgElement = refreshElement.firstElementChild;