Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-xcmg-vue-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xugong
hls-xcmg-vue-app
Commits
1a5f370f
Commit
1a5f370f
authored
Jun 25, 2021
by
nature
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'ios' of /Volumes/work/APP/xugon/hls-xcmg-vue-app with conflicts.
parent
62d2d548
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
main.js
src/main.js
+2
-0
No files found.
src/main.js
View file @
1a5f370f
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment