Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-29 11:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-08-17 17:41:29 +08:00
commit e87b831da7
7 changed files with 191 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk.sy
View file

@ -6,7 +6,7 @@
"icon": "1f451",
"id": "20230805222417-2lj3dvk",
"title": "会员特权",
"updated": "20230805225639"
"updated": "20230817114518"
},
"Children": [
{
@ -29,7 +29,7 @@
"ListData": {},
"Properties": {
"id": "20230805225040-mq394af",
"updated": "20230805225232"
"updated": "20230817114518"
},
"Children": [
{
@ -41,7 +41,7 @@
},
"Properties": {
"id": "20230805225041-vbfv9l9",
"updated": "20230805225232"
"updated": "20230817114518"
},
"Children": [
{
@ -49,7 +49,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20230805225041-vcse7tk",
"updated": "20230805225232"
"updated": "20230817114518"
},
"Children": [
{
@ -59,7 +59,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "block-ref",
"TextMarkBlockRefID": "20210808180320-m0ztypq",
"TextMarkBlockRefID": "20230808120348-orm8sjf",
"TextMarkBlockRefSubtype": "s",
"TextMarkTextContent": "云端服务"
}

2
app/src/util/assets.ts
View file

@ -173,6 +173,7 @@ export const addGA = () => {
subscriptionStatus: -1,
subscriptionPlan: -1,
subscriptionType: -1,
oneTimePayStatus: -1,
syncEnabled: false,
syncProvider: -1,
cTreeCount: window.siyuan.config.stat.cTreeCount,
@ -185,6 +186,7 @@ export const addGA = () => {
para.subscriptionStatus = window.siyuan.user.userSiYuanSubscriptionStatus;
para.subscriptionPlan = window.siyuan.user.userSiYuanSubscriptionPlan;
para.subscriptionType = window.siyuan.user.userSiYuanSubscriptionType;
para.oneTimePayStatus = window.siyuan.user.userSiYuanOneTimePayStatus;
}
if (window.siyuan.config.sync) {
para.syncEnabled = window.siyuan.config.sync.enabled;