diff --git a/.obsidian/appearance.sync-conflict-20240520-223337-CALEDER.json b/.obsidian/appearance.sync-conflict-20240520-223337-CALEDER.json
deleted file mode 100644
index c7fa6e8..0000000
--- a/.obsidian/appearance.sync-conflict-20240520-223337-CALEDER.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "theme": "moonstone",
-  "cssTheme": "Minimal",
-  "baseFontSize": 16,
-  "textFontFamily": "",
-  "monospaceFontFamily": "Fira Code",
-  "accentColor": "",
-  "enabledCssSnippets": [
-    "index",
-    "checklist-icons"
-  ]
-}
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-tasks-plugin/data.json b/.obsidian/plugins/obsidian-tasks-plugin/data.json
index d820999..7c5f5bc 100644
--- a/.obsidian/plugins/obsidian-tasks-plugin/data.json
+++ b/.obsidian/plugins/obsidian-tasks-plugin/data.json
@@ -82,9 +82,9 @@
       {
         "symbol": "\"",
         "name": "quote",
-        "nextStatusSymbol": "x",
+        "nextStatusSymbol": " ",
         "availableAsCommand": false,
-        "type": "TODO"
+        "type": "DONE"
       },
       {
         "symbol": "l",
@@ -169,6 +169,20 @@
         "nextStatusSymbol": "x",
         "availableAsCommand": false,
         "type": "TODO"
+      },
+      {
+        "symbol": " ",
+        "name": "to-do",
+        "nextStatusSymbol": "x",
+        "availableAsCommand": false,
+        "type": "TODO"
+      },
+      {
+        "symbol": "x",
+        "name": "done",
+        "nextStatusSymbol": " ",
+        "availableAsCommand": false,
+        "type": "DONE"
       }
     ]
   },
diff --git a/Haina/Templates/W-log.md b/Haina/Templates/W-log.md
index c330bda..9de791c 100644
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@@ -49,12 +49,12 @@ for (let day = 0; day < 2; day++) {
 
 ---
 
-*<%* tR += moment(tp.file.title).weekday(1).format('YYYY-MM-DD ddd') %>*
+*<%* tR += moment(tp.file.title).weekday(1).format('YYYY-MM-DD ddd') %>*  
 
 ## 上周工作
 
 ### 重点工作
-
+####
 1. <% tp.file.cursor(1) %>
 
 ### 维护工作
@@ -74,10 +74,10 @@ for (let day = 0; day < 2; day++) {
 > not done
 > path includes Haina
 > path includes Weekly/2024
-> path includes W20
+> (path includes W<% moment(tp.file.title).subtract(2, 'weeks').format('w') %>) OR (path includes W<% moment(tp.file.title).subtract(1, 'weeks').format('w') %> )
 > (filter by function task.status.name === 'Todo')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!todo] In Progress
@@ -87,8 +87,8 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > path includes Weekly/2024
 > (filter by function task.status.name === 'incomplete')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!check] Latest 2 weeks
@@ -97,8 +97,8 @@ for (let day = 0; day < 2; day++) {
 > done after last monday
 > path includes Haina
 > path includes Weekly/2024
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!note] Deferred
@@ -108,8 +108,8 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'forwarded'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!tip] Idea, Important
@@ -118,9 +118,9 @@ for (let day = 0; day < 2; day++) {
 > not done
 > path includes Haina
 > path includes Weekly/2024
-> filter by function (task.status.name === 'idea' || task.status.name === 'important')
-> sort by heading
+> filter by function (task.status.name === 'idea' || task.status.name === 'important'|| task.status.name === 'fire')
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!faq] Question
@@ -130,8 +130,8 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'question'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!fail] Cancelled
@@ -140,8 +140,8 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'canceled'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!todo] Todo
@@ -151,6 +151,6 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > path includes Weekly/2024
 > (filter by function task.status.type === 'TODO')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
diff --git a/Haina/Weekly/2024/2024-W06.md b/Haina/Weekly/2024/2024-W06.md
index 5fdb885..c6a2dfb 100644
--- a/Haina/Weekly/2024/2024-W06.md
+++ b/Haina/Weekly/2024/2024-W06.md
@@ -14,6 +14,7 @@ tags:
 ## 上周工作
 
 ### 重点工作
