Merge remote-tracking branch 'remotes/origin/dev-gpranking-1025' into release
# Conflicts: # src/views/home/home.vue
正在显示
| ... | @@ -13,6 +13,7 @@ | ... | @@ -13,6 +13,7 @@ |
| "dependencies": { | "dependencies": { | ||
| "axios": "0.16.2", | "axios": "0.16.2", | ||
| "better-scroll": "^0.1.15", | "better-scroll": "^0.1.15", | ||
| "echarts": "^4.2.0-rc.2", | |||
| "fastclick": "^1.0.6", | "fastclick": "^1.0.6", | ||
| "iscroll": "^5.2.0", | "iscroll": "^5.2.0", | ||
| "js-cookie": "^2.2.0", | "js-cookie": "^2.2.0", | ||
| ... | ... |
src/views/gpranking/gpranking.vue
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录