更新到0.1.4版本

src/renderer/utils/music/kw/lyric.js

@@ -1,8 +1,6 @@
-import { httpGet, cancelHttp } from '../../request'
+import { httpFatch } from '../../request'
 
 export default {
-  _musicLrcRequestObj: null,
-  _musicLrcPromiseCancelFn: null,
   formatTime(time) {
     let m = parseInt(time / 60)
     let s = (time % 60).toFixed(2)
@@ -12,23 +10,10 @@ export default {
     return `[ti:${songinfo.songName}]\n[ar:${songinfo.artist}]\n[al:${songinfo.album}]\n[by:]\n[offset:0]\n${lrclist ? lrclist.map(l => `[${this.formatTime(l.time)}]${l.lineLyric}\n`).join('') : '暂无歌词'}`
   },
   getLyric(songId) {
-    if (this._musicLrcRequestObj != null) {
-      cancelHttp(this._musicLrcRequestObj)
-      this._musicLrcPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._musicLrcPromiseCancelFn = reject
-      // this._musicLrcRequestObj = httpGet(`https://v1.itooi.cn/kuwo/lrc?id=${songId}`, (err, resp, body) => {
-      this._musicLrcRequestObj = httpGet(`http://m.kuwo.cn/newh5/singles/songinfoandlrc?musicId=${songId}`, (err, resp, body) => {
-        this._musicLrcRequestObj = null
-        this._musicLrcPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        // resolve(body)
-        resolve(this.transformLrc(body.data))
-      })
+    const requestObj = httpFatch(`http://m.kuwo.cn/newh5/singles/songinfoandlrc?musicId=${songId}`)
+    requestObj.promise = requestObj.promise.then(({ body }) => {
+      return this.transformLrc(body.data)
     })
+    return requestObj
   },
 }