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

src/main.js

@@ -13,6 +13,7 @@ import router from './router'
 import App from './App'
 import Vuex from 'vuex'
 import vuexI18n from 'vuex-i18n'
+import PDFJS from 'pdfjs-dist'
 
 import flexible from './common/ydui.flexible'
 import components from './components/component'
@@ -98,6 +99,7 @@ let hlsHttp = {
   get: get,
   post: post,
 }
+Vue.prototype.PDFJS = window.PDFJS = hlsHttp
 Vue.prototype.hlsHttp = window.hlsHttp = hlsHttp
 
 Vue.prototype.PDFJS = window.PDFJS = PDFJS