Merge branch 'feature/4月-菜单和权限' into dev

# Conflicts:
#	src/api/api.js

src/api/api.js

@@ -15,6 +15,8 @@ import { Message } from 'element-ui';
 
 Vue.use(VueAxios, axios);
 Vue.axios.defaults.withCredentials = true; // cookie访问
+Vue.axios.defaults.headers.common['platform'] = 'haoban';
+
 Vue.axios.defaults.timeout = 500000;
 let local = window.location.origin;