vault backup: 2025-07-16 18:09:36

Affected files: .obsidian/plugins/obsidian-admonition/data.json .obsidian/plugins/obsidian-linter/data.json Haina/Templates/W-log.md Haina/Weekly/2025/2025-W30.md Haina/项目/GHH/价格平台/WebHT 三期.md
3 months ago · bd8da34da4
parent 3da01ae4df
commit bd8da34da4
5 changed files with 85 additions and 62 deletions
--- a/.obsidian/plugins/obsidian-admonition/data.json
+++ b/.obsidian/plugins/obsidian-admonition/data.json
@ -36,12 +36,24 @@
      "injectColor": true,
      "noTitle": false,
      "copy": true
+    },
+    "yellow": {
+      "type": "yellow",
+      "color": "250, 204, 21",
+      "icon": {
+        "name": "lucide-file-warning",
+        "type": "obsidian"
+      },
+      "command": false,
+      "injectColor": true,
+      "noTitle": false,
+      "copy": true
    }
  },
  "syntaxHighlight": false,
  "copyButton": false,
  "version": "10.3.2",
-  "autoCollapse": false,
+  "autoCollapse": true,
  "defaultCollapseType": "open",
  "injectColor": true,
  "parseTitles": true,
--- a/.obsidian/plugins/obsidian-linter/data.json
+++ b/.obsidian/plugins/obsidian-linter/data.json
@ -168,7 +168,7 @@
      "style": "consistent"
    },
    "two-spaces-between-lines-with-content": {
-      "enabled": false,
+      "enabled": true,
      "line-break-indicator": "  "
    },
    "unordered-list-style": {
@ -207,7 +207,7 @@
      "empty-line-after-yaml": true
    },
    "line-break-at-document-end": {
-      "enabled": false
+      "enabled": true
    },
    "move-math-block-indicators-to-their-own-line": {
      "enabled": false
@ -234,7 +234,7 @@
      "characters-to-remove-space-after": "¿¡‘“(["
    },
    "space-after-list-markers": {
-      "enabled": false
+      "enabled": true
    },
    "space-between-chinese-japanese-or-korean-and-english-or-numbers": {
      "enabled": false,
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@ -1,50 +1,50 @@
 ---
 Created: 2023-09-15 17:08 Fri
-Updated: 2025-07-16 11:43 Wed
+Updated: 2025-07-16 17:09 Wed
 tags:
  - 周报
 ---
-<%*
+<%*  
 let week = moment(tp.file.title);

-// # 2023 Week 1
+// # 2023 Week 1  
 // tR += '# ' + week.format('gggg [Week] w') + '';

-// 2023 / Q1 / January
-tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
-tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';
-tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';
-// If the week crosses a month
-// 2022 / Q4 / December - 2023 / Q1 / January
-if (week.format('M') != week.endOf('week').format('M')) {
-    tR += ' - ';
-    tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
-    tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';
-    tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';
-}
+// 2023 / Q1 / January  
+tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';  
+tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';  
+tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';  
+// If the week crosses a month  
+// 2022 / Q4 / December - 2023 / Q1 / January  
+if (week.format('M') != week.endOf('week').format('M')) {  
+    tR += ' - ';  
+    tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';  
+    tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';  
+    tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';  
+}  
 tR += ' / ';

-// ❮ Week 52 | Week 1 | Week 2 ❯
-tR += '❮ [[' + week.subtract(1, 'weeks').format('[Haina/Weekly/]gggg/gggg-[W]ww|[Week] w') + ']]';
-tR += ' | ' + week.add(1, 'weeks').format('[Week] w') + ' | ';
-tR += '[[' + week.add(1, 'weeks').format('[Haina/Weekly/]gggg/gggg-[W]ww|[Week] w') + ']] ❯';
-week.subtract(1, 'weeks');
+// ❮ Week 52 | Week 1 | Week 2 ❯  
+tR += '❮ [[' + week.subtract(1, 'weeks').format('[Haina/Weekly/]gggg/gggg-[W]ww|[Week] w') + ']]';  
+tR += ' | ' + week.add(1, 'weeks').format('[Week] w') + ' | ';  
+tR += '[[' + week.add(1, 'weeks').format('[Haina/Weekly/]gggg/gggg-[W]ww|[Week] w') + ']] ❯';  
+week.subtract(1, 'weeks');  
 tR += ' / ';

-week.subtract(1, 'weeks'); // 上周
-// Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday
-for (let day = 0; day < 7; day++) {
-    tR += '[[' + week.weekday(day).format('[Haina/Daily/]YYYY-MM-DD|DD ddd') + ']]';
-    if (day < 6) {
-        tR += ' - ';
-    }
-}
-week.add(1, 'weeks');
-tR += ' ❯ ';
-for (let day = 0; day < 2; day++) {
-    tR += '[[' + week.weekday(day).format('[Haina/Daily/]YYYY-MM-DD|DD ddd') + ']]';
-    tR += ' - ';
-}
+week.subtract(1, 'weeks'); // 上周  
+// Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday  
+for (let day = 0; day < 7; day++) {  
+    tR += '[[' + week.weekday(day).format('[Haina/Daily/]YYYY-MM-DD|DD ddd') + ']]';  
+    if (day < 6) {  
+        tR += ' - ';  
+    }  
+}  
+week.add(1, 'weeks');  
+tR += ' ❯ ';  
+for (let day = 0; day < 2; day++) {  
+    tR += '[[' + week.weekday(day).format('[Haina/Daily/]YYYY-MM-DD|DD ddd') + ']]';  
+    tR += ' - ';  
+}  
 %>

 ---
@ -71,7 +71,7 @@ for (let day = 0; day < 2; day++) {
 > path includes Haina
 > filter by function task.file.path.includes('项目')
 > filter by function task.file.property('Updated') > '<% moment(tp.file.title).startOf('month').subtract(1, "month").format('YYYY-MM-DD') %>'
-> group by heading
+> group by filename
 > ```

 ---
@ -132,9 +132,9 @@ for (let day = 0; day < 2; day++) {
 > [!info]- 转移
 >
 > ```tasks
-> (not done) OR (done after 2025-04-29)
+> (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
+> path includes Weekly/<% moment(tp.file.title).format('YYYY') %>
 > filter by function (task.status.name === 'quote')
 > group by heading
 > ``` 
@ -144,7 +144,7 @@ for (let day = 0; day < 2; day++) {
 > [!check] Latest 2 weeks
 >
 > ```tasks
-> done after <% moment(tp.file.title).weekday(1).subtract(14, "days").format('YYYY-MM-DD') %>
+> 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
@ -217,7 +217,7 @@ for (let day = 0; day < 2; day++) {
 > sort by heading
 > ```

-> [!todo] Todo
+> [!todo] Todo  
 > 暂时不用
 > ```tasks--
 > not done
--- a/Haina/Weekly/2025/2025-W30.md
+++ b/Haina/Weekly/2025/2025-W30.md
@ -1,6 +1,6 @@
 ---
 Created: 2025-07-08 20:13 Tue
-Updated: 2025-07-16 16:25 Wed
+Updated: 2025-07-16 17:05 Wed
 tags:
  - 周报
 cssclasses: []
@ -9,19 +9,6 @@ cssclasses: []

 ---

-
-```ad-red
-(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
-
-```
-
 *2025-07-22 Tue*  

 ## 上周工作
@ -44,7 +31,7 @@ group by heading
 > path includes Haina
 > filter by function task.file.path.includes('项目')
 > filter by function task.file.property('Updated') > '2025-06-01'
-> group by heading
+> group by filename
 > ```

 ---
@ -193,7 +180,7 @@ group by heading
 > sort by heading
 > ```

-> [!todo] Todo
+> [!todo] Todo  
 > 暂时不用
 > ```tasks--
 > not done
--- a/Haina/项目/GHH/价格平台/WebHT
+++ b/Haina/项目/GHH/价格平台/WebHT
@ -1,10 +1,8 @@
 ---
 Created: 2025-07-11 09:45 Fri
-Updated: 2025-07-11 10:56 Fri
+Updated: 2025-07-16 17:04 Wed
 ---

-> [!attention] ~2025-08-30
-
 ##### 拒绝的价格要显示原价格
 - +历史记录表: 记录已发布的价格
 - 无历史: 拒绝后, 从HT读取, 回填
@ -13,3 +11,29 @@ Updated: 2025-07-11 10:56 Fri
 **“哪项变动，和原来的价格对比”**
 - [?] `原来的价格`是指: 上一次编辑? 已发布生效的价格?

+---
+
+### ✈2025-08-13前
+
+```ad-red
+title: ✈2025-08-13前
+```
+1. ["] 钉钉提醒客服产品变动
+2. [x] 地接首页先选年份再展示产品 ✅ 2025-07-16
+3. [ ] 价格时间段根据选择并默认全年
+4. [ ] 审核页面：新增单独标注
+5. [ ] 产品绑定多城市
+6. [ ] 规范价格的人等数字
+
+
+### 📅2025-08-27后
+```ad-attention
+title: 📅2025-08-27后
+```
+
+1. [ ] 复制单个产品功能 
+2. [ ] 拒绝的价格要显示原价格
+3. [ ] 根据名称搜索产品, 仅显示匹配
+4. [ ] 景点按关键词排序
+5. [ ] 包价线路增加“包价类型”“排序”
+6. [ ] 合同下载优化