# Conflicts: # src/views/Home/index.vue
Conflicts: .env.development
完善页面跳转逻辑
完善个人中心页面跳转逻辑
Conflicts: src/axios/api.js