vault backup: 2025-07-30 14:18:04

Affected files:
.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-023242-5FF53Z3.json
.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-222314-CALEDER.json
.obsidian/plugins/obsidian-git/data.sync-conflict-20250728-223150-5FF53Z3.json
.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css
Haina/Weekly/2025/2025-W32.md
Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt
main
Lei OT 2 months ago
parent 79c7b90730
commit 9208f7464c

@ -1,55 +0,0 @@
{
"commitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 60,
"autoPushInterval": 0,
"autoPullInterval": 180,
"autoPullOnBoot": true,
"disablePush": false,
"pullBeforePush": true,
"disablePopups": true,
"listChangedFilesInMessageBody": true,
"showStatusBar": true,
"updateSubmodules": false,
"syncMethod": "merge",
"customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false,
"treeStructure": false,
"refreshSourceControl": true,
"basePath": "",
"differentIntervalCommitAndPush": false,
"changedFilesInStatusBar": true,
"showedMobileNotice": true,
"refreshSourceControlTimer": 7000,
"showBranchStatusBar": true,
"setLastSaveToLastCommit": false,
"submoduleRecurseCheckout": false,
"gitDir": "",
"showFileMenu": true,
"lineAuthor": {
"show": false,
"followMovement": "inactive",
"authorDisplay": "initials",
"showCommitHash": false,
"dateTimeFormatOptions": "date",
"dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
"dateTimeTimezone": "viewer-local",
"coloringMaxAge": "1y",
"colorNew": {
"r": 255,
"g": 150,
"b": 150
},
"colorOld": {
"r": 120,
"g": 160,
"b": 255
},
"textColorCss": "var(--text-muted)",
"ignoreWhitespace": false,
"gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
},
"autoCommitMessage": "vault backup: {{date}}"
}

@ -1,55 +0,0 @@
{
"commitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 30,
"autoPushInterval": 0,
"autoPullInterval": 30,
"autoPullOnBoot": true,
"disablePush": false,
"pullBeforePush": true,
"disablePopups": true,
"listChangedFilesInMessageBody": true,
"showStatusBar": true,
"updateSubmodules": false,
"syncMethod": "merge",
"customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false,
"treeStructure": false,
"refreshSourceControl": true,
"basePath": "",
"differentIntervalCommitAndPush": false,
"changedFilesInStatusBar": true,
"showedMobileNotice": true,
"refreshSourceControlTimer": 7000,
"showBranchStatusBar": true,
"setLastSaveToLastCommit": false,
"submoduleRecurseCheckout": false,
"gitDir": "",
"showFileMenu": true,
"lineAuthor": {
"show": false,
"followMovement": "inactive",
"authorDisplay": "initials",
"showCommitHash": false,
"dateTimeFormatOptions": "date",
"dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
"dateTimeTimezone": "viewer-local",
"coloringMaxAge": "1y",
"colorNew": {
"r": 255,
"g": 150,
"b": 150
},
"colorOld": {
"r": 120,
"g": 160,
"b": 255
},
"textColorCss": "var(--text-muted)",
"ignoreWhitespace": false,
"gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
},
"autoCommitMessage": "vault backup: {{date}}"
}

@ -1,55 +0,0 @@
{
"commitMessage": "vault backup: {{date}}",
"commitDateFormat": "YYYY-MM-DD HH:mm:ss",
"autoSaveInterval": 60,
"autoPushInterval": 0,
"autoPullInterval": 180,
"autoPullOnBoot": true,
"disablePush": false,
"pullBeforePush": true,
"disablePopups": true,
"listChangedFilesInMessageBody": true,
"showStatusBar": true,
"updateSubmodules": false,
"syncMethod": "merge",
"customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": false,
"treeStructure": false,
"refreshSourceControl": true,
"basePath": "",
"differentIntervalCommitAndPush": false,
"changedFilesInStatusBar": true,
"showedMobileNotice": true,
"refreshSourceControlTimer": 7000,
"showBranchStatusBar": true,
"setLastSaveToLastCommit": false,
"submoduleRecurseCheckout": false,
"gitDir": "",
"showFileMenu": true,
"lineAuthor": {
"show": false,
"followMovement": "inactive",
"authorDisplay": "initials",
"showCommitHash": false,
"dateTimeFormatOptions": "date",
"dateTimeFormatCustomString": "YYYY-MM-DD HH:mm",
"dateTimeTimezone": "viewer-local",
"coloringMaxAge": "1y",
"colorNew": {
"r": 255,
"g": 150,
"b": 150
},
"colorOld": {
"r": 120,
"g": 160,
"b": 255
},
"textColorCss": "var(--text-muted)",
"ignoreWhitespace": false,
"gutterSpacingFallbackLength": 5,
"lastShownAuthorDisplay": "initials",
"lastShownDateTimeFormatOptions": "date"
},
"autoCommitMessage": "vault backup: {{date}}"
}

@ -1,16 +0,0 @@
<<<<<<< HEAD
.blue .cm-line.HyperMD-codeblock{
background-color: #daedfc;
}
.red .cm-line.HyperMD-codeblock {
background-color: #ffe2df;
}
.green .cm-line.HyperMD-codeblock {
background-color: #e0fff4;
}
.yellow .cm-line.HyperMD-codeblock {
background-color: #fffede;
}

@ -1,6 +1,6 @@
--- ---
Created: 2023-09-15 17:08 Fri Created: 2023-09-15 17:08 Fri
Updated: 2025-07-30 13:35 Wed Updated: 2025-07-30 13:52 Wed
tags: tags:
- 周报 - 周报
--- ---
@ -21,7 +21,7 @@ tags:
#### 销售平台 #### 销售平台
1. [ ] 邮件: 回复全部 2025-07-30 1. [x] 邮件: 回复全部 2025-07-30 ✅ 2025-07-30
## 本周计划 ## 本周计划

@ -1,25 +0,0 @@
Viator在产品页面不显示产品的供应商,
并且预订需要即时付款, 付款成功才是一个订单.
即使新推出的`reserve now & Pay later`服务也是需要预留信用卡信息, 并且扣款1美金作为验证是真实的卡
预定流程:
一. 预订成功后, 会收到Viator的第一封确认邮件.
包含viator订单号, 产品明细, 出行日期等,
包含provider的名称和预留的客服手机号, Email
二. 供应商在后台可以给已预定的客人留言, 针对指定订单, 但不留联系方式, 会在viator的即时消息系统
目前Trippest的做法是在留言内容中包含邮箱署名, 方便客人直接联系.
三. 出行当天, viator推送营销邮件,
内容是原订单目的地的周边产品, 目前测试收到的,前三个推荐会包含同个供应商的产品
四. 行程结束后第二天, 收到邀请评价的邮件, 一直到结束后一周, 会总共收到4封评价邮件.
Loading…
Cancel
Save