+#### 销售IM
 
 1. 销售聊天平台
    1. 会话
diff --git a/Haina/Weekly/2024/2024-W10.md b/Haina/Weekly/2024/2024-W10.md
index 6b39c97..bea8001 100644
--- a/Haina/Weekly/2024/2024-W10.md
+++ b/Haina/Weekly/2024/2024-W10.md
@@ -22,13 +22,13 @@ tags:
 3. 空的消息记录, 希望返回`[]`, 而不是`null`
 	1. `null` 判断
 4. 没有从状态管理中正确取到登录用户的值 ✅ 2024-03-04
-5. [ ] 消息记录分页
+5. 消息记录分页
 6. 发送失败的状态提示 ✅ 2024-03-01
 7. 表情发送和显示
 8. [x] 上传接口 ✅ 2024-03-08
 9. 修改store取数据, 减少重复渲染 ✅ 2024-03-01
 10. 消息数量的提示 ✅ 2024-03-04
-	1. [ ] 后端也需要累加
+	1. 后端也需要累加
 	2. [x] 新消息闪烁 ✅ 2024-03-04
 
 ### 维护工作
diff --git a/Haina/Weekly/2024/2024-W11.md b/Haina/Weekly/2024/2024-W11.md
index ea9c275..4e9f12f 100644
--- a/Haina/Weekly/2024/2024-W11.md
+++ b/Haina/Weekly/2024/2024-W11.md
@@ -20,14 +20,14 @@ tags:
 1. 会话和消息
    1. 接受失败: 
 	   1. 转发的消息
