diff --git a/src/pages.json b/src/pages.json index 82d910a..da31f31 100644 --- a/src/pages.json +++ b/src/pages.json @@ -55,7 +55,10 @@ "path": "pages/ranking" }, { - "path": "pages/rank-list" + "path": "pages/rank-list", + "style": { + "enablePullDownRefresh": false + } }, { "path": "pages/team-match" diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue index 5bc4f69..ef0fff0 100644 --- a/src/pages/battle-room.vue +++ b/src/pages/battle-room.vue @@ -326,10 +326,6 @@ async function onReceiveMessage(messages = []) { scores.value = []; totalRounds.value = msg.groupUserStatus.config.maxRounds; step.value = 3; - if (battleType.value === 2) { - tips.value = "请在90秒内射完12支箭"; - seq.value += 1; - } if (!roundResults.value.length) roundResults.value.push({ redArrows: [], @@ -446,6 +442,7 @@ async function onReceiveMessage(messages = []) { title: "游戏结束", icon: "none", }); + uni.navigateBack(); } else { uni.redirectTo({ url: `/pages/battle-result?battleId=${msg.id}`, diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue index c60e014..e7ba36d 100644 --- a/src/pages/melee-match.vue +++ b/src/pages/melee-match.vue @@ -156,11 +156,12 @@ async function onReceiveMessage(messages = []) { } if (msg.constructor === MESSAGETYPES.MatchOver) { uni.setStorageSync("last-battle", msg.endStatus); - if (msg.endStatus.nosaved) { + if (msg.endStatus.noSaved) { uni.showToast({ title: "游戏结束", icon: "none", }); + uni.navigateBack(); } else { uni.redirectTo({ url: `/pages/battle-result?battleId=${msg.id}`, diff --git a/src/pages/rank-list.vue b/src/pages/rank-list.vue index bc83470..a3813b5 100644 --- a/src/pages/rank-list.vue +++ b/src/pages/rank-list.vue @@ -161,7 +161,13 @@ const subTitles = ["排位赛积分", "本周MVP次数", "本周十环次数"]; {{ user.nickName }} {{ user.lvlName }},{{ myData.TotalGames }}场 - {{ myData.TenRings }} + {{ myData.totalScore }}