refactor: update button click event handling in index.vue and vote.vue (

#102)

pages/index.vue

@@ -51,15 +51,15 @@
       v-if="status === 'authenticated'"
       type="success"
       class="z-10 mt-2 mb-8"
-      @click="useRouter().push('/vote')"
+      @click="router.push('/vote')"
     >
       <span class="font-bold">前 往 投 票 頁 面</span>
     </ElButton>
     <ElButton
       v-else
       type="primary"
       class="z-10 mt-2 mb-8"
-      @click="useRouter().push('/login')"
+      @click="router.push('/login')"
     >
       <span class="font-bold">前 往 登 入 頁 面</span>
     </ElButton>
@@ -72,6 +72,7 @@ definePageMeta({
   title: "首頁",
 });
 
+const router = useRouter();
 const { status } = useAuthState();
 
 const style = (start: Date, end: Date) => {

pages/vote.vue

@@ -638,14 +638,15 @@ const seeResult = async (index: number) => {
         await useRouter().push("/result/" + index);
       })
       .catch(async (action: Action) => {
+        resultLoading.value[index] = false;
+
         if (action === "cancel") {
           await navigator.clipboard.writeText(data.value!.tokens[index]);
           ElMessage({
             type: "success",
             message: "已複製",
           });
 
-          resultLoading.value[index] = false;
           await useRouter().push("/result/" + index);
         }
       });
@@ -658,10 +659,14 @@ const seeResult = async (index: number) => {
       customStyle: {
         fontFamily: '"Noto Sans TC", sans-serif',
       },
-    }).then(async () => {
-      resultLoading.value[index] = false;
-      await useRouter().push("/result/" + index);
-    });
+    })
+      .then(async () => {
+        resultLoading.value[index] = false;
+        await useRouter().push("/result/" + index);
+      })
+      .catch(() => {
+        resultLoading.value[index] = false;
+      });
   }
 };