diff --git a/.obsidian/snippets/color.css b/.obsidian/snippets/color.css index 4727d0c..28ed7e3 100644 --- a/.obsidian/snippets/color.css +++ b/.obsidian/snippets/color.css @@ -1,3 +1,20 @@ +<<<<<<< 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; +} +======= .blue .cm-line.HyperMD-codeblock{ background-color: #daedfc; } @@ -13,3 +30,4 @@ .yellow .cm-line.HyperMD-codeblock { background-color: #fffede; } +>>>>>>> git/main diff --git a/Haina/Weekly/2025/2025-W16.md b/Haina/Weekly/2025/2025-W16.md index 28ef21a..f2a0855 100644 --- a/Haina/Weekly/2025/2025-W16.md +++ b/Haina/Weekly/2025/2025-W16.md @@ -1,3 +1,206 @@ +<<<<<<< HEAD +--- +Created: 2025-04-08 Tue +Updated: 2025-04-15 17:27 Tue +tags: + - 周报 +--- + +[[Haina/Yearly/2025|2025]] / [[Haina/Quarterly/2025-Q2|Q2]] / [[Haina/Monthly/2025-04|April]] / ❮ [[Haina/Weekly/2025/2025-W15|Week 15]] | Week 16 | [[Haina/Weekly/2025/2025-W17|Week 17]] ❯ / [[Haina/Daily/2025-04-07|07 Mon]] - [[Haina/Daily/2025-04-08|08 Tue]] - [[Haina/Daily/2025-04-09|09 Wed]] - [[Haina/Daily/2025-04-10|10 Thu]] - [[Haina/Daily/2025-04-11|11 Fri]] - [[Haina/Daily/2025-04-12|12 Sat]] - [[Haina/Daily/2025-04-13|13 Sun]] ❯ [[Haina/Daily/2025-04-14|14 Mon]] - [[Haina/Daily/2025-04-15|15 Tue]] - + +--- + +*2025-04-15 Tue* + +## 上周工作 + +### 重点工作 + +#### + +1. + +### 维护工作 + +#### 交接廖老师 + +1. JH上线新站相关工作 +2. 查询掉线的WA, 发负责人. GH-骆; 客运-区老师; 国际-兰芬 +3. 东道主项目: API 维护 + +### HT 统计 + +1. [x] 三峡, 酒店统计 ⏫ ✅ 2025-04-22 +2. [ ] [CT商旅数据统计](Haina/项目/HT数据分析/CT商旅数据统计.md) +3. [x] HT统计: 销售平台统计: 违规/提升明细 ✅ 2025-04-23 +4. [x] HT统计: 老客户: 增加对比 #宋芳馨 ✅ 2025-04-23 + +### + +1. [x] AH 水灯节表单 识别 `站外渠道(海外)` ⏫ ✅ 2025-04-14 +2. [ ] paypal收款：拆分多个团名和金额 #杨书林 ⏬ + +#### 销售平台 +2. [x] 销售平台: 会话表信息推送 ✅ 2025-04-27 +3. [x] 测试 [ℹ语音 Vonage](Haina/项目/SalesCRM/ℹ语音%20Vonage.md) ⏫ 🛫 2025-04-17 ✅ 2025-04-24 +4. [x] 客运模板 ⏫ ✅ 2025-04-15 + +## 本周计划 + +> [!info] 最近 +> +> ```tasks +> (not done) OR (done after last monday) +> path includes Haina +> filter by function task.file.path.includes('项目') +> filter by function task.file.property('Updated') > '2025-03-15' +> group by heading +> ``` + +--- + +> [!danger] 🔴重要且紧急⏫🔺 +> +> ```tasks +> (not done) OR (done after last monday) +> 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) OR (done after last monday) +> path includes Haina +> path includes Weekly/2025 +> (filter by function task.priorityName === 'Medium') +> sort by path reverse +> sort by heading +> ``` +> +> ```tasks +> (not done) OR (done after last monday) +> path includes Haina +> filter by function task.file.path.includes('项目') +> filter by function (task.priorityName === 'Medium') +> sort by path reverse +> sort by heading +> ``` + +> [!important] 🟡重要不紧急🔽 +> +> ```tasks +> (not done) OR (done after last monday) +> path includes Haina +> path includes Weekly/2025 +> filter by function (task.priorityName === 'Normal' || task.priorityName === 'Low') +> sort by path reverse +> sort by heading +> ``` + +> [!info] 🟢不重要不紧急⏬ +> +> ```tasks +> (not done) OR (done after last monday) +> path includes Haina +> path includes Weekly/2025 +> filter by function (task.priorityName === 'Lowest' || task.priorityName === 'None') +> sort by path reverse +> sort by heading +> ``` + +--- + +> [!check] Latest 2 weeks +> +> ```tasks +> done after last monday +> path includes Haina +> sort by path reverse +> sort by heading +> ``` + +> [!todo] Not done +> +> ```tasks +> not done +> path includes Haina +> path includes Weekly/2025 +> (path includes W14) OR (path includes W15 ) +> (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 +> ``` +======= --- Created: 2025-04-08 Tue Updated: 2025-04-15 17:27 Tue @@ -199,3 +402,4 @@ tags: > sort by path reverse > sort by heading > ``` +>>>>>>> git/main diff --git a/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html b/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html index 8f3a453..dbd5e07 100644 --- a/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html +++ b/Haina/项目/HotelHub/atta/heytrip_b2b分销接口对接说明.html @@ -1173,6 +1173,73 @@ pre[class*="language-"] { list-style-type: decimal; } +<<<<<<< HEAD + diff --git a/Workspace/SpringTraveler.com/V0.md b/Workspace/SpringTraveler.com/V0.md index ab5c4b8..18201c9 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-08 00:43 Tue +Updated: 2025-07-27 11:17 Sun --- ## 优先级 @@ -38,6 +38,9 @@ Updated: 2025-07-08 00:43 Tue 1. 龙脊乡村游 - 是否要具体时长 +1. [/] 平台上线2 ✅ ⏳ GYG +2. [ ] 平台上线.docx 无价格 + ### KLook ### Trip.com @@ -48,11 +51,11 @@ Updated: 2025-07-08 00:43 Tue ## 网站 wordpress -1. 产品预定, 连接平台产品. - 1. GetYourGuide +1. 产品预定, 连接平台产品. + 1. GetYourGuide 2. TripAdvisor -2. [-] 库存管理方案 - 1. bokun.io +2. [-] 库存管理方案 + 1. bokun.io 2. vacationlabs ## youtube 视频 @@ -74,6 +77,7 @@ Updated: 2025-07-08 00:43 Tue | Bókun | ✔ | | | [regiondo](https://pro.regiondo.com/integrations/) | | | | [xola](https://www.xola.com/distribution-resale-otas/) | | | + ### 预定 -- vacationlabs +- vacationlabs diff --git a/Workspace/SpringTraveler.com/平台上线2.docx b/Workspace/SpringTraveler.com/平台上线2.docx index 46268d2..20dfb90 100644 Binary files a/Workspace/SpringTraveler.com/平台上线2.docx and b/Workspace/SpringTraveler.com/平台上线2.docx differ