Merge branch 'master' into router1
* master: ka-manager-ui .babelrc Conflicts: build/webpack.base.conf.js dist/index.html dist/static/js/0.cbaf0f4.js dist/static/js/5.5b14b07.js dist/static/js/manifest.6034e5c.js dist/static/js/manifest.6034e5c.js.map package.json
Showing
.babelrc
0 → 100644
dist/index.html
deleted
100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
| { | { | ||
| "name": "ka-manager-ui", | "name": "ka-manager-ui", | ||
| "version": "1.0.0", | "version": "1.0.0", | ||
| "description": "基于vue2后台管理系统基础框架。", | "description": "ka后台管理系统", | ||
| "author": "taotao", | "author": "suntao", | ||
| "private": true, | "private": true, | ||
| "scripts": { | "scripts": { | ||
| "dev": "node build/dev-server.js", | "dev": "node build/dev-server.js", | ||
| ... | @@ -14,6 +14,7 @@ | ... | @@ -14,6 +14,7 @@ | 
| "dependencies": { | "dependencies": { | ||
| "axios": "^0.19.2", | "axios": "^0.19.2", | ||
| "babel-preset-env": "^1.7.0", | "babel-preset-env": "^1.7.0", | ||
| "babel-preset-es2015": "^6.24.1", | |||
| "element-ui": "^1.4.13", | "element-ui": "^1.4.13", | ||
| "js-cookie": "^2.1.3", | "js-cookie": "^2.1.3", | ||
| "three": "^0.84.0", | "three": "^0.84.0", | ||
| ... | ... | 
Please register or sign in to comment
 
