Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-13 10:44:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-24 09:49:12 +08:00
commit 269f5b8bcb
3 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/config/account.ts
View file

@ -117,12 +117,6 @@ ${window.siyuan.languages.account8}`;
<div class="fn__flex-1 fn__hr"></div>
<div class="ft__center">${subscriptionHTML}</div>
<div class="fn__flex-1 fn__hr"></div>
<div class="fn__flex fn__block" style="line-height: 1.625">
<div class="fn__flex-1"></div>
<span class="ft__on-surface">${window.siyuan.languages.paymentSum}</span>
<span class="fn__space"></span>
<span>${window.siyuan.user.userPaymentSum} RMB</span>
</div>
${activeSubscriptionHTML}
</div></div>`;
}

1
app/src/types/index.d.ts vendored
View file

@ -209,7 +209,6 @@ interface ISiyuan {
userHomeBImgURL: string
userIntro: string
userNickname: string
userPaymentSum: string
userSiYuanProExpireTime: number // -1 终身会员；0 普通用户；> 0 过期时间
userSiYuanSubscriptionPlan: number // 0 年付订阅/终生；1 教育优惠；2 订阅试用
userSiYuanSubscriptionType: number // 0 年付；1 终生；2 月付