Merge branch 'master' of https://hel.hand-china.com/easyUI/hls-easy-ui

packages/common/scripts/hlsHttp.js

-
 // 引入axios
 import axios from 'axios'
 import hlsPopup from './hlsPopup'
@@ -7,6 +6,9 @@ let cancel = {}
 const CancelToken = axios.CancelToken
 // 请求拦截器
 axios.interceptors.request.use(config => {
+  config.cancelToken = new CancelToken(c => {
+    cancel = c
+  })
   // 发起请求时，取消掉当前正在进行的相同请求
   if (promiseArr[config.url]) {
     promiseArr[config.url]('操作取消')
@@ -14,9 +16,6 @@ axios.interceptors.request.use(config => {
   } else {
     promiseArr[config.url] = cancel
   }
-  config.cancelToken = new CancelToken(c => {
-    cancel = c
-  })
   return config
 }, error => {
   return Promise.reject(error)