-	   2. [ ] 引用消息: 没有原文 (消息记录有, 实时的没有:updated)
+	   2. ["] 引用消息: 没有原文 (消息记录有, 实时的没有:updated)
    2. 解决emoji表情识别同时导致数字和其他unicode显示不合适问题
    3. 消息类型:
       1. 定位, 打开高德地图
       2. 系统提示
       3. 未支持类型: 显示ID
       4. 联系人名片:
-         1. [ ] 点击开始会话
+         1. [x] 点击开始会话 ✅ 2024-03-19
       5. 贴图: 样式
    4. 上传文件/预览: 图片, 视频, 音频, 文件, webp 
 	   1. 支持截图软件粘贴上传
@@ -37,7 +37,7 @@ tags:
    8. 会话列表:
       1. [x] 显示订单号 ✅ 2024-03-08
       2. [x] 搜索 ✅ 2024-03-08
-      3. [-] ~~用户昵称存到会话表?~~ 
+      3. ["] ~~用户昵称存到会话表?~~ 
       4. [x] 更新会话的received time, 使用Delivered time ✅ 2024-03-12
 2. 历史记录:
    1. [x] 加载更多/~~滚动加载~~  ✅ 2024-03-12
diff --git a/Haina/Weekly/2024/2024-W12.md b/Haina/Weekly/2024/2024-W12.md
index 6eb40dc..37dde63 100644
--- a/Haina/Weekly/2024/2024-W12.md
+++ b/Haina/Weekly/2024/2024-W12.md
@@ -1,6 +1,6 @@
 ---
 Created: 2024-03-12 Tue
-Updated: 2024-05-17 14:39 Fri
+Updated: 2024-05-21 09:30 Tue
 tags:
   - 周报
 ---
@@ -20,26 +20,25 @@ tags:
 1. 会话和消息
    1. 会话列表: 合并查询多个账户的会话
       1. [ ] 会话列表支持多选顾问获取
-   2. [ ] 引用消息: 没有原文 (消息记录有, 实时的没有:updated, received)
-   3. [?] 订单进入会话: 设置正确的顾问ID
+   2. [?] 订单进入会话: 设置正确的顾问ID
       不需要, 以后统计也是从订单查询
-   4. [x] 同名文件, 会不会导致文件覆盖 ✅ 2024-03-14
-   5. [x] 联系人名片: 点击开启会话. 有WhatsAppID时. 并显示商户号的名称 ✅ 2024-03-14
-   6. [-] 更新发送的媒体消息的link
-   7. [x] #修复 前端收到页面上没有的会话时, 程序报错中断 ✅ 2024-03-19
-      1. [ ] 需要即时消息中返回`订单ID` `SN`
-   8. [?] 多客户端: 未读数量同步
+   3. [x] 同名文件, 会不会导致文件覆盖 ✅ 2024-03-14
+   4. [x] 联系人名片: 点击开启会话. 有WhatsAppID时. 并显示商户号的名称 ✅ 2024-03-14
+   5. [*] 更新发送的媒体消息的link
+   6. [x] #修复 前端收到页面上没有的会话时, 程序报错中断 ✅ 2024-03-19
+      1. 需要即时消息中返回`订单ID` `SN`
+   7. [?] 多客户端: 未读数量同步
       1. 会话消息相关的接口, 都使用socket服务. `action: 'unread_cnt'`
-   9. 记录会话的信息, 用于前端提示
+   8. 记录会话的信息, 用于前端提示
       1. [ ] 开启时间
       2. [x] 过期时间, ✅ 2024-03-20
       3. [ ] 会话类型,
       4. [ ] 收费.
-   10. 记录会话的时区.
-       1. [ ] 预测
-       2. [ ] 选择
-       3. [I] 下单时获取客户端时区, 和设置国籍一样
-   11. [x] #修复 未读消息数 ✅ 2024-03-19
+   9. 记录会话的时区.
+      1. [ ] 预测
+      2. [ ] 选择
+      3. [f] 下单时获取客户端时区, 和设置国籍一样
+   10. [x] #修复 未读消息数 ✅ 2024-03-19
 
 2. 迁移SaleSmartly的数据, 发送和接收
 
diff --git a/Haina/Weekly/2024/2024-W13.md b/Haina/Weekly/2024/2024-W13.md
index d92e379..434f120 100644
--- a/Haina/Weekly/2024/2024-W13.md
+++ b/Haina/Weekly/2024/2024-W13.md
@@ -1,6 +1,6 @@
 ---
 Created: 2024-03-20 Wed
-Updated: 2024-05-17 14:40 Fri
+Updated: 2024-05-21 09:29 Tue
 tags:
   - 周报
 ---
@@ -19,23 +19,13 @@ tags:
 
 1. 会话和消息
    1. 会话列表: 合并查询多个账户的会话
-      1. [ ] 会话列表支持多选顾问获取
    2. [x] 引用消息: 没有原文 (消息记录有, 实时的没有:updated, received) ✅ 2024-04-01
    3. 区分地接社/供应商的WhatsApp和客人, 不关联任何订单或任何订单都有关联
-      1. [ ] 会话备注功能
-      2. [ ] 不绑定订单
-      3. [ ] 置顶
-      4. [x] 新增会话 ✅ 2024-05-14
+      1. [x] 新增会话 ✅ 2024-05-14
    4. 记录会话的信息, 用于前端提示
       1. [-] 开启时间
       2. [x] 过期时间, ✅ 2024-03-20
-      3. [ ] 会话类型,
-      4. [ ] 收费.
-   5. [>] 记录会话的时区.
-      1. [ ] 预测
-      2. [ ] 选择
-      3. [ ] 下单时获取客户端时区, 和设置国籍一样
-2. [!] 迁移 SaleSmartly 的数据, 发送和接收
+2. [*] 迁移 SaleSmartly 的数据, 发送和接收
 3. 历史消息: 查询, 搜索, 定位
 
    1. [x] 搜索匹配的消息`排序`, `显示具体时间` ✅ 2024-03-24
@@ -46,7 +36,7 @@ tags:
    >
    > `wamid.HBgLNjAxMjMxNTYyODAVAgASGBQzQTdBRjM4MzJEMzFFNzZBQ0Y2QQA=`
 4. 移动端
-   1. [-] 刷新后没有获取消息记录
+   1. [x] 刷新后没有获取消息记录 ✅ 2024-04-09
    2. [x] 路由 ✅ 2024-03-21
 5. [x] PWA ✅ 2024-03-26
 6. 消息来信提醒
diff --git a/Haina/Weekly/2024/2024-W15.md b/Haina/Weekly/2024/2024-W15.md
index 13c4578..b0748d1 100644
--- a/Haina/Weekly/2024/2024-W15.md
+++ b/Haina/Weekly/2024/2024-W15.md
@@ -28,7 +28,7 @@ tags:
 5. [x] 消息内容丢失: 附件, ✅视频 ✅ 2024-04-09
 6. [x] 重连之后刷新 ✅ 2024-04-09
 7. [x] 会话列表刷新 ✅ 2024-04-10
-8. [ ] 会话列表分页
+8. [x] 会话列表分页 ✅ 2024-05-14
 9. [x] 消息窗口内打开新会话 ✅ 2024-04-09
 
 
diff --git a/Haina/Weekly/2024/2024-W21.md b/Haina/Weekly/2024/2024-W21.md
index 98dac17..13b7466 100644
--- a/Haina/Weekly/2024/2024-W21.md
+++ b/Haina/Weekly/2024/2024-W21.md
@@ -1,6 +1,6 @@
 ---
 Created: 2024-05-15 Wed
-Updated: 2024-05-17 14:58 Fri
+Updated: 2024-05-21 12:08 Tue
 tags:
   - 周报
 ---
@@ -32,21 +32,26 @@ tags:
 
 1. #新增 关联订单 ✅ 2024-05-15
 2. #维护 05.15 恢复ycloud错误导致的缺失数据: 图片文件
-3. [?] 客人发的文件，国内有时候需要代理打开，顾问打不开
-4. [I] 支付中心: 收款提示: 发到SalesCRM
-5. [I] 检索: 多媒体消息: 文件, 链接
-6. [I] 发送搜索`多媒体中心` 的图片
+3. #维护 消息过期时间更新
+4. [x] 客人发的文件，国内有时候需要代理打开，顾问打不开 ✅ 2024-05-23
+	- 改为访问加速地址
+5. [I] 支付中心: 收款提示: 发到SalesCRM
+6. [f] 检索: 多媒体消息: 文件, 链接, 通话
+7. [f] 发送消息: 搜索`多媒体中心` 的图片
+8. [?] 客人下了多单, 不同顾问发信息.
+   - 393339509370
+   - 19494223549
 
 #### HT 统计
+
 1. GH例会数据:
-<<<<<<< HEAD
-	1. [/] 顾问数据规则
-=======
-	1. [x] 顾问数据规则 ✅ 2024-05-20
->>>>>>> git/main
+   1. [x] 顾问数据规则 ✅ 2024-05-29
+   2. [x] 客服数据规则 ✅ 2024-05-20
+2. ["] 接口数据有误: TradeData, 统计分布: 目的地国籍
+
 #### Web
 
-1. #修复 TS站火车: 客人预定日期不对，比如搜索25日，预定时却是24日
+1. #维护 TS站火车: 客人预定日期不对，比如搜索25日，预定时却是24日
    1. **未重现** 猜测是时区原因, 已更新为设置北京时间
 2. #新增 海外反馈表需求 ✅ 2024-05-17
 
@@ -64,8 +69,8 @@ tags:
 > path includes Weekly/2024
 > path includes W20
 > (filter by function task.status.name === 'Todo')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!todo] In Progress
@@ -75,8 +80,8 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > (filter by function task.status.name === 'incomplete')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!check] Latest 2 weeks
@@ -85,8 +90,8 @@ tags:
 > done after last monday
 > path includes Haina
 > path includes Weekly/2024
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!note] Deferred
@@ -96,8 +101,8 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'forwarded'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!tip] Idea, Important
@@ -107,8 +112,8 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > filter by function (task.status.name === 'idea' || task.status.name === 'important')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!faq] Question
@@ -118,8 +123,8 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'question'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!fail] Cancelled
@@ -128,8 +133,8 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > filter by function task.status.name === 'canceled'
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
 
 > [!todo] Todo
