vault backup: 2025-07-08 20:54:04

Affected files: .obsidian/app.json .obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json .obsidian/hotkeys.json .obsidian/plugins/markdown-prettifier/data.json Haina/Weekly/2025/2025-W11.md Haina/Weekly/2025/2025-W13.md Haina/Weekly/2025/2025-W16.md Haina/Weekly/2025/2025-W17.md Haina/Weekly/2025/2025-W30.md Haina/分享&培训/面试.md Haina/项目/HT数据分析/CT商旅数据统计.md Haina/项目/支付中心/PayPal.md Haina/项目/支付中心/连连-支付方式.md WanderX/💡.md Workspace/SpringTraveler.com/viator calendar - Google Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtml Workspace/SpringTraveler.com/产品.0708.xlsx Workspace/SpringTraveler.com/账户.md conflict-files-obsidian-git.md
3 months ago · aa438781bb
parent 36e24eabe2
commit aa438781bb
18 changed files with 38697 additions and 1329 deletions
--- a/.obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json
+++ b/.obsidian/community-plugins.sync-conflict-20250708-202514-5FF53Z3.json
@ -0,0 +1,22 @@
+[
+  "obsidian-style-settings",
+  "obsidian-quiet-outline",
+  "obsidian-enhancing-mindmap",
+  "obsidian-auto-link-title",
+  "cm-editor-syntax-highlight-obsidian",
+  "emoji-shortcodes",
+  "obsidian-emoji-toolbar",
+  "obsidian-enhancing-export",
+  "obsidian-git",
+  "obsidian-pandoc",
+  "dataview",
+  "templater-obsidian",
+  "calendar",
+  "obsidian-tasks-plugin",
+  "periodic-notes",
+  "obsidian-excalidraw-plugin",
+  "text-snippets-obsidian",
+  "obsidian-list-callouts",
+  "obsidian-columns",
+  "obsidian-linter"
+]
--- a/Haina/Weekly/2025/2025-W30.md
+++ b/Haina/Weekly/2025/2025-W30.md
@ -0,0 +1,238 @@
+---
+Created: 2025-07-08 20:13 Tue
+Updated: 2025-07-08 20:17 Tue
+tags:
+  - 周报
+---
+[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q3|Q3]] / [[Haina/Monthly/2025-07|July]] / ❮ [[Haina/Weekly/2025/2025-W29|Week 29]] | Week 30 | [[Haina/Weekly/2025/2025-W31|Week 31]] ❯ / [[Haina/Daily/2025-07-14|14 Mon]] - [[Haina/Daily/2025-07-15|15 Tue]] - [[Haina/Daily/2025-07-16|16 Wed]] - [[Haina/Daily/2025-07-17|17 Thu]] - [[Haina/Daily/2025-07-18|18 Fri]] - [[Haina/Daily/2025-07-19|19 Sat]] - [[Haina/Daily/2025-07-20|20 Sun]] ❯ [[Haina/Daily/2025-07-21|21 Mon]] - [[Haina/Daily/2025-07-22|22 Tue]] - 
+
+---
+
+*2025-07-22 Tue*  
+
+## 上周工作
+
+### 重点工作
+####
+1. 
+
+### 维护工作
+#### 
+1. 
+
+## 本周计划
+1. 
+
+> [!info]- 最近
+>
+> ```tasks
+> (not done) OR (done after 2025-07-08)
+> path includes Haina
+> filter by function task.file.path.includes('项目')
+> filter by function task.file.property('Updated') > '2025-06-01'
+> group by heading
+> ```
+
+---
+
+## Priority
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by done
+> sort by heading
+> group by heading
+> ```
+
+> [!info] 🟢不重要不紧急🔽⏬
+>
+> ```tasks
+> (not done) OR (done after 2025-07-15)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'Low' || task.priorityName === 'None')
+> sort by path reverse
+> sort by done
+> sort by heading
+> ```
+
+> [!info]- 转移
+>
+> ```tasks
+> (not done) OR (done after 2025-04-29)
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'quote')
+> group by heading
+> ``` 
+
+---
+
+
+> [!danger] 🔴重要且紧急⏫🔺
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!warning] 🟠不重要紧急🔼
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Medium')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!important] 🟡重要不紧急🔽
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.priorityName === 'Normal')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!info] 🟢不重要不紧急⏬
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> sort by path reverse
+> sort by heading
+> ```
+
+
+---
+
+## Done
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after 2025-07-08
+> path includes Haina
+> sort by path reverse
+> sort by heading
+> group by heading
+> ```
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (path includes W28) OR (path includes W29 )
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] In Progress
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'forwarded'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!tip] Idea, Important
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2025
+> filter by function task.status.name === 'canceled'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!todo] Todo
+> 暂时不用
+> ```tasks--
+> not done
+> path includes Haina
+> path includes Weekly/2025
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```
--- a/Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtml
+++ b/Gemini.sync-conflict-20250708-202617-5FF53Z3.mhtml
--- a/Workspace/SpringTraveler.com/产品.0708.xlsx
+++ b/Workspace/SpringTraveler.com/产品.0708.xlsx
--- a/Workspace/SpringTraveler.com/账户.md
+++ b/Workspace/SpringTraveler.com/账户.md
@ -1,10 +0,0 @@
-
-## 账户
-
-|                                                                                                              |       | 账号                    | 密码                                   |
-| ------------------------------------------------------------------------------------------------------------ | ----- | --------------------- | ------------------------------------ |
-| [WordPress](https://springtraveler.com/wp-login.php)                                                         | 商品管理员 | wp_admin              | gljczj2025@                          |
-|                                                                                                              | 管理员   | st_admin              |                                      |
-| [GetYourGuide](https://www.getyourguide.supply/)<br>[Supply Partner](https://supplier.getyourguide.com/home) |       | `zhuge2518@gmail.com` | KWP2Dxn3Xb#PEkp<br>*短信验证*            |
-| TripAdvisor & [Viator](https://supplier.viator.com/sign-up-info?m=62034)                                     |       |                       | swHsBWw&5E-2DPL<br><br>              |
-| Gmail                                                                                                        |       | `zhuge2518@gmail.com` | rdPa!JS5G*!6mNc    <br>*验证器二次验证*<br> |
--- a/conflict-files-obsidian-git.md
+++ b/conflict-files-obsidian-git.md
@ -1,21 +0,0 @@
-# Conflicts
-Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
-(This file will automatically be deleted before commit)
-[[#Additional Instructions]] available below file list
-
- Not a file: .obsidian/community-plugins.json
- [[Haina/Templates/W-log]]
- [[Haina/Weekly/2025/2025-W16]]
- [[Haina/Weekly/2025/2025-W17]]
- [[Haina/项目/HT数据分析/CT商旅数据统计]]
-
-# Additional Instructions
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-```diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-```