Skip to content

Commit f496be2

Browse files
lucienstarlucienstar
committed
feat(linCmsUi): 解决冲突
解决冲突
2 parents dee119c + 1e3b4f4 commit f496be2

21 files changed

Lines changed: 1529 additions & 77 deletions

File tree

‎.env.development‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ENV = 'development'
22

3-
VUE_APP_BASE_URL = 'http://localhost:5000/'
3+
VUE_APP_BASE_URL = 'http://dev.koa.7yue.pro/'

‎.env.production‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22

3-
VUE_APP_BASE_URL = 'http://localhost:5000/'
3+
VUE_APP_BASE_URL = 'http://dev.lin.colorful3.com/'

‎package-lock.json‎

Lines changed: 30 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"js-cookie": "^2.2.0",
2323
"lodash": "^4.17.11",
2424
"moment": "^2.24.0",
25+
"photoswipe": "^4.1.2",
2526
"screenfull": "^4.2.0",
2627
"vue": "^2.6.8",
2728
"vue-awesome-swiper": "^3.1.3",

0 commit comments

Comments
 (0)