zhangwei 2 éve
szülő
commit
a22eda8d2f

+ 7 - 5
src/logic/background/twitter.js

@@ -9,15 +9,15 @@ let consumerKey = ''
 let tab_flag = true
 
 const isHasTabByUrl = (url, callback) => {
-    let has = false
+    let item
     chrome.tabs.query({}, (tab) => {
         for (let i in tab) {
             if (tab[i].url.indexOf(url) >= 0) {
-                has = true
+                item = tab[i]
                 break
             }
         }
-        callback(has)
+        callback(item)
     })
 }
 
@@ -35,11 +35,13 @@ export function twitterPinLoginToken() {
                 if (res.code == 0) {
                     authToken = res.data.authToken
                     consumerKey = res.data.consumerKey
-                    isHasTabByUrl('https://api.twitter.com/oauth/authorize?oauth_token', (has) => {
-                        if (!has) {
+                    isHasTabByUrl('https://api.twitter.com/oauth/authorize?oauth_token', (tab) => {
+                        if (!tab) {
                             chrome.tabs.create({
                                 url: `https://api.twitter.com/oauth/authorize?oauth_token=${res.data.authToken}`
                             })
+                        }else{
+                            chrome.tabs.highlight({ windowId: tab.windowId, tabs: tab.index })
                         }
                     })
                 }

+ 5 - 5
src/view/iframe/red-packet/red-packet.vue

@@ -539,8 +539,9 @@ function getValidity() {
   }, 1000)
 }
 
-const openFollowTabs = () => {
-  let array_finish = state.detail.taskCondition[0].relatedUsers.filter((item) => { return item.finished == false })
+const openFollowTabs = (arr_name) => {
+  let array_finish  = arr_name.filter((item) => { return !item.finished })
+  // let array_finish = state.detail.taskCondition[0].relatedUsers.filter((item) => { return item.finished == false })
   let url
   if (array_finish.length > 0) {
     state.done.follow = false
@@ -561,7 +562,6 @@ async function clickFollowAll(item, is_all) {
   if (!_userInfo) {
     return
   }
-
   let arr_name = []
   for (let i in item) {
     if (!item[i].finished) {
@@ -569,7 +569,7 @@ async function clickFollowAll(item, is_all) {
     }
   }
   if (state.detail.finishTaskType && state.detail.finishTaskType == 2) {
-    openFollowTabs()
+    openFollowTabs(arr_name)
     return
   }
   state.loading_show = true
@@ -587,7 +587,7 @@ async function clickFollowAll(item, is_all) {
           }
         });
       })
-      openFollowTabs()
+      openFollowTabs(arr_name)
     }
   })