diff --git a/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css b/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css index 6e2c454..b2903cd 100644 --- a/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css +++ b/.obsidian/snippets/color.sync-conflict-20250727-161959-5FF53Z3.css @@ -1,3 +1,21 @@ +<<<<<<< HEAD +<<<<<<< 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; +} +======= <<<<<<< HEAD .blue .cm-line.HyperMD-codeblock{ background-color: #daedfc; @@ -14,3 +32,4 @@ .yellow .cm-line.HyperMD-codeblock { background-color: #fffede; } +>>>>>>> git/main diff --git a/Workspace/SpringTraveler.com/V0.md b/Workspace/SpringTraveler.com/V0.md index 049b57e..9dc8d3e 100644 --- a/Workspace/SpringTraveler.com/V0.md +++ b/Workspace/SpringTraveler.com/V0.md @@ -1,6 +1,6 @@ --- Created: 2025-07-05 10:04 Sat -Updated: 2025-07-27 16:16 Sun +Updated: 2025-07-27 16:49 Sun --- ## 优先级 @@ -47,6 +47,8 @@ title: 📅2025-07-27 2. [-] 平台上线.docx 无价格 3. [ ] Viator 使用文档: 平台有价格.docx 4. [!] Viator 提升佣金到26% 📅2025-07-27 +5. [ ] 对公支付, 独立站支付 + ``` ### KLooks @@ -60,6 +62,9 @@ title: 📅2025-07-27 #### 缺少 +- 经营许可证 +- 保险 + ### Expedia I am a **specialized travel service provider** ([www.springtraveler.com](https://www.springtraveler.com)) offering unique local experiences, specialized tours, transport services. I am looking to partner with Expedia Group to provide these services to your global customer base. diff --git a/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt b/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt index 253fa68..9389f84 100644 --- a/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt +++ b/Workspace/SpringTraveler.com/viator预订流程2019.sync-conflict-20250727-161959-5FF53Z3.txt @@ -1,3 +1,29 @@ +<<<<<<< HEAD + +ViatorڲƷҳ治ʾƷĹӦ, + +ԤҪʱ, ɹһ. + +ʹƳ`reserve now & Pay later`ҲҪԤÿϢ, ҿۿ1Ϊ֤ʵĿ + + + +Ԥ: + +һ. Ԥɹ, յViatorĵһȷʼ. + +viator, Ʒϸ, ڵ, + +providerƺԤĿͷֻ, Email + +. Ӧں̨ԸԤĿ, ָ, ϵʽ, viatorļʱϢϵͳ +ĿǰTrippestа, ֱϵ. + +. е, viatorӪʼ, + +ԭĿĵصܱ߲Ʒ, Ŀǰյ,ǰƼͬӦ̵IJƷ + +======= ViatorڲƷҳ治ʾƷĹӦ, @@ -22,4 +48,5 @@ Viator ԭĿĵصܱ߲Ʒ, Ŀǰյ,ǰƼͬӦ̵IJƷ +>>>>>>> git/main . г̽ڶ, յ۵ʼ, һֱһ, ܹյ4ʼ. \ No newline at end of file