Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 23:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

📱

Browse source
This commit is contained in:
Vanessa 2024-01-08 00:08:04 +08:00
parent ed7f0aee6e
commit cfc3fd11e9
3 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/assets/scss/mobile.scss
View file

@ -192,7 +192,9 @@
.toolbar__text {
min-height: 48px;
line-height: 48px;
}
.config-about__logo {
display: flex;
align-items: center;
@ -205,27 +207,24 @@
.config-account {
&__bg {
position: relative;
margin-bottom: 82px;
width: 100%;
flex: 1;
}
&__cover {
position: absolute;
top: 0;
width: 100%;
height: 100%;
width: 100vw;
height: 50vh;
background-size: cover;
background-position: center center;
}
&__avatar {
position: absolute;
bottom: 24px;
top: 50vh;
width: 128px;
height: 128px;
left: 50%;
margin-left: -64px;
margin: -160px 0 0 -64px;
background-repeat: no-repeat;
background-position: 50%;
background-size: cover;
@ -239,12 +238,9 @@
width: 100%;
box-sizing: border-box;
padding: 16px;
margin-top: 10vh;
}
&__name {
bottom: -58px;
position: absolute;
width: 100%;
text-align: center;
}

41
app/src/mobile/settings/account.ts
View file

@ -9,6 +9,7 @@ import md5 from "blueimp-md5";
import {getCloudURL} from "../../config/util/about";
import {Dialog} from "../../dialog";
import {hideElements} from "../../protyle/ui/hideElements";
import {Constants} from "../../constants";
export const showAccountInfo = () => {
let userTitlesHTML = "";
@ -19,6 +20,32 @@ export const showAccountInfo = () => {
});
userTitlesHTML += "</div>";
}
let subscriptionHTML = ""
if (window.siyuan.user.userSiYuanProExpireTime === -1) {
// 终身会员
subscriptionHTML = `<div class="b3-chip b3-chip--secondary">${Constants.SIYUAN_IMAGE_VIP}${window.siyuan.languages.account12}</div>`;
} else if (window.siyuan.user.userSiYuanProExpireTime > 0) {
// 订阅中
if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
subscriptionHTML = `<div class="b3-chip"><svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.onepay}</div>`;
}
const renewHTML = `<div class="fn__hr--b"></div>
<div class="ft__on-surface ft__smaller">
${window.siyuan.languages.account6}
${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))}
${window.siyuan.languages.day}
<a href="${getCloudURL("subscribe/siyuan")}" target="_blank">${window.siyuan.languages.clickMeToRenew}</a>
</div>`;
if (window.siyuan.user.userSiYuanSubscriptionPlan === 2) {
// 订阅试用
subscriptionHTML += `<div class="b3-chip b3-chip--primary"><svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account3}</div>
${renewHTML}`;
} else {
subscriptionHTML += `<div class="b3-chip b3-chip--primary"><svg class="ft__secondary"><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.account10}</div>${renewHTML}`;
}
} else if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
subscriptionHTML = `<div class="b3-chip"><svg><use xlink:href="#iconVIP"></use></svg>${window.siyuan.languages.onepay}</div>`;
}
openModel({
title: window.siyuan.languages.manage,
icon: "iconAccount",
@ -26,10 +53,16 @@ export const showAccountInfo = () => {
<div class="config-account__bg">
<div class="config-account__cover" style="background-image: url(${window.siyuan.user.userHomeBImgURL})"></div>
<a href="${getCloudURL("settings/avatar")}" class="config-account__avatar" style="background-image: url(${window.siyuan.user.userAvatarURL})" target="_blank"></a>
<h1 class="config-account__name">
<a target="_blank" class="fn__a" href="${getCloudURL("member/" + window.siyuan.user.userName)}">${window.siyuan.user.userName}</a>
<span class="ft__on-surface ft__smaller">${0 === window.siyuan.config.cloudRegion ? "ld246.com" : "liuyun.io"}</span>
</h1>
<div class="config-account__name">
<div class="fn__hr--b"></div>
<h1>
<a target="_blank" class="fn__a" href="${getCloudURL("member/" + window.siyuan.user.userName)}">${window.siyuan.user.userName}</a>
<span class="ft__on-surface ft__smaller">${0 === window.siyuan.config.cloudRegion ? "ld246.com" : "liuyun.io"}</span>
</h1>
<div class="fn__hr--b"></div>
<div class="fn__hr--b"></div>
<div>${subscriptionHTML}</div>
</div>
${userTitlesHTML}
</div>
<div class="config-account__info">

2
app/src/mobile/util/keyboardToolbar.ts
View file

@ -12,6 +12,7 @@ import {getCurrentEditor} from "../editor";
import {fontEvent, getFontNodeElements} from "../../protyle/toolbar/Font";
import {hideElements} from "../../protyle/ui/hideElements";
import {softEnter} from "../../protyle/wysiwyg/enter";
import {isPaidUser} from "../../util/needSubscribe";
let renderKeyboardToolbarTimeout: number;
let showUtil = false;
@ -203,6 +204,7 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => {
${getSlashItem("((", "iconRef", window.siyuan.languages.ref, "true")}
${getSlashItem("{{", "iconSQL", window.siyuan.languages.blockEmbed, "true")}
${getSlashItem(Constants.ZWSP + 5, "iconSparkles", "AI Chat")}
${isPaidUser() ? getSlashItem('<div data-type="NodeAttributeView" data-av-type="table"></div>', "iconDatabase", window.siyuan.languages.database, "true") : ""}
${getSlashItem(Constants.ZWSP + 4, "iconFile", window.siyuan.languages.newSubDoc)}
</div>
<div class="keyboard__slash-title"></div>