From 82750ccc3c0ae4687c20bad3badfa80331a42eed Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Wed, 6 May 2026 16:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=96=B0=E5=A2=9E=E5=8A=B1?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E8=BF=9C=E5=B0=8F=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/UI/daily/week_act.webp                 | Bin 0 -> 1006 bytes
 .../pageHome/ph-comp-game-status.vue          |   1 +
 .../pageHome/ph-daily-note-item.vue           |  14 +-
 .../pageHome/ph-daily-note-week-act.vue       | 128 ++++++++++++++++++
 src/types/Game/DailyNote.d.ts                 |  37 ++++-
 5 files changed, 174 insertions(+), 6 deletions(-)
 create mode 100644 public/UI/daily/week_act.webp
 create mode 100644 src/components/pageHome/ph-daily-note-week-act.vue

diff --git a/public/UI/daily/week_act.webp b/public/UI/daily/week_act.webp
new file mode 100644
index 0000000000000000000000000000000000000000..cda1756d4700563d5dbb44e877e36bf65a9d583f
GIT binary patch
literal 1006
zcmV<K0}=dENk&HI0{{S5MM6+kP&il$0000G0000r001=r06|PpND~1700DnskZt7H
zAHmh&FCyaLm!<>2t+s7>^28I|Y185>{7e87*aTz)q}BnP1#E$|P}u@b>#o1Q-}5j*
zME@DMZKTNEV}{vBz|6s2KiG`^`R93Z?$D33$jmJK`N^F3J018|Ty5I7Q#4h79nQ0s
zTi=xl!<6q%G3|{olQQlzDI{G{hLe6N=b7Z*TuQMg(n#!!R0mM?*<^t&S_L?vwE!=)
zG2oN73H;EG0iRFC6XeeX!(W2>pWt5dE!e#h3`r+y6G$IO`mEy5a7k+hR%s35?}~5s
z8_1<mQwpk$EJLYy|DojZPMAeXjoDl2l+><_UDXRaJEj4^)zTa9`{0gul(3cu74O%-
z?*yBjJNp~}09H^qAglra08kD9odGH~05$+VZ8DTdBqE|ACKXz6fDMUg0D@IA^ghwh
z?+Sk1-!L9@o|5;9_nw#aX<}xL-QIu-&3&oc8&dPf5Dg6c5&~)HR)M2^Uq%S?Nn}9J
zYNY9Lq7s0YC$PX6wRo-wy9RpAqu?;>M{5{m1VEHeLp3Y_0RHZXf9WESkk|cfg!DNt
zrJ-Z0pY<yuU;nwpMWH6yikB}C1E3O5m!$+vO`~DEE6vQg;2c}*ohGAe@<IPQ7h0`m
zvI<cC3a)sFyfrH2I`<-LGA3BkF~nXS*b{*?beQlUin=LW`d!KN&r`Zy?RtrkQRyqF
z{(MLO|BGcg<WrFb4+y!pkEIDe$OSm(k7ss9S3SSTuhfq66lYwYE2#PIThQ-hUNrBO
zuiVRp(m|Hs5(g<q?~K*N>wCJ%E$@+KP>mn0b%h|03NK>=^ewq~)}|eBCXVwtEN^yE
z5}ymf31gdJ5031LC0c;Ii~22RaD~f|0_^*1>M_ssFnZVRP1T0U3bq`ePu8J}bE#_0
zIU2rZJ<{c*=gg1+ECu<>oY&uEE1;%t?lwplhn8Ix)3$g-P^u>_kE~ELgUf|)zA%%Y
z?XDa!6qD^BCe#_!_C?D>M#!#GBMeq|QVjoV)GF#i&@MG{<ixsDH2`>%caA=2fd?zG
za*L{m$BA?xcG*#RzTN?^Vij*Pi~A-^eV`&8l`5=@{~-(BEXyR@@<7wOl&SBB9e)y1
z=JN7?+#mdIddCo;!3Jvz%`mkXzQjqqm-@6;Ip*4z`%eh39Gmz9HuVcOB>lDfLVVNz
zl&8!lEBB<!Z|-+1*mR!u5BZk=|HZR0d*}mhcXOkvln*5z@5AUi20^55=N2(@?rb>U
cD#n|4ak22HtYXCU!~soYtN*G|000000CxW9;s5{u

literal 0
HcmV?d00001

diff --git a/src/components/pageHome/ph-comp-game-status.vue b/src/components/pageHome/ph-comp-game-status.vue
index 8dba775a..e7bca67a 100644
--- a/src/components/pageHome/ph-comp-game-status.vue
+++ b/src/components/pageHome/ph-comp-game-status.vue
@@ -267,6 +267,7 @@ async function handleRefreshDailyNote(acc: TGApp.Sqlite.Account.Game): Promise<v
   let dataResp: TGApp.Game.DailyNote.DnResp | undefined;
   try {
     dataResp = await recordReq.daily(cookie.value!, acc);
+    console.debug(dataResp);
     if (dataResp.retcode !== 0) {
       await TGLogger.Warn(`[Game Status Card] [${dataResp.retcode}] ${dataResp.message}`);
       showSnackbar.error(`刷新失败：[${dataResp.retcode}] ${dataResp.message}`);
diff --git a/src/components/pageHome/ph-daily-note-item.vue b/src/components/pageHome/ph-daily-note-item.vue
index 520648b4..8899210a 100644
--- a/src/components/pageHome/ph-daily-note-item.vue
+++ b/src/components/pageHome/ph-daily-note-item.vue
@@ -20,22 +20,25 @@
     </div>
     <div v-if="props.data" class="dni-content">
       <div class="dni-grid">
-        <div class="dni-row">
+        <!-- 日常 -->
+        <div class="dni-row col-4">
           <PhDailyNoteResin
             :current-resin="props.data.current_resin"
             :max-resin="props.data.max_resin"
             :recovery-time="props.data.resin_recovery_time"
           />
+          <PhDailyNoteTask :task="props.data.daily_task" />
           <PhDailyNoteCoin
             :current-coin="props.data.current_home_coin"
             :max-coin="props.data.max_home_coin"
             :recovery-time="props.data.home_coin_recovery_time"
           />
-          <PhDailyNoteTransformer :trans="props.data.transformer" />
+          <PhDailyNoteWeekAct :wap="props.data.week_active_progress" />
         </div>
+        <!-- 周常 -->
         <div class="dni-row">
           <PhDailyNoteQuest :quest="props.data.archon_quest_progress" />
-          <PhDailyNoteTask :task="props.data.daily_task" />
+          <PhDailyNoteTransformer :trans="props.data.transformer" />
           <PhDailyNoteBoss
             :remain-resin-discount-num="props.data.remain_resin_discount_num"
             :resin-discount-num-limit="props.data.resin_discount_num_limit"
@@ -56,6 +59,7 @@ import PhDailyNoteTransformer from "./ph-daily-note-transformer.vue";
 import PhDailyNoteTask from "./ph-daily-note-task.vue";
 import PhDailyNoteQuest from "./ph-daily-note-quest.vue";
 import PhDailyNoteBoss from "./ph-daily-note-boss.vue";
+import PhDailyNoteWeekAct from "./ph-daily-note-week-act.vue";
 import { computed } from "vue";
 import dnEnum from "@enum/dailyNote.js";
 
@@ -154,6 +158,10 @@ function handleRefresh(): void {
   display: grid;
   gap: 4px;
   grid-template-columns: repeat(3, 1fr);
+
+  &.col-4 {
+    grid-template-columns: repeat(4, 1fr);
+  }
 }
 
 .dni-item {
diff --git a/src/components/pageHome/ph-daily-note-week-act.vue b/src/components/pageHome/ph-daily-note-week-act.vue
new file mode 100644
index 00000000..1c20e013
--- /dev/null
+++ b/src/components/pageHome/ph-daily-note-week-act.vue
@@ -0,0 +1,128 @@
+<!-- 励行修远进度组件 -->
+<template>
+  <div class="pdnwa-box">
+    <div class="pdnwa-icon">
+      <img alt="励行修远" src="/UI/daily/week_act.webp" />
+    </div>
+    <div class="pdnwa-info">
+      <div class="pdnwa-title-row">
+        <span>励行修远</span>
+        <span>{{ periodProgress }}</span>
+      </div>
+      <div class="pdnwa-content">
+        <span class="pdnwa-dots">
+          <v-icon v-for="idx in 7" :key="idx" :color="getDayColor(idx)" :size="14">
+            {{ getDayIcon(idx) }}
+          </v-icon>
+        </span>
+        <span class="pdnwa-progress-text">{{ weekProgress }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { computed } from "vue";
+
+type PhDailyNoteWeekActProps = {
+  wap?: TGApp.Game.DailyNote.WeekActiveProgress;
+};
+
+const props = withDefaults(defineProps<PhDailyNoteWeekActProps>(), {
+  wap: undefined,
+});
+
+const weekProgress = computed<string>(() => {
+  if (!props.wap) return "0/5";
+  const { progress_current, progress_total } = props.wap;
+  return `${progress_current}/${progress_total}`;
+});
+const periodProgress = computed<string>(() => {
+  if (!props.wap) return "0/8";
+  const { period_progress_current, period_progress_total } = props.wap;
+  return `${period_progress_current}/${period_progress_total}`;
+});
+const weekDays = computed<Array<number>>(() => {
+  if (!props.wap) return [];
+  return props.wap.progress_current_arr;
+});
+
+function getDayColor(day: number): string {
+  console.log(day);
+  if (weekDays.value.includes(day)) return "var(--tgc-od-green)";
+  if (props.wap?.current_weekday ?? 1 < day) return "var(--tgc-od-white)";
+  return "var(--tgc-od-red)";
+}
+
+function getDayIcon(day: number): string {
+  if (weekDays.value.includes(day)) return "mdi-check-circle";
+  if (props.wap?.current_weekday ?? 1 < day) return "mdi-circle-outline";
+  return "mdi-information";
+}
+</script>
+<style lang="scss" scoped>
+.pdnwa-box {
+  position: relative;
+  display: flex;
+  width: 100%;
+  align-items: center;
+  padding: 4px;
+  border-radius: 4px;
+  background: var(--box-bg-2);
+  gap: 4px;
+}
+
+.pdnwa-icon {
+  position: relative;
+  overflow: hidden;
+  width: 28px;
+  height: 28px;
+  flex-shrink: 0;
+  border-radius: 4px;
+
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+}
+
+.pdnwa-info {
+  position: relative;
+  display: flex;
+  min-width: 0;
+  flex: 1;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.pdnwa-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-family: var(--font-title);
+  font-size: 13px;
+  gap: 4px;
+}
+
+.pdnwa-content {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 4px;
+}
+
+.pdnwa-progress-text {
+  display: flex;
+  align-items: center;
+  color: var(--box-text-2);
+  font-size: 10px;
+  gap: 4px;
+  white-space: nowrap;
+}
+
+.pdnwa-dots {
+  display: flex;
+  align-items: center;
+}
+</style>
diff --git a/src/types/Game/DailyNote.d.ts b/src/types/Game/DailyNote.d.ts
index f022b3f9..7e0281e5 100644
--- a/src/types/Game/DailyNote.d.ts
+++ b/src/types/Game/DailyNote.d.ts
@@ -1,6 +1,6 @@
 /**
  * 实时便笺数据
- * @since Beta v0.10.0
+ * @since Beta v0.10.2
  */
 
 declare namespace TGApp.Game.DailyNote {
@@ -12,7 +12,7 @@ declare namespace TGApp.Game.DailyNote {
 
   /**
    * 实时便笺返回
-   * @since Beta v0.10.0
+   * @since Beta v0.10.2
    */
   type DnRes = {
     /** 当前体力 */
@@ -51,6 +51,8 @@ declare namespace TGApp.Game.DailyNote {
     daily_task: DailyTask;
     /** 任务进度 */
     archon_quest_progress: ArchonQuestProgress;
+    /** 砺行修远 */
+    week_active_progress: WeekActiveProgress;
   };
 
   /**
@@ -163,7 +165,10 @@ declare namespace TGApp.Game.DailyNote {
     wiki_url: string;
   };
 
-  /** 任务 */
+  /**
+   * 任务
+   * @since Beta v0.10.1
+   */
   type ArchonQuest = {
     /**
      * 章节数
@@ -256,4 +261,30 @@ declare namespace TGApp.Game.DailyNote {
    */
   type AttendanceRewardStatusEnum =
     (typeof AttendanceRewardStatus)[keyof typeof AttendanceRewardStatus];
+
+  /**
+   * 励行修远进度
+   * @since Beta v0.10.2
+   */
+  type WeekActiveProgress = {
+    /** 本周已完成进度 */
+    progress_current: number;
+    /** 本周总进度 */
+    progress_total: number;
+    /** 周数完成进度 */
+    period_progress_current: number;
+    /** 周数总进度 */
+    period_progress_total: number;
+    /** 是否解锁 */
+    unlock: boolean;
+    /**
+     * 进度数组
+     * @remarks 1,2,3 周一，周二，周三
+     */
+    progress_current_arr: Array<number>;
+    /** 是否激活当前进度 */
+    is_active_period: boolean;
+    /** 当前周序数 */
+    current_weekday: number;
+  };
 }