Merge branch 'liuin' into uat

src/scripts/hlsHttp.js

@@ -105,7 +105,7 @@ axios.interceptors.response.use(response => {
   return Promise.resolve(err)
 })
 axios.defaults.baseURL = ''
-axios.defaults.timeout = 100000
+axios.defaults.timeout = 1000000
 // get请求
 export function get (url) {
   let param = {}