Commit 1a5f370f authored by nature's avatar nature

Merge branch 'ios' of /Volumes/work/APP/xugon/hls-xcmg-vue-app with conflicts.

parent 62d2d548
...@@ -13,6 +13,7 @@ import router from './router' ...@@ -13,6 +13,7 @@ import router from './router'
import App from './App' import App from './App'
import Vuex from 'vuex' import Vuex from 'vuex'
import vuexI18n from 'vuex-i18n' import vuexI18n from 'vuex-i18n'
import PDFJS from 'pdfjs-dist'
import flexible from './common/ydui.flexible' import flexible from './common/ydui.flexible'
import components from './components/component' import components from './components/component'
...@@ -98,6 +99,7 @@ let hlsHttp = { ...@@ -98,6 +99,7 @@ let hlsHttp = {
get: get, get: get,
post: post, post: post,
} }
Vue.prototype.PDFJS = window.PDFJS = hlsHttp
Vue.prototype.hlsHttp = window.hlsHttp = hlsHttp Vue.prototype.hlsHttp = window.hlsHttp = hlsHttp
Vue.prototype.PDFJS = window.PDFJS = PDFJS Vue.prototype.PDFJS = window.PDFJS = PDFJS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment