Merge remote-tracking branch 'git/main'

# Conflicts:
#	.obsidian/community-plugins.json
#	Haina/Templates/W-log.md
#	Workspace/SpringTraveler.com/viator calendar - Google Gemini.mhtml

.obsidian/community-plugins.json

@@ -4,7 +4,6 @@
   "obsidian-enhancing-mindmap",
   "obsidian-auto-link-title",
   "cm-editor-syntax-highlight-obsidian",
-  "markdown-prettifier",
   "emoji-shortcodes",
   "obsidian-emoji-toolbar",
   "obsidian-enhancing-export",
@@ -18,5 +17,6 @@
   "obsidian-excalidraw-plugin",
   "text-snippets-obsidian",
   "obsidian-list-callouts",
-  "obsidian-columns"
+  "obsidian-columns",
+  "obsidian-linter"
 ]

Haina/Templates/W-log.md

@@ -64,63 +64,80 @@ for (let day = 0; day < 2; day++) {
 ## 本周计划
 1. 
 
-> [!info] 最近
+> [!info]- 最近
 >
 > ```tasks
-> (not done) OR (done after last monday)
+> (not done) OR (done after <% moment(tp.file.title).weekday(1).subtract(14, "days").format('YYYY-MM-DD') %>)
 > path includes Haina
 > filter by function task.file.path.includes('项目')
-> filter by function task.file.property('Updated') > '<% moment(tp.file.title).weekday(1).subtract(14, "days").format('YYYY-MM-DD') %>'
+> filter by function task.file.property('Updated') > '<% moment(tp.file.title).startOf('month').subtract(1, "month").format('YYYY-MM-DD') %>'
 > group by heading
 > ```
 
 ---
 
+## Priority
 
 > [!danger] 🔴重要且紧急⏫🔺
 >
 > ```tasks
-> not done
+> (not done) OR (done after <% moment(tp.file.title).weekday(1).subtract(7, "days").format('YYYY-MM-DD') %>)
 > 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
+> (not done) OR (done after <% moment(tp.file.title).weekday(1).subtract(7, "days").format('YYYY-MM-DD') %>)
 > path includes Haina
 > path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > (filter by function task.priorityName === 'Medium')
 > sort by path reverse
+> sort by done
 > sort by heading
+> group by heading
 > ```
 
 > [!important] 🟡重要不紧急🔽
 >
 > ```tasks
-> not done
+> (not done) OR (done after <% moment(tp.file.title).weekday(1).subtract(7, "days").format('YYYY-MM-DD') %>)
 > path includes Haina
 > path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > (filter by function task.priorityName === 'Normal')
 > sort by path reverse
+> sort by done
 > sort by heading
+> group by heading
 > ```
 
-> [!info] 🟢不重要不紧急⏬
+> [!info] 🟢不重要不紧急🔽⏬
 >
 > ```tasks
-> not done
+> (not done) OR (done after <% moment(tp.file.title).weekday(1).subtract(7, "days").format('YYYY-MM-DD') %>)
 > path includes Haina
 > path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
-> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')
+> 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
+> ``` 
 
 ---
 
@@ -175,10 +192,11 @@ for (let day = 0; day < 2; day++) {
 > [!check] Latest 2 weeks
 >
 > ```tasks
-> done after last monday
+> done after <% moment(tp.file.title).weekday(1).subtract(14, "days").format('YYYY-MM-DD') %>
 > path includes Haina
 > sort by path reverse
 > sort by heading
+> group by heading
 > ```
 
 > [!todo] Not done

Haina/Weekly/2025/2025-W16.md

@@ -29,18 +29,20 @@ tags:
 
 ### HT 统计
 
-1. [ ] 三峡, 酒店统计 ⏫
+1. [x] 三峡, 酒店统计 ⏫ ✅ 2025-04-22
 2. [ ] [CT商旅数据统计](Haina/项目/HT数据分析/CT商旅数据统计.md) ⏫
-3. [ ] HT统计: 销售平台统计: 违规/提升明细
-4. [ ] HT统计: 老客户: 增加对比 #宋芳馨
+3. [x] HT统计: 销售平台统计: 违规/提升明细 ✅ 2025-04-23
+4. [x] HT统计: 老客户: 增加对比 #宋芳馨 ✅ 2025-04-23
 
-### -
+### 
 
 1. [x] AH 水灯节表单 识别 `站外渠道(海外)` ⏫ ✅ 2025-04-14
-2. [ ] 销售平台: 会话表信息推送
-3. [ ] paypal收款：拆分多个团名和金额 #杨书林
-4. [ ] 测试 [语音 Vonage](Haina/项目/SCRM/语音%20Vonage.md) ⏫
-5. [x] 客运模板 ⏫ ✅ 2025-04-15
+2. [ ] paypal收款：拆分多个团名和金额 #杨书林 ⏬
+
+#### 销售平台
+2. [x] 销售平台: 会话表信息推送 ✅ 2025-04-27
+3. [x] 测试 [ℹ语音 Vonage](Haina/项目/SCRM/ℹ语音%20Vonage.md) ⏫ 🛫 2025-04-17 ✅ 2025-04-24
+4. [x] 客运模板 ⏫ ✅ 2025-04-15
 
 ## 本周计划
 

Haina/Weekly/2025/2025-W17.md

@@ -1,6 +1,6 @@
 ---
 Created: 2025-04-15 Tue
-Updated: 2025-04-15 21:44 Tue
+Updated: 2025-04-16 13:58 Wed
 tags:
   - 周报
 ---
@@ -21,9 +21,15 @@ tags:
 
 ### 维护工作
 
-####
 
-1.
+1. [x] HT统计: 销售平台: 违规明细 ✅ 2025-04-23
+2. [x] GHH: 确认 合同导出优化是否已完成 ✅ 2025-04-23
+
+#### 交接廖老师
+
+1. JH上线新站相关工作
+2. 查询掉线的WA, 发负责人. GH-骆; 客运-区老师; 国际-兰芬
+3. 东道主项目: API 维护
 
 ## 本周计划
 
@@ -44,7 +50,7 @@ tags:
 > [!danger] 🔴重要且紧急⏫🔺
 >
 > ```tasks
-> not done
+> (not done) OR (done after last monday)
 > path includes Haina
 > path includes Weekly/2025
 > filter by function (task.priorityName === 'High' || task.priorityName === 'Highest')
@@ -55,7 +61,7 @@ tags:
 > [!warning] 🟠不重要紧急🔼
 >
 > ```tasks
-> not done
+> (not done) OR (done after last monday)
 > path includes Haina
 > path includes Weekly/2025
 > (filter by function task.priorityName === 'Medium')
@@ -66,7 +72,7 @@ tags:
 > [!important] 🟡重要不紧急🔽
 >
 > ```tasks
-> not done
+> (not done) OR (done after last monday)
 > path includes Haina
 > path includes Weekly/2025
 > (filter by function task.priorityName === 'Normal')
@@ -77,7 +83,7 @@ tags:
 > [!info] 🟢不重要不紧急⏬
 >
 > ```tasks
-> not done
+> (not done) OR (done after last monday)
 > path includes Haina
 > path includes Weekly/2025
 > filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None')