diff --git a/src/apis.js b/src/apis.js index b5f48b8..16c36f3 100644 --- a/src/apis.js +++ b/src/apis.js @@ -354,39 +354,12 @@ export const simulShootAPI = (device_id, x, y) => { }; export const getBattleListAPI = async (page, battleType) => { - const data = []; const result = await request("POST", "/user/battle/details/list", { page, + pageSize: 10, battleType, - modeType: 0, }); - (result.Battles || []).forEach((item) => { - let name = ""; - if (item.battleStats.mode === 1) { - name = `${item.playerStats.length / 2}V${item.playerStats.length / 2}`; - } - if (item.battleStats.mode === 2) { - name = `${item.playerStats.length}人大乱斗`; - } - data.push({ - name, - battleId: item.battleStats.battleId, - mode: item.battleStats.mode, - createdAt: item.battleStats.createdAt, - gameEndAt: item.battleStats.gameEndAt, - winner: item.battleStats.winner, - players: item.playerStats - .map((p) => p.playerBattleStats) - .sort((a, b) => b.totalScore - a.totalScore), - redPlayers: item.playerStats - .filter((p) => p.playerBattleStats.team === 0) - .map((p) => p.playerBattleStats), - bluePlayers: item.playerStats - .filter((p) => p.playerBattleStats.team === 1) - .map((p) => p.playerBattleStats), - }); - }); - return data; + return result.list; }; export const getRankListAPI = () => { diff --git a/src/pages/mine-bow-data.vue b/src/pages/mine-bow-data.vue index fd2e4c6..bcb7a45 100644 --- a/src/pages/mine-bow-data.vue +++ b/src/pages/mine-bow-data.vue @@ -16,8 +16,8 @@ const total = ref(0); onLoad(async (options) => { if (options.id) { const result = await getPractiseAPI(options.id); - arrows.value = result.arrows; - total.value = result.completed_arrows; + arrows.value = result.details; + total.value = result.details.length; } }); diff --git a/src/pages/my-growth.vue b/src/pages/my-growth.vue index 54f9569..685b5e6 100644 --- a/src/pages/my-growth.vue +++ b/src/pages/my-growth.vue @@ -17,7 +17,7 @@ const practiseList = ref([]); const toMatchDetail = (id) => { uni.navigateTo({ - url: `/pages/match-detail?id=${id}`, + url: `/pages/match-detail?battleId=${id}`, }); }; const getPractiseDetail = async (id) => { @@ -52,6 +52,10 @@ const onPractiseLoading = async (page) => { } return result.length; }; +const getName = (battle) => { + if (battle.mode <= 3) return `${battle.mode}V${battle.mode}`; + return battle.mode + "人大乱斗"; +};