lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
aoli.qu 2021-08-11 16:10:34 +08:00
parent 333d2c25ba
commit 5a6b5fad69
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -11,7 +11,6 @@
"lint:nofix": "vue-cli-service lint --no-fix" "lint:nofix": "vue-cli-service lint --no-fix"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"@ant-design-vue/pro-layout": "^0.3.4", "@ant-design-vue/pro-layout": "^0.3.4",
"@antv/data-set": "^0.10.2", "@antv/data-set": "^0.10.2",
"ant-design-vue": "^1.6.2", "ant-design-vue": "^1.6.2",
@ -36,15 +35,6 @@
"vue-svg-component-runtime": "^1.0.1", "vue-svg-component-runtime": "^1.0.1",
"vuex": "^3.1.1", "vuex": "^3.1.1",
"wangeditor": "^3.1.1" "wangeditor": "^3.1.1"
=======
"axios": "^0.21.1",
"core-js": "^3.6.5",
"element-ui": "^2.15.5",
"vue": "^2.6.11",
"vue-router": "^3.2.0",
"vue-wechat-title": "^2.0.7",
"vuex": "^3.4.0"
>>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348
}, },
"devDependencies": { "devDependencies": {
"@ant-design/colors": "^3.2.1", "@ant-design/colors": "^3.2.1",

13
vue.config.js
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
const path = require('path') const path = require('path')
const webpack = require('webpack') const webpack = require('webpack')
const GitRevisionPlugin = require('git-revision-webpack-plugin') const GitRevisionPlugin = require('git-revision-webpack-plugin')
@ -121,15 +120,3 @@ if (process.env.VUE_APP_PREVIEW === 'true') {
} }
module.exports = vueConfig module.exports = vueConfig
=======
module.exports = {
devServer: {
disableHostCheck: false,
host: "localhost",
port: "8999",
https: false,
hotOnly: false,
proxy: null
}
}
>>>>>>> 6dbed30ef7551a27673167f7e2e193c5e648b348