diff --git a/src/components/pageHome/ph-comp-daily-note.vue b/src/components/pageHome/ph-comp-daily-note.vue index b1f1ae27..d45aebc2 100644 --- a/src/components/pageHome/ph-comp-daily-note.vue +++ b/src/components/pageHome/ph-comp-daily-note.vue @@ -19,10 +19,11 @@
@@ -37,7 +38,7 @@ import useAppStore from "@store/app.js"; import useUserStore from "@store/user.js"; import TGLogger from "@utils/TGLogger.js"; import { storeToRefs } from "pinia"; -import { onMounted, ref, watch } from "vue"; +import { computed, onMounted, ref, watch } from "vue"; import THomeCard from "./ph-comp-card.vue"; import PhDailyNoteItem from "./ph-daily-note-item.vue"; @@ -54,7 +55,7 @@ type TDailyNoteEmits = { }; const emits = defineEmits(); -const { cookie, uid, briefInfo } = storeToRefs(useUserStore()); +const { cookie, uid, briefInfo, account } = storeToRefs(useUserStore()); const { isLogin } = storeToRefs(useAppStore()); const loading = ref(false); @@ -63,6 +64,19 @@ const loadingText = ref(""); const gameAccounts = ref>([]); const dailyNoteAccounts = ref>([]); +const currentGameUid = computed(() => account.value?.gameUid || ""); + +const sortedDailyNoteAccounts = computed(() => { + if (!currentGameUid.value) return dailyNoteAccounts.value; + return [...dailyNoteAccounts.value].sort((a, b) => { + const aIsCurrent = a.account.gameUid === currentGameUid.value; + const bIsCurrent = b.account.gameUid === currentGameUid.value; + if (aIsCurrent && !bIsCurrent) return -1; + if (!aIsCurrent && bIsCurrent) return 1; + return 0; + }); +}); + watch( () => uid.value, async () => await loadData(), diff --git a/src/components/pageHome/ph-daily-note-boss.vue b/src/components/pageHome/ph-daily-note-boss.vue index 978802a5..11547811 100644 --- a/src/components/pageHome/ph-daily-note-boss.vue +++ b/src/components/pageHome/ph-daily-note-boss.vue @@ -34,7 +34,7 @@ const max = computed((): number => { display: flex; width: 100%; align-items: center; - padding: 6px; + padding: 4px; border-radius: 4px; background: var(--box-bg-2); gap: 4px; @@ -65,7 +65,6 @@ const max = computed((): number => { .pdb-boss-title { font-family: var(--font-title); font-size: 13px; - font-weight: bold; white-space: nowrap; } diff --git a/src/components/pageHome/ph-daily-note-coin.vue b/src/components/pageHome/ph-daily-note-coin.vue index c1004c57..1589a547 100644 --- a/src/components/pageHome/ph-daily-note-coin.vue +++ b/src/components/pageHome/ph-daily-note-coin.vue @@ -1,6 +1,6 @@ diff --git a/src/components/pageHome/ph-daily-note-resin.vue b/src/components/pageHome/ph-daily-note-resin.vue index 9950760f..6eca9d55 100644 --- a/src/components/pageHome/ph-daily-note-resin.vue +++ b/src/components/pageHome/ph-daily-note-resin.vue @@ -1,6 +1,6 @@ + diff --git a/src/components/pageHome/ph-dn-tr.vue b/src/components/pageHome/ph-dn-tr.vue new file mode 100644 index 00000000..96f935da --- /dev/null +++ b/src/components/pageHome/ph-dn-tr.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/enum/dailyNote.ts b/src/enum/dailyNote.ts index 5961a9ef..683d957e 100644 --- a/src/enum/dailyNote.ts +++ b/src/enum/dailyNote.ts @@ -11,6 +11,7 @@ const ExpeditionStatusEnum: typeof TGApp.Game.DailyNote.ExpeditionStatus = { ONGOING: "Ongoing", FINISHED: "Finished", + EMPTY: "Empty", }; /** diff --git a/src/pages/User/Combat.vue b/src/pages/User/Combat.vue index 0e76bb20..40b135f6 100644 --- a/src/pages/User/Combat.vue +++ b/src/pages/User/Combat.vue @@ -628,9 +628,9 @@ function isFinTarot(data: TGApp.Sqlite.Combat.TableTrans): boolean { } .uc-window-item { + overflow: hidden auto; height: 100%; padding-right: 8px; - overflow: hidden auto; } .ucw-i-ref { diff --git a/src/types/Game/DailyNote.d.ts b/src/types/Game/DailyNote.d.ts index 6e718a78..c7712cb9 100644 --- a/src/types/Game/DailyNote.d.ts +++ b/src/types/Game/DailyNote.d.ts @@ -202,6 +202,8 @@ declare namespace TGApp.Game.DailyNote { const ExpeditionStatus = { ONGOING: "Ongoing", FINISHED: "Finished", + /** 自定义状态 */ + EMPTY: "Empty", }; /**