@@ -139,6 +144,6 @@ tags:
 > path includes Haina
 > path includes Weekly/2024
 > (filter by function task.status.type === 'TODO')
-> sort by heading
 > sort by path reverse
+> sort by heading
 > ```
diff --git a/Haina/Weekly/2024/2024-W22.md b/Haina/Weekly/2024/2024-W22.md
index b06382a..de4134b 100644
--- a/Haina/Weekly/2024/2024-W22.md
+++ b/Haina/Weekly/2024/2024-W22.md
@@ -1,10 +1,11 @@
 ---
 Created: 2024-05-17 Fri
-Updated: 
+Updated: 2024-05-28 17:44 Tue
 tags:
   - 周报
 ---
-[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-05|May]] - [[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W21|Week 21]] | Week 22 | [[Haina/Weekly/2024/2024-W23|Week 23]] ❯ / [[Haina/Daily/2024-05-20|20 Mon]] - [[Haina/Daily/2024-05-21|21 Tue]] - [[Haina/Daily/2024-05-22|22 Wed]] - [[Haina/Daily/2024-05-23|23 Thu]] - [[Haina/Daily/2024-05-24|24 Fri]] - [[Haina/Daily/2024-05-25|25 Sat]] - [[Haina/Daily/2024-05-26|26 Sun]] ❯ [[Haina/Daily/2024-05-27|27 Mon]] - [[Haina/Daily/2024-05-28|28 Tue]] - 
+
+[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-05|May]] - [[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W21|Week 21]] | Week 22 | [[Haina/Weekly/2024/2024-W23|Week 23]] ❯ / [[Haina/Daily/2024-05-20|20 Mon]] - [[Haina/Daily/2024-05-21|21 Tue]] - [[Haina/Daily/2024-05-22|22 Wed]] - [[Haina/Daily/2024-05-23|23 Thu]] - [[Haina/Daily/2024-05-24|24 Fri]] - [[Haina/Daily/2024-05-25|25 Sat]] - [[Haina/Daily/2024-05-26|26 Sun]] ❯ [[Haina/Daily/2024-05-27|27 Mon]] - [[Haina/Daily/2024-05-28|28 Tue]] -
 
 ---
 
@@ -14,25 +15,114 @@ tags:
 
 ### 重点工作
 
-1. 
+#### 价格平台
+
+1. 需求会议: 类目明细; 流程方案
 
 ### 维护工作
-#### 
-1. 
+
+#### Sales CRM
+
+1. #维护 上传进度模拟
+2. #维护 接收消息: 会话时间更新, 会话状态更新
+3. #维护 修改号码无效的提示
+4. #维护 新建会话: WhatsApp号码规则: UK
+5. #新增 模板: 头部+参数
+6. ["] 更新OSS存储地址为加速地址
+
+#### 支付中心
+
+1. #维护 PayPal 卡支付: 设置`NO_SHIPPING`
 
 ## 本周计划
-1. 
 
+1.
 
+---
 
-## 未完成
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> path includes W20
+> (filter by function task.status.name === 'Todo')
+> sort by path reverse
+> sort by heading
+> ```
 
