fix 通过url储存id

src/pages/main.vue

@@ -231,7 +231,7 @@
                     </uni-pagination>
                 </transition>
                 <transition name = 'switch'>
-                    <PageTournament v-show = 'page.tournament'/>
+                    <PageTournament v-if = 'page.tournament'/>
                 </transition>
             </view>
         </transition>
@@ -247,10 +247,8 @@
     import Mycard from '../script/mycard.ts';
     import emitter from '../script/emitter.ts'
     import {
-        selectTournament,
         updateTournament ,
         tournamentInfo,
-        tournamentExit,
         tournamentReload
     } from '../script/const.ts'
     import PageTournament from './tournament.vue';
@@ -276,8 +274,8 @@
                 page.menu = false;
                 await (new Promise(resolve => setTimeout(resolve, 500)));
                 page.tournament = true;
-                emitter.emit(selectTournament, search.result.tournaments[v]);
-                tournament.init(search.result.tournaments[v]);
+                const url = window.location.href.split('/?');
+                window.location.replace(`${url[0]}/tournament/${search.result.tournaments[v].id}/?${url[1] ?? ''}`)
             },
             menu : async(): Promise<void> => {
                 page.tournament = false;
@@ -530,20 +528,25 @@
         }
     });
 
-    onBeforeMount(() => {
+    onBeforeMount(() : void => {
         Uniapp.chkScreen(size.get);
-        search.on();
         document.addEventListener("click", page.show.clear);
         emitter.on(tournamentInfo, page.show.drawer);
-        emitter.on(tournamentExit, page.show.menu);
         // @ts-ignore
         emitter.on(tournamentReload, tournament.init);
+
+        const url = window.location.href.match(/tournament\/(\d+)[^\/]*\/\?/);
+        if (url && !isNaN(parseInt(url[1]))) {
+            page.menu = false;
+            page.tournament = true;
+        } else {
+            search.on();
+        }
     });
 
     onUnmounted(() => {
         document.removeEventListener("click", page.show.clear);
         emitter.off(tournamentInfo, page.show.drawer);
-        emitter.off(tournamentExit, page.show.menu);
         // @ts-ignore
         emitter.off(tournamentReload, tournament.init);
     });

src/pages/tournament.vue

 <template>
     <view class = 'PageTournament'>
+        <transition name = 'switch'>
             <uni-card
                 id = 'PageTournament'
                 :style = "page.height > 0 ? { height: `${page.height}px` } : { height: '100%' }"
@@ -192,6 +193,7 @@
                     </uni-card>
                 </transition>
             </uni-card>
+        </transition>
     </view>
 </template>
 <script setup lang = 'ts'>
@@ -202,10 +204,8 @@
     import Participant from '../script/participant.ts';
     import Match from '../script/match.ts';
     import {
-        selectTournament,
         updateTournament ,
         tournamentInfo,
-        tournamentExit,
         tournamentReload
     } from '../script/const.ts'
     import Mycard from '../script/mycard.ts';
@@ -328,26 +328,28 @@
     let page = reactive({
         height : 0,
         loading : false,
-        clear : async() : Promise<void> => {
-            emitter.emit(tournamentExit);
-            await (new Promise(resolve => setTimeout(resolve, 500)));
-            participant.array = [];
-            participant.total = 0;
-            participant.page = 1;
-            match.array = [];
-            match.total = 0;
-            match.page = 1;
+        clear : async () : Promise<void>=> {
+            const url = window.location.href.match(/(\/tournament\/[^\/]+)(?=\/\?)/);
+            if (url) {
                 tournament.this = undefined;
-            participant.name = '';
+                await (new Promise(resolve => setTimeout(resolve, 450)));
+                window.location.replace(window.location.href.replace(url[1], ''));
+            }
         },
-        get : async (t : Tournament) : Promise<void> => {
+        get : async (id : number) : Promise<void> => {
+            const t = await Tabulator.Tournament.Find(Mycard.token, id);
+            if (t) {
                 tournament.this = t;
+                emitter.emit(tournamentReload, t)
                 const participants : AllParticipant = await Tabulator.Participant.FindALL(Mycard.token, {tournamentId : t.id});
                 participant.array = participants.participants;
                 participant.total = participants.total;
                 const matchs = await Tabulator.Match.FindALL(Mycard.token, {tournamentId : t.id, statusIn : 'Running,Finished'});
                 match.array = matchs.matchs;
                 match.total = matchs.total;
+            } else {
+                page.clear();
+            }
         },
         reload : async () : Promise<void> => {
             const query = uni.createSelectorQuery().in(this);
@@ -375,17 +377,15 @@
     });
 
     onBeforeMount(() => {
-        // @ts-ignore
-        emitter.on(selectTournament, page.get);
+        const url = window.location.href.match(/tournament\/(\d+)[^\/]*\/\?/);
+        url && !isNaN(parseInt(url[1])) ? page.get(parseInt(url[1])) : page.clear();
         // @ts-ignore
         emitter.on(updateTournament, participant.update);
     });
 
     onUnmounted(() => {
         // @ts-ignore
-        emitter.off(selectTournament, page.get);
-        // @ts-ignore
-        emitter.off(selectTournament, participant.update);
+        emitter.off(updateTournament, participant.update);
     });
 </script>
 

src/script/const.ts

@@ -6,9 +6,7 @@ const tournamentExit = 'tournamentExit';
 const tournamentReload = 'tournamentReload'
 
 export {
-    selectTournament,
     updateTournament ,
     tournamentInfo,
-    tournamentExit,
     tournamentReload
 };
\ No newline at end of file