diff --git a/src/components/t-calendar.vue b/src/components/t-calendar.vue new file mode 100644 index 00000000..3c8c6f4d --- /dev/null +++ b/src/components/t-calendar.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/components/t-position.vue b/src/components/t-position.vue index 8a4cc3a0..acd1c6f8 100644 --- a/src/components/t-position.vue +++ b/src/components/t-position.vue @@ -49,8 +49,8 @@ diff --git a/src/plugins/Mys/interface/calendar.ts b/src/plugins/Mys/interface/calendar.ts index 6c77c592..9ad838b3 100644 --- a/src/plugins/Mys/interface/calendar.ts +++ b/src/plugins/Mys/interface/calendar.ts @@ -87,19 +87,22 @@ export interface CalendarContent { * @since Alpha v0.1.1 * @interface CalendarCard * @property {number} id 角色/武器 ID + * @property {number} type 角色/武器,角色为 2,武器为 1 * @property {string} title 角色/武器 名称 * @property {string} cover 角色/武器 封面 - * @property {string} url 跳转链接 + * @property {string} url 跳转链接,一般为 content_id * @property {string[]} drop_day 掉落日 - * @property {Map} sort 排序 + * @property {Map} sort_day 排序 * @property {CalendarContent[]} contentInfos 材料内容 * @return {CalendarCard} */ export interface CalendarCard { id: number; + type: number; title: string; cover: string; url: string; drop_day: string[]; - sort: Map; + sort_day: Map; + contentInfos: CalendarContent[]; } diff --git a/src/plugins/Mys/utils/calendar.ts b/src/plugins/Mys/utils/calendar.ts index 83f89496..d7bb09ac 100644 --- a/src/plugins/Mys/utils/calendar.ts +++ b/src/plugins/Mys/utils/calendar.ts @@ -18,11 +18,13 @@ export function getCalendarCard(calendarData: CalendarData[]): CalendarCard[] { calendarData.forEach((data: CalendarData) => { return calendarCard.push({ id: Number(data.id), + type: Number(data.break_type), title: data.title, cover: data.img_url, url: data.jump_type === "1" ? data.jump_url : data.content_id, drop_day: data.drop_day, - sort: JSON.parse(data.sort), + sort_day: JSON.parse(data.sort), + contentInfos: data.contentInfos, }); }); return calendarCard;