DavidZeng
/
share_webapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

去掉冲突

This commit is contained in:
zengwei 2021-04-17 10:48:42 +08:00
parent ca76069d42
commit ce46044fbc
2 changed files with 320 additions and 724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/dev.env.js
View File

@ -4,9 +4,5 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
<<<<<<< HEAD
BASE_API: '"http://117.50.100.12:8001"', BASE_API: '"http://117.50.100.12:8001"',
=======
BASE_API: '"http://117.50.100.12:8001/"',
>>>>>>> fc06b2b (bug)
}) })

1040
src/components/achiveHeader.vue
View File

File diff suppressed because it is too large Load Diff