Merge branch 'master' of https://git.xoado.com/yaohui/xoadoPlatform

src/router/index.js

 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import Layout from '@/layout'
-import {routerMode} from '@/config/index'
-import store from '@/store/index'
+import Layout from '@/layout/index.vue'
+import store from '@/store'
 
 Vue.use(VueRouter)
-
-/**
- * 静态路由
- * @type {({path: string, component: (function(): *), hidden: boolean}|{path: string, component: (function(): *), hidden: boolean, name: string}|{path: string, component: (function(): *), hidden: boolean, name: string})[]}
- */
+    /* 通用routers */
 export const currencyRoutes = [{
 	path: '/login',
+        name: 'Login',
 	component: () =>
-		import ( /* webpackChunkName: "login" */ '@/views/login/index.vue'),
+            import ('@/views/login/index-2.vue'),
+        meta: { title: '登录页' },
 	hidden: true
 },
+    {
+        path: '/error',
+        component: Layout,
+        name: 'Error',
+        redirect: '/error/404',
+        hidden: true,
+        children: [{
+            path: '404',
+            name: 'Page404',
+            component: () =>
+                import ('@/views/error-page/index.vue'),
+            meta: { title: '404', icon: 'el-icon-s-release' }
+        }]
+    },
+    // {
+    //     path: '/personal',
+    //     name: 'Personal',
+    //     component: Layout,
+    //     redirect: '/personal/index',
+    //     hidden: true,
+    //     children: [{
+    //         path: 'index',
+    //         name: 'Personal-index',
+    //         component: () =>
+    //             import('@/views/About.vue'),
+    //         meta: { title: '个人中心' }
+    //     }]
+    // },
+    // {
+    //     path: '/DriverInfo',
+    //     name: 'DriverInfo',
+    //     component: Layout,
+    //     redirect: '/driverInfo/index',
+    //     children: [{
+    //         path: 'index',
+    //         name: 'driverInfoIndex',
+    //         component: () =>
+    //             import('@/views/operationArea/components/driverInfo.vue'),
+    //         meta: { title: '司机详情', icon: 'el-icon-s-flag' },
+    //     }],
+    //     hidden: true
+    // },
 	{
 		path: '/Real',
 		component: () =>
 			import ('@/views/components/newReal.vue'),
-		meta: {
-			title: '实名认证'
-		},
+        meta: { title: '实名认证' },
 		hidden: true
 	},
 	{
 		path: '/JoiningEnterprise',
 		component: () =>
 			import ('@/views/components/newJoiningEnterprise.vue'),
-		meta: {
-			title: '加入企业'
-		},
+        meta: { title: '加入企业' },
 		hidden: true
 	},
 	{
-		path: '/401',
-		name: '401',
+        path: '/CreateEnterprise',
 		component: () =>
-			import ('@/views/401'),
-		hidden: true
-	},
-	{
-		path: '/404',
-		name: '404',
-		component: () =>
-			import ('@/views/404'),
+            import ('@/views/components/newCreateEnterprise.vue'),
+        meta: { title: '企业认证' },
 		hidden: true
 	}
 ]
 
 /**
- * 动态路由
- * @type {any}
+ * 动态添加的路由
+ * @type {[*]}
  */
-export const routes = [{
+export const asyncRoutes = [
+
+    {
 	path: '/',
-	name: 'Company',
+        name: 'platform',
 	component: Layout,
-	redirect: '/company',
-	meta: {
-		icon: 'el-icon-office-building',
-		title: '企业管理'
+        redirect: '/company-platformInfo',
+        meta: { icon: 'el-icon-s-platform', title: '平台管理' },
+        children: [{
+                path: 'company-platformInfo',
+                name: 'CompanyplatformInfo',
+                component: () =>
+                    import ('@/views/platformInfo/index.vue'),
+                meta: { title: '平台配置', icon: 'el-icon-s-unfold' }
 	},
+            {
+                path: 'operate',
+                name: 'operate',
+                component: () =>
+                    import ('@/views/operate/index.vue'),
+                meta: { title: '区域管理', icon: 'el-icon-s-claim' },
+
+            },
+        ]
+    },
+    {
+        path: '/information',
+        name: 'information',
+        component: Layout,
+        redirect: '/information/index',
+        meta: { icon: 'el-icon-s-home', title: '企业管理' },
 	children: [{
-		path: '/',
+                path: 'company-information',
 		name: 'CompanyInformation',
 		component: () =>
 			import ('@/views/dashboard/index.vue'),
-		meta: {
-			title: '企业信息',
-			icon: 'el-icon-s-data'
-		}
+                meta: { title: '企业信息', icon: 'el-icon-s-data' }
 	},
 		{
 			path: 'account-information',
 			name: 'AccountInformation',
 			component: () =>
-				import ('@/views/accountManagement/index.vue'),
-			meta: {
-				title: '账户管理',
-				icon: 'el-icon-s-finance'
-			}
+                    // import ('@/views/permission/page-admin'),
+                    import ('@/views/permission/page-admin-new'),
+                meta: { title: '账户管理', icon: 'el-icon-s-finance' }
 		},
 		{
 			path: 'bandCard',
 			name: 'bandCard',
 			component: () =>
-				import ('@/views/accountManagement/bankCard'),
-			meta: {
-				title: '银行卡管理'
-			},
+                    // import('@/views/permission/bank-card'),
+                    import ('@/views/permission/bankCardNew'),
+                meta: { title: '银行卡管理' },
 			hidden: true
 		},
 		{