-> [!check] 
+> [!todo] In Progress
 >
 > ```tasks
 > not done
 > path includes Haina
 > path includes Weekly/2024
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> path includes Weekly/2024
+> sort by path reverse
 > sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> filter by function (task.status.name === 'idea' || task.status.name === 'important')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
 > ```
diff --git a/Haina/Weekly/2024/2024-W23.md b/Haina/Weekly/2024/2024-W23.md
new file mode 100644
index 0000000..61f648a
--- /dev/null
+++ b/Haina/Weekly/2024/2024-W23.md
@@ -0,0 +1,122 @@
+---
+Created: 2024-05-28 Tue
+Updated: 2024-05-31 13:53 Fri
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W22|Week 22]] | Week 23 | [[Haina/Weekly/2024/2024-W24|Week 24]] ❯ / [[Haina/Daily/2024-05-27|27 Mon]] - [[Haina/Daily/2024-05-28|28 Tue]] - [[Haina/Daily/2024-05-29|29 Wed]] - [[Haina/Daily/2024-05-30|30 Thu]] - [[Haina/Daily/2024-05-31|31 Fri]] - [[Haina/Daily/2024-06-01|01 Sat]] - [[Haina/Daily/2024-06-02|02 Sun]] ❯ [[Haina/Daily/2024-06-03|03 Mon]] - [[Haina/Daily/2024-06-04|04 Tue]] -
+
+---
+
+*2024-06-04 Tue*
+
+## 上周工作
+
+### 重点工作
+
+#### WebHT 基础信息管理
+
+1. 国际化: APP语种切换
+2. 开发: pagespy, tailwindcss, utils, eslint
+
+### 维护工作
+
+#### HT统计
+
+1. GH例会数据: 顾问数据: 全年走团毛利
+2. [x] [Wendy]客运: 老客户统计排查 ✅ 2024-05-31
+
+## 本周计划
+
+1.
+
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> path includes W20
+> (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/2024
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> path includes Weekly/2024
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> filter by function (task.status.name === 'idea' || task.status.name === 'important')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!faq] Question
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```
diff --git a/Haina/Weekly/2024/2024-W24.md b/Haina/Weekly/2024/2024-W24.md
new file mode 100644
index 0000000..0159599
--- /dev/null
+++ b/Haina/Weekly/2024/2024-W24.md
@@ -0,0 +1,123 @@
+---
+Created: 2024-06-06 Thu
+Updated: 2024-06-06 21:31 Thu
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W23|Week 23]] | Week 24 | [[Haina/Weekly/2024/2024-W25|Week 25]] ❯ / [[Haina/Daily/2024-06-03|03 Mon]] - [[Haina/Daily/2024-06-04|04 Tue]] - [[Haina/Daily/2024-06-05|05 Wed]] - [[Haina/Daily/2024-06-06|06 Thu]] - [[Haina/Daily/2024-06-07|07 Fri]] - [[Haina/Daily/2024-06-08|08 Sat]] - [[Haina/Daily/2024-06-09|09 Sun]] ❯ [[Haina/Daily/2024-06-10|10 Mon]] - [[Haina/Daily/2024-06-11|11 Tue]] -
+
+---
+
+*2024-06-11 Tue*
+
+## 上周工作
+
+### 重点工作
+
+#### WebHT 基础信息价格管理
+
+1. [x] store 迁移 zustand ✅ 2024-06-11
+
+### 维护工作
+
+#### HT 统计
+
+1. [ ] 备注: 老客户总订单数统计. 同时勾选时重复计数
+
+#### Sales CRM
+
+1. ["] 合并会话失败, 没有生效
+
+## 本周计划
+
+1.
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> path includes W20
+> (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/2024
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> path includes Weekly/2024
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> 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/2024
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```
diff --git a/Haina/Weekly/2024/2024-W25.md b/Haina/Weekly/2024/2024-W25.md
new file mode 100644
index 0000000..5effb8b
--- /dev/null
+++ b/Haina/Weekly/2024/2024-W25.md
@@ -0,0 +1,130 @@
+---
+Created: 2024-06-12 Wed
+Updated: 2024-06-13 13:54 Thu
+tags:
+  - 周报
+---
+
+[[Haina/Yearly/2024|2024]] / [[Haina/Quarterly/2024-Q2|Q2]] / [[Haina/Monthly/2024-06|June]] / ❮ [[Haina/Weekly/2024/2024-W24|Week 24]] | Week 25 | [[Haina/Weekly/2024/2024-W26|Week 26]] ❯ / [[Haina/Daily/2024-06-10|10 Mon]] - [[Haina/Daily/2024-06-11|11 Tue]] - [[Haina/Daily/2024-06-12|12 Wed]] - [[Haina/Daily/2024-06-13|13 Thu]] - [[Haina/Daily/2024-06-14|14 Fri]] - [[Haina/Daily/2024-06-15|15 Sat]] - [[Haina/Daily/2024-06-16|16 Sun]] ❯ [[Haina/Daily/2024-06-17|17 Mon]] - [[Haina/Daily/2024-06-18|18 Tue]] -
+
+---
+
+*2024-06-18 Tue*
+
+## 上周工作
+
+### 重点工作
+
+#### WebHT 基础信息价格管理
+
+1. #文档 录入/编辑页面交互调整
+
+### 维护工作
+
+#### TS
+
+1. 垃圾订单处理
+   1. 无结果页面的contact表单
+   2. 国际火车
+
+#### 支付中心
+
+1. [x] 各语种/部门的支付页面模板改为调用后端发起支付 ✅ 2024-06-14
+2. 
+
+#### HT 统计
+
+1. [x] 销售的老客户订单数据 ✅ 2024-06-14
+
+## 本周计划
+
+1.
+
+---
+
+> [!todo] Not done
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> (path includes W23) OR (path includes W24 )
+> (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/2024
+> (filter by function task.status.name === 'incomplete')
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!check] Latest 2 weeks
+>
+> ```tasks
+> done after last monday
+> path includes Haina
+> path includes Weekly/2024
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!note] Deferred
+>
+> ```tasks
+> not done
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> 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/2024
+> filter by function task.status.name === 'question'
+> sort by path reverse
+> sort by heading
+> ```
+
+> [!fail] Cancelled
+>
+> ```tasks
+> path includes Haina
+> path includes Weekly/2024
+> 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/2024
+> (filter by function task.status.type === 'TODO')
+> sort by path reverse
+> sort by heading
+> ```
diff --git a/Haina/项目/SCRM/audio 语音.md b/Haina/项目/SCRM/audio 语音.md
new file mode 100644
index 0000000..15d6893
--- /dev/null
+++ b/Haina/项目/SCRM/audio 语音.md	
@@ -0,0 +1,10 @@
+## 字幕
+### Mobile
+- 华为, 荣耀: AI字幕
+### PC
+- win11: [实时字幕](https://support.microsoft.com/zh-cn/windows/%E4%BD%BF%E7%94%A8%E5%AE%9E%E6%97%B6%E5%AD%97%E5%B9%95%E6%9B%B4%E5%A5%BD%E5%9C%B0%E4%BA%86%E8%A7%A3%E9%9F%B3%E9%A2%91-b52da59c-14b8-4031-aeeb-f6a47e6055df)
+
+
+
+  --output_format {lrc,txt,text,vtt,srt,tsv,json,all}, -f {lrc,txt,text,vtt,srt,tsv,json,all}
+                        format of the output file; if not specified srt will be produced (default: srt)
\ No newline at end of file
diff --git a/Haina/项目/价格平台/价格平台.md b/Haina/项目/价格平台/价格平台.md
new file mode 100644
index 0000000..6577f76
--- /dev/null
+++ b/Haina/项目/价格平台/价格平台.md
@@ -0,0 +1,43 @@
+---
+Created: 2024-05-31 Fri
+Updated: 2024-06-03 12:06 Mon
+---
+
+计划上线: 2024.08.01
+
+需求: 2024.06.10
+
+```mermaid
+---
+title: GHHub 开发管理 - 机票和价格管理
+---
+gitGraph TB:
+   commit
+   commit
+   branch release
+   branch feature/i18n
+   checkout main
+   commit id: "release" tag: "1.0.5.31"
+   branch bug/x1
+   commit id: "fix(...): ..."
+   checkout feature/i18n
+   commit
+   commit
+   checkout main
+   merge feature/i18n id: "机票开始"
+   branch feature/price_manager
+   checkout main
+   commit
+   commit
+   checkout feature/price_manager
+   commit
+   commit id: "完成价格"
+   checkout main
+   commit tag: "1.1.0" id: "完成机票"
+   branch pre-release
+   merge feature/price_manager id: "合并机票+价格" type:HIGHLIGHT
+   checkout main
+   merge pre-release id: "合并发布"  tag: "1.2.0"
+   commit
+
+```
diff --git a/weixin/ChatAudio 通过TTS + STT + GPT 实现语音对话（低仿微信聊天）.pdf b/weixin/ChatAudio 通过TTS + STT + GPT 实现语音对话（低仿微信聊天）.pdf
new file mode 100644
index 0000000..80866f3
Binary files /dev/null and b/weixin/ChatAudio 通过TTS + STT + GPT 实现语音对话（低仿微信聊天）.pdf differ