解决冲突
Showing
{ | { | ||
"name": "poolin_app", | "name": "poolin_app_new", | ||
"version": "1.0.0", | "version": "1.0.0", | ||
"description": "A Vue.js project", | "description": "A Vue.js project", | ||
"author": "xin3w <xin3w@126.com>", | "author": "xin3w <xin3w@126.com>", | ||
"private": true, | "private": true, | ||
"scripts": { | "scripts": { | ||
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 172.16.10.57", | "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", | ||
"start": "npm run dev", | "start": "npm run dev", | ||
"build": "node build/build.js" | "build": "node build/build.js" | ||
}, | }, | ||
"dependencies": { | "dependencies": { | ||
"@tweenjs/tween.js": "^17.2.0", | |||
"animate.css": "^3.5.2", | |||
"axios": "^0.17.1", | "axios": "^0.17.1", | ||
"echarts": "^3.8.5", | "better-scroll": "^1.8.0", | ||
"echarts": "^4.0.2", | |||
"element-ui": "^2.0.11", | "element-ui": "^2.0.11", | ||
"mint-ui": "^2.2.13", | "mint-ui": "^2.2.13", | ||
"vue": "^2.5.2", | "vue": "^2.5.2", | ||
"vue-awesome-swiper": "^3.1.0", | "vue-awesome-swiper": "^3.1.2", | ||
"vue-clipboard2": "0.0.8", | "vue-clipboard2": "0.0.8", | ||
"vue-echarts-v3": "^1.0.18", | "vue-echarts-v3": "^1.0.19", | ||
"vue-router": "^3.0.1", | "vue-router": "^3.0.1", | ||
"vuex": "^3.0.1" | "vuex": "^3.0.1" | ||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"less": "^2.7.3", | |||
"less-loader": "^4.0.5", | |||
"autoprefixer": "^7.1.2", | "autoprefixer": "^7.1.2", | ||
"babel-core": "^6.22.1", | "babel-core": "^6.22.1", | ||
"babel-helper-vue-jsx-merge-props": "^2.0.3", | "babel-helper-vue-jsx-merge-props": "^2.0.3", | ||
... | @@ -38,8 +43,6 @@ | ... | @@ -38,8 +43,6 @@ |
"file-loader": "^1.1.4", | "file-loader": "^1.1.4", | ||
"friendly-errors-webpack-plugin": "^1.6.1", | "friendly-errors-webpack-plugin": "^1.6.1", | ||
"html-webpack-plugin": "^2.30.1", | "html-webpack-plugin": "^2.30.1", | ||
"less": "^2.7.3", | |||
"less-loader": "^4.0.5", | |||
"node-notifier": "^5.1.2", | "node-notifier": "^5.1.2", | ||
"optimize-css-assets-webpack-plugin": "^3.2.0", | "optimize-css-assets-webpack-plugin": "^3.2.0", | ||
"ora": "^1.2.0", | "ora": "^1.2.0", | ||
... | ... |
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/assets/js/dictionaries.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
src/assets/logo.png
0 → 100644
6.69 KB
src/components/Dashboard/no.vue
0 → 100644
src/maxrocky/betterScroll/bubble.vue
0 → 100644
src/maxrocky/betterScroll/dom.js
0 → 100644
src/maxrocky/betterScroll/index.js
0 → 100644
src/maxrocky/betterScroll/loading.gif
0 → 100644
3.91 KB
src/maxrocky/betterScroll/loading.vue
0 → 100644
src/maxrocky/betterScroll/mrBetterScroll.vue
0 → 100644
src/maxrocky/cacheNavigation/index.js
0 → 100644
src/maxrocky/cacheNavigation/mrNavigation.js
0 → 100644
src/maxrocky/routeTranslate/index.js
0 → 100644
src/maxrocky/scrollKeeper/index.js
0 → 100644
src/maxrocky/scrollKeeper/mrScrollKeeper.js
0 → 100644
src/utils/dictionaries.js
0 → 100644
This diff is collapsed.
Click to expand it.
File moved
src/utils/tween.js
0 → 100644
Please
register
or
sign in
to comment