From 09fa9410ac06e856b6a5ef3446ab0e3e334d996a Mon Sep 17 00:00:00 2001 From: BTMuli Date: Mon, 15 May 2023 19:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E7=B4=A0=E6=9D=90=E6=97=A5?= =?UTF-8?q?=E5=8E=86=20UI=20=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=9B=9E=E5=A4=B4?= =?UTF-8?q?=E5=86=99=E4=B8=AA=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/t-calendar.vue | 261 ++++++++++++---------------------- 1 file changed, 93 insertions(+), 168 deletions(-) diff --git a/src/components/t-calendar.vue b/src/components/t-calendar.vue index cbe557bf..ea5966b5 100644 --- a/src/components/t-calendar.vue +++ b/src/components/t-calendar.vue @@ -21,107 +21,61 @@ {{ text.text }} -
+
-
+
天赋培养
-
+
-
- {{ character.title }} +
+ bg
-
- +
+ icon
-
-
- -
- bg -
- -
- icon -
- -
-
- element -
-
- weapon - {{ item.name }} -
-
+
+
+ element +
+
+ weapon +
+
+ {{ item.name }}
-
-
-
- 武器突破 -
-
-
-
- {{ weapon.title }} -
-
- -
-
-
- -
- bg +
+
+ 武器突破 +
+
+
+
+ bg +
+
+ icon +
+
+
+ element
- -
- icon -
- -
-
- type -
-
- {{ item.name }} -
+
+ {{ item.name }}
@@ -147,13 +101,13 @@ import { createTGWindow } from "../utils/TGWindow"; const loading = ref(true as boolean); // data -const calendarData = ref(TGAppData.calendar as Record); +const calendarData = ref(TGAppData.calendar); const weekNow = ref(0 as number); const btnNow = ref(0 as number); const dateNow = ref(new Date().toLocaleDateString()); -const calendarNow = ref({} as BTMuli.Genshin.Calendar.Data); -const characterCards = ref({} as Record); -const weaponCards = ref({} as Record); +const calendarNow = ref([] as BTMuli.Genshin.Calendar.Data[]); +const characterCards = ref({} as Record); +const weaponCards = ref({} as Record); // snackbar const snackbar = ref(false as boolean); @@ -162,7 +116,7 @@ const snackbarColor = ref("success" as string); const btnText = [ { - week: 0, + week: 7, text: "周日", }, { @@ -197,43 +151,36 @@ defineExpose({ }); onMounted(() => { - const dayNow = new Date().getDay(); + const dayNow = (new Date().getDay()) === 0 ? 7 : (new Date().getDay()); weekNow.value = dayNow; btnNow.value = dayNow; calendarNow.value = getCalendar(dayNow); - characterCards.value = calendarNow.value.characters; - weaponCards.value = calendarNow.value.weapons; + characterCards.value = calendarNow.value.filter((item) => item.item_type === "character"); + weaponCards.value = calendarNow.value.filter((item) => item.item_type === "weapon"); loading.value = false; }); // 获取当前日历 function getCalendar (day: number) { - let week; - if (day < 4) week = day; - else week = day - 3; - return calendarData.value[week]; + return calendarData.value.filter((item) => item.drop_day.includes(day)); } -function showContent (material: BTMuli.Genshin.Calendar.Material | BTMuli.Genshin.Wiki.Character.BriefInfo | BTMuli.Genshin.Wiki.Weapon.BriefInfo) { - if (material.content_id === null || material.content_id === undefined) { +function showContent (item: BTMuli.Genshin.Calendar.Data) { + if (item.content_id === null) { snackbarText.value = "暂无详情"; snackbarColor.value = "error"; snackbar.value = true; return; } - const url = OBC_CONTENT_API.replace("{content_id}", material.content_id.toString()); - createTGWindow(url, "素材详情", material.name, 1200, 800, true); + const url = OBC_CONTENT_API.replace("{content_id}", item.content_id.toString()); + createTGWindow(url, "素材详情", item.name, 1200, 800, true); } function getContents (day: number) { - const oldValue = btnNow.value; btnNow.value = day; - if (oldValue % 3 === day % 3 && oldValue !== 0 && day !== 0) { - return; - } calendarNow.value = getCalendar(day); - characterCards.value = calendarNow.value.characters; - weaponCards.value = calendarNow.value.weapons; + characterCards.value = calendarNow.value.filter((item) => item.item_type === "character"); + weaponCards.value = calendarNow.value.filter((item) => item.item_type === "weapon"); }