Merge branch 'test'

src/components/header.vue

@@ -17,7 +17,7 @@
 <script lang="ts" setup>
 import Api from '../static/http/api'
 import { postRequest } from '../static/http'
-import { getOauthUrl, createWindow, callBackUrl, getCookie, removeCookie } from '../static/utils'
+import { getOauthUrl, createWindow, callBackUrl } from '../static/utils'
 import { getStorage, removeStorage, setStorage, storageKey } from '../static/utils/storage'
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
@@ -89,8 +89,6 @@ 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);
@@ -107,7 +105,7 @@ const twitterAuth = () => {
 }
 
 const twitterLogin = (data: { authToken: string, consumerKey: string }) => {
-    let verifier = JSON.parse(getCookie(storageKey.verifier));
+    let verifier = getStorage(storageKey.verifier)
     if (verifier) {
         postRequest(Api.twitterLogin,  {
             params: {
@@ -119,7 +117,7 @@ const twitterLogin = (data: { authToken: string, consumerKey: string }) => {
             let { code, data, msg } = res;
             if ( code === 0 ) {
                 setStorage(storageKey.userInfo, data);
-                removeCookie(storageKey.verifier);
+                removeStorage(storageKey.verifier);
                 location.href = `/nft/list`
             } else {
                 ElMessage({

src/pages/close.vue

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