diff --git a/src/components/home/t-calendar.vue b/src/components/home/t-calendar.vue index 949c05d9..ac93a790 100644 --- a/src/components/home/t-calendar.vue +++ b/src/components/home/t-calendar.vue @@ -83,9 +83,6 @@ import { generateShareImg } from "../../utils/TGShare"; import TibCalendarItem from "../itembox/tib-calendar-item.vue"; import ToCalendar from "../overlay/to-calendar.vue"; -// loading -const loading = ref(true); - // data const calendarData = computed(() => AppCalendarData); const weekNow = ref(0); @@ -141,11 +138,11 @@ const btnText = [ }, ]; -// expose -defineExpose({ - name: "素材日历", - loading, -}); +interface TCalendarEmits { + (e: "success"): void; +} + +const emits = defineEmits(); onMounted(async () => { const appStore = useAppStore(); @@ -173,7 +170,7 @@ onMounted(async () => { calendarNow.value = getCalendar(dayNow); characterCards.value = calendarNow.value.filter((item) => item.itemType === "character"); weaponCards.value = calendarNow.value.filter((item) => item.itemType === "weapon"); - loading.value = false; + emits("success"); }); // 获取当前日历 diff --git a/src/components/home/t-pool.vue b/src/components/home/t-pool.vue index c5faedc6..7f6657a9 100644 --- a/src/components/home/t-pool.vue +++ b/src/components/home/t-pool.vue @@ -16,7 +16,7 @@ /> -
+
cover @@ -68,9 +68,6 @@ import showSnackbar from "../func/snackbar"; // store const homeStore = useHomeStore(); -// loading -const loading = ref(true); - const hasNew = ref(false); const showNew = ref(false); @@ -81,8 +78,11 @@ const poolTimeGet = ref>({}); const poolTimePass = ref>({}); const timer = ref>({}); -// expose -defineExpose({ name: "限时祈愿", loading }); +interface TPoolEmits { + (e: "success"): void; +} + +const emits = defineEmits(); function poolLastInterval(postId: number): TGApp.Plugins.Mys.Gacha.RenderCard | undefined { const pool = poolCards.value.find((pool) => pool.postId === postId); @@ -152,7 +152,7 @@ onMounted(async () => { poolSelect.value = poolCards.value; hasNew.value = false; } - loading.value = false; + emits("success"); }); // 检测新卡池 diff --git a/src/components/home/t-position.vue b/src/components/home/t-position.vue index e17fc87e..ca188b7d 100644 --- a/src/components/home/t-position.vue +++ b/src/components/home/t-position.vue @@ -4,7 +4,7 @@ act 近期活动
-
+
(true); - // data const positionCards = ref([]); const positionTimeGet = ref>({}); // 剩余时间/已结束/未知 const positionTimeEnd = ref>({}); // 结束时间戳 const positionTimer = ref>({}); // 定时器 -// expose -defineExpose({ - name: "近期活动", - loading, -}); +interface TPositionEmits { + (e: "success"): void; +} + +const emits = defineEmits(); function positionLastInterval(postId: number): void { const timeGet = positionTimeGet.value[postId]; @@ -98,7 +95,7 @@ onMounted(async () => { positionLastInterval(card.postId); }, 1000); }); - loading.value = false; + emits("success"); }); onUnmounted(() => { diff --git a/src/pages/common/Home.vue b/src/pages/common/Home.vue index a40bfdbf..2002f680 100644 --- a/src/pages/common/Home.vue +++ b/src/pages/common/Home.vue @@ -12,12 +12,12 @@ /> 确定
- +