Browse Source

merge branch 'test'

nieyuge 2 years ago
parent
commit
ccb340a8af
2 changed files with 24 additions and 7 deletions
  1. 2 0
      src/components/header.vue
  2. 22 7
      src/pages/close.vue

+ 2 - 0
src/components/header.vue

@@ -89,6 +89,8 @@ const twitterAuth = () => {
         if ( code === 0 )  {
             let url = getOauthUrl(data.authToken);
             let win = createWindow(url);
+            // timer
+            clearInterval(timer.value);
             timer.value = setInterval(() => {
                 if (win && win.closed) {
                     clearInterval(timer.value);

+ 22 - 7
src/pages/close.vue

@@ -5,14 +5,14 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted } from 'vue';
-import { setStorage, storageKey } from '../static/utils/storage'
+import { onMounted, nextTick } from 'vue';
+import { setStorage, getStorage, storageKey } from '../static/utils/storage'
 
 const close = () => {
     window.close()
 }
 
-onMounted(() => {
+const setParams = () => {
     let url = new URL(window.location.href);
     let search = url.search;
     let urlParams  = new URLSearchParams(search);
@@ -20,12 +20,27 @@ onMounted(() => {
     // set
     if (verifier) {
         setStorage(storageKey.verifier, verifier)
-        // @ts-ignore
-        let time = process.env.NODE_ENV === 'production' ? 500 : 500;
+        let val = getStorage(storageKey.verifier)
+        if (val) {
+            setTimeout(() => {
+                close()
+            }, 500)
+        } else {
+            setTimeout(() => {
+                setParams()
+            }, 500)
+        }
+    } else {
         setTimeout(() => {
-            close()
-        }, time)
+            setParams()
+        }, 500)
     }
+}
+
+onMounted(() => {
+    nextTick(() => {
+        setParams()
+    })
 })
 </script>