修复Mac下的虾米验证、托盘问题

This commit is contained in:
lyswhut
2020-05-01 18:22:19 +08:00
parent edff998be9
commit 36d140d4bd
7 changed files with 128 additions and 39 deletions
+1 -2
View File
@@ -90,7 +90,6 @@ export default {
if (limit != null) this.limit = limit
// http://newlyric.kuwo.cn/newlyric.lrc?62355680
return this.musicSearch(str, page).then(result => {
// console.log(result)
if (!result) return this.search(str, page, { limit }, retryNum)
if (result.code !== 'SUCCESS') return this.search(str, page, { limit }, retryNum)
// const songResultData = result.data || { songs: [], total: 0 }
@@ -109,6 +108,6 @@ export default {
total: this.total,
source: 'xm',
})
}).catch(() => this.search(str, page, { limit }, retryNum))
}).catch(err => err.message.includes('canceled verify') ? Promise.reject(err) : this.search(str, page, { limit }, retryNum))
},
}
+6 -2
View File
@@ -98,9 +98,12 @@ export const xmRequest = (path, params = '') => {
return wait(300).then(() => {
return rendererInvoke('xm_verify_open', 'https:' + resp.body.url).then(x5sec => {
handleSaveToken({ cookies: { x5sec } })
// console.log(x5sec)
console.log(x5sec)
window.globalObj.xm.isShowVerify = false
return Promise.reject(new Error('获取失败'))
return Promise.reject(new Error('获取成功'))
}).catch(err => {
window.globalObj.xm.isShowVerify = false
return Promise.reject(err)
})
})
}
@@ -114,6 +117,7 @@ export const xmRequest = (path, params = '') => {
export const closeVerifyModal = async() => {
if (!window.globalObj.xm.isShowVerify) return
console.log('object')
await rendererInvoke('xm_verify_close')
window.globalObj.xm.isShowVerify = false
}