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

packages/common/scripts/hlsPopup.js

@@ -29,21 +29,9 @@ export function showLoading (content = '', timeout = 10000) {
   Vue.$vux.loading.show({
     text: content || 'Loading',
   })
-  this.isLoading = true
   // 10s后自动解屏用于防止屏幕锁死
   setTimeout(() => {
-    if (vm.isLoading) {
-      Vue.$vux.loading.hide()
-      vm.isLoading = false
-      // 弹出操作失败
-      /* Vue.$vux.toast.show({
-          text: '操作失败',
-          type: 'warn',
-          time: 2000,
-          isShowMask: true,
-          position: 'middle',
-        }) */
-    }
+     Vue.$vux.loading.hide()
   }, timeout)
 }