diff --git a/src/pages/index.vue b/src/pages/index.vue index 89810a8..dc800fa 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -18,11 +18,21 @@ const isIos = ref(true); const toPage = (path) => { if (!user.value.id) { showModal.value = true; - } else { - uni.navigateTo({ - url: path, - }); + return; } + if ( + "/pages/first-try,/pages/practise,/pages/friend-battle".indexOf(path) !== -1 + ) { + if (!device.value.deviceId) { + return uni.showToast({ + title: "请先绑定设备", + icon: "none", + }); + } + } + uni.navigateTo({ + url: path, + }); }; onMounted(async () => { diff --git a/src/pages/ranking.vue b/src/pages/ranking.vue index 2b53cf5..2e59d45 100644 --- a/src/pages/ranking.vue +++ b/src/pages/ranking.vue @@ -5,7 +5,7 @@ import { ref } from "vue"; import useStore from "@/store"; import { storeToRefs } from "pinia"; const store = useStore(); -const { user } = storeToRefs(store); +const { user, device } = storeToRefs(store); const selectedIndex = ref(0); @@ -14,12 +14,24 @@ const handleSelect = (index) => { }; const toTeamMatchPage = (gameType, teamSize) => { + if (!device.value.deviceId) { + return uni.showToast({ + title: "请先绑定设备", + icon: "none", + }); + } uni.navigateTo({ url: `/pages/team-match?gameType=${gameType}&teamSize=${teamSize}`, }); }; const toMeleeMatchPage = (gameType, teamSize) => { + if (!device.value.deviceId) { + return uni.showToast({ + title: "请先绑定设备", + icon: "none", + }); + } uni.navigateTo({ url: `/pages/melee-match?gameType=${gameType}&teamSize=${teamSize}`, });