Browse Source

Merge branch 'dev_1.1.7_by_nft' into dev_1.1.7_test

nieyuge 2 years ago
parent
commit
2e3308fd01
1 changed files with 13 additions and 1 deletions
  1. 13 1
      components/buttonLogin.vue

+ 13 - 1
components/buttonLogin.vue

@@ -33,13 +33,25 @@ export default {
             }
             }
         },
         },
         async twitterAuth() {
         async twitterAuth() {
+            let win;
+            let isiOS = !!window.navigator.userAgent.match(/\(i\[^;]+;( U;)? CPU.+Mac OS X/);
+            if (isiOS) {
+                win = window.open();
+                win.opener = null;
+            }
+            // post
             postRequest(`/denet/user/twitterRequestToken`, {
             postRequest(`/denet/user/twitterRequestToken`, {
 				params: {
 				params: {
 					oauthCallback: `${jumpUrl}authlogin`,
 					oauthCallback: `${jumpUrl}authlogin`,
 				},
 				},
 			}).then(({ code, data }) => {
 			}).then(({ code, data }) => {
                 if (code == 0) {
                 if (code == 0) {
-                    let win = window.open(getOauthUrl(data.authToken));
+                    if (isiOS) {
+                        win.location.href = getOauthUrl(data.authToken);
+                    } else {
+                        win = window.open(getOauthUrl(data.authToken));
+                    }
+                    
                     // timer
                     // timer
                     this.timer = setInterval(() => {
                     this.timer = setInterval(() => {
 						if (win && win.closed) {
 						if (win && win.closed) {