diff --git a/src/pages/User/Gacha.vue b/src/pages/User/Gacha.vue index b33666c4..7a8ef259 100644 --- a/src/pages/User/Gacha.vue +++ b/src/pages/User/Gacha.vue @@ -171,6 +171,7 @@ import { onMounted, ref, shallowRef, watch } from "vue"; import { useRouter } from "vue-router"; import { AppCalendarData } from "@/data/index.js"; +import TGHttps from "@utils/TGHttps.js"; const router = useRouter(); const hutaoStore = useHutaoStore(); @@ -398,7 +399,7 @@ async function handleHutaoDownload(uids: Array): Promise { await showLoading.end(); showSnackbar.success("成功下载,即将刷新页面"); await new Promise((resolve) => setTimeout(resolve, 1000)); - window.location.reload(); + // window.location.reload(); } async function handleHutaoDelete(uids: Array): Promise { @@ -598,10 +599,13 @@ async function loadYatta(): Promise { try { yattaData.value = await fetchYattaJson(); } catch (e) { - console.error(e); - showSnackbar.warn(`获取 Yatta 元数据失败`); - await TGLogger.Error(`[UserGacha][onMounted]获取 Yatta 元数据失败`); - await TGLogger.Error(`${e}`); + let errMsg = String(e); + if (TGHttps.isHttpErr(e)) { + errMsg = e.status ? `[${e.status}] ${e.statusText}` : e.message; + } + showSnackbar.error(`获取Yatta数据失败:${errMsg}`); + await TGLogger.Error(`[Gacha][loadYatta] 获取Yatta数据失败`); + await TGLogger.Error(`[Gacha][loadYatta] ${e}`); } } diff --git a/src/utils/Yatta.ts b/src/utils/Yatta.ts index 2d07b00f..869dc209 100644 --- a/src/utils/Yatta.ts +++ b/src/utils/Yatta.ts @@ -1,20 +1,19 @@ /** * Yatta 插件入口 - * @since Beta v0.9.6 + * @since Beta v0.10.0 */ -import TGHttp from "@utils/TGHttp.js"; +import TGHttps from "@utils/TGHttps.js"; const YATTA_API = "https://gi.yatta.moe/api/v2/"; /** * 请求角色数据 - * @since Beta v0.9.6 + * @since Beta v0.10.0 * @returns 角色数据 */ async function fetchAvatar(): Promise { - return await TGHttp(`${YATTA_API}chs/avatar`, { - method: "GET", - }); + const resp = await TGHttps.get(`${YATTA_API}chs/avatar`); + return resp.data; } /** @@ -23,9 +22,8 @@ async function fetchAvatar(): Promise { * @returns 武器数据 */ async function fetchWeapon(): Promise { - return await TGHttp(`${YATTA_API}chs/weapon`, { - method: "GET", - }); + const resp = await TGHttps.get(`${YATTA_API}chs/weapon`); + return resp.data; } /**