diff --git a/src/components/hutaoAbyss/hta-tab-team.vue b/src/components/hutaoAbyss/hta-tab-team.vue index 4f01129d..b0754187 100644 --- a/src/components/hutaoAbyss/hta-tab-team.vue +++ b/src/components/hutaoAbyss/hta-tab-team.vue @@ -15,29 +15,19 @@
上半
-
-
- -
-
上场{{ items.Rate }}次
-
+ + +
下半
-
-
- -
-
上场{{ items.Rate }}次
-
+ + +
@@ -47,7 +37,7 @@ + diff --git a/src/pages/WIKI/Abyss.vue b/src/pages/WIKI/Abyss.vue index 601d8c75..092c388b 100644 --- a/src/pages/WIKI/Abyss.vue +++ b/src/pages/WIKI/Abyss.vue @@ -32,7 +32,7 @@ - + @@ -63,15 +63,15 @@ enum AbyssTabEnum { type AbyssTab = keyof typeof AbyssTabEnum; type AbyssList = Array<{ label: AbyssTabEnum; value: AbyssTab }>; export type AbyssDataItem = { cur: T; last: T }; -export type AbyssDataItemType = AbyssDataItem< - T extends "use" - ? TGApp.Plugins.Hutao.Abyss.AvatarUse[] - : T extends "up" - ? TGApp.Plugins.Hutao.Abyss.AvatarUp[] - : T extends "team" - ? TGApp.Plugins.Hutao.Abyss.TeamCombination[] - : TGApp.Plugins.Hutao.Abyss.AvatarHold[] ->; +export type AbyssDataItemType = T extends "use" + ? AbyssDataItem + : T extends "up" + ? AbyssDataItem + : T extends "team" + ? TGApp.Plugins.Hutao.Abyss.TeamCombination[] + : T extends "hold" + ? AbyssDataItem + : null; type AbyssData = { [key in AbyssTab]: AbyssDataItemType | null; }; @@ -106,7 +106,7 @@ onMounted(async () => { last: await Hutao.Abyss.getOverview(true), }; loadT.value = "正在获取深渊数据"; - const useData = await getData("use"); + const useData = >await getData("use"); abyssData.value = { use: useData, up: null, team: null, hold: null }; loading.value = false; }); @@ -151,10 +151,7 @@ async function getData(type: AbyssTab): Promise> { last: await Hutao.Abyss.avatar.getUpRate(true), }; case "team": - return { - cur: await Hutao.Abyss.getTeamCollect(), - last: await Hutao.Abyss.getTeamCollect(true), - }; + return await Hutao.Abyss.getTeamCollect(); case "hold": return { cur: await Hutao.Abyss.avatar.getHoldRate(),