修复在线列表的请求取消问题

src/renderer/utils/music/kg/leaderboard.js

@@ -1,4 +1,4 @@
-import { httpGet, cancelHttp, httpFetch } from '../../request'
+import { httpFetch } from '../../request'
 import { decodeName, formatPlayTime, sizeFormate } from '../../index'
 
 let boardList = [{ id: 'kg__8888', name: '酷狗TOP500', bangid: '8888' }, { id: 'kg__6666', name: '酷狗飙升榜', bangid: '6666' }, { id: 'kg__37361', name: '酷狗雷达榜', bangid: '37361' }, { id: 'kg__23784', name: '网络红歌榜', bangid: '23784' }, { id: 'kg__24971', name: 'DJ热歌榜', bangid: '24971' }, { id: 'kg__35811', name: '会员专享热歌榜', bangid: '35811' }, { id: 'kg__31308', name: '华语新歌榜', bangid: '31308' }, { id: 'kg__31310', name: '欧美新歌榜', bangid: '31310' }, { id: 'kg__31311', name: '韩国新歌榜', bangid: '31311' }, { id: 'kg__31312', name: '日本新歌榜', bangid: '31312' }, { id: 'kg__31313', name: '粤语新歌榜', bangid: '31313' }, { id: 'kg__33162', name: 'ACG新歌榜', bangid: '33162' }, { id: 'kg__21101', name: '酷狗分享榜', bangid: '21101' }, { id: 'kg__30972', name: '腾讯音乐人原创榜', bangid: '30972' }, { id: 'kg__22603', name: '5sing音乐榜', bangid: '22603' }, { id: 'kg__33160', name: '电音热歌榜', bangid: '33160' }, { id: 'kg__21335', name: '繁星音乐榜', bangid: '21335' }, { id: 'kg__33161', name: '古风新歌榜', bangid: '33161' }, { id: 'kg__33163', name: '影视金曲榜', bangid: '33163' }, { id: 'kg__33166', name: '欧美金曲榜', bangid: '33166' }, { id: 'kg__33165', name: '粤语金曲榜', bangid: '33165' }, { id: 'kg__36107', name: '小语种热歌榜', bangid: '36107' }, { id: 'kg__4681', name: '美国BillBoard榜', bangid: '4681' }, { id: 'kg__4680', name: '英国单曲榜', bangid: '4680' }, { id: 'kg__4673', name: '日本公信榜', bangid: '4673' }, { id: 'kg__38623', name: '韩国Melon音乐榜', bangid: '38623' }, { id: 'kg__42807', name: 'joox本地热歌榜', bangid: '42807' }, { id: 'kg__42808', name: '台湾KKBOX风云榜', bangid: '42808' }]
@@ -71,30 +71,16 @@ export default {
     listData: /global\.features = (\[.+\]);/,
   },
   _requestBoardsObj: null,
-  _requestObj: null,
-  _cancelPromiseCancelFn: null,
+  _requestDataObj: null,
   getBoardsData() {
     if (this._requestBoardsObj) this._requestBoardsObj.cancelHttp()
     this._requestBoardsObj = httpFetch('http://mobilecdnbj.kugou.com/api/v3/rank/list?version=9108&plat=0&showtype=2&parentid=0&apiver=6&area_code=1&withsong=1')
     return this._requestBoardsObj.promise
   },
   getData(url) {
-    if (this._requestObj != null) {
-      cancelHttp(this._requestObj)
-      this._cancelPromiseCancelFn(new Error('取消http请求'))
-    }
-    return new Promise((resolve, reject) => {
-      this._cancelPromiseCancelFn = reject
-      this._requestObj = httpGet(url, (err, resp, body) => {
-        this._requestObj = null
-        this._cancelPromiseCancelFn = null
-        if (err) {
-          console.log(err)
-          reject(err)
-        }
-        resolve(body)
-      })
-    })
+    if (this._requestDataObj) this._requestDataObj.cancelHttp()
+    this._requestDataObj = httpFetch(url)
+    return this._requestDataObj.promise
   },
   filterData(rawList) {
     // console.log(rawList)
@@ -189,7 +175,7 @@ export default {
     }
   },
   getList(bangid, page) {
-    return this.getData(this.getUrl(page, bangid)).then(html => {
+    return this.getData(this.getUrl(page, bangid)).then(({ body: html }) => {
       let total = html.match(this.regExps.total)
       if (total) total = parseInt(RegExp.$1)
       page = html.match(this.regExps.page)