diff --git a/ebike-operate/src/pages.js b/ebike-operate/src/pages.js index 931f815..cc3e247 100644 --- a/ebike-operate/src/pages.js +++ b/ebike-operate/src/pages.js @@ -98,6 +98,25 @@ const pages = [ isMenu: true } ] + }, + { + icon: () => h(GatewayOutlined), + path: '/FinanCecenter', + name: '财务中心', + children: [ + { + path: '/RefundApplication', + name: '退款申请', + isMenu: true, + children: [ + { + path: '/CyclingOrder', + name: '骑行订单', + isMenu: true + } + ] + } + ] } ] @@ -116,17 +135,25 @@ const getRouters = () => { component: component, // 动态导入组件 }; if (item.children) { - item.children.forEach((child) => { - let cpath = ipath + child.path; - route.children = route.children || []; - const component = modules['./views' + cpath + '/index.vue']; - route.children.push({ - path: cpath, - name: child.name, - component: component, // 动态导入组件 - }) + route.children = []; + _menuList(item.children) + } + function _menuList(node) { + node.forEach((child) => { + if (child.children) { + ipath = ipath + child.path; + _menuList(child.children) + } else { + let cpath = ipath + child.path; + const component = modules['./views' + cpath + '/index.vue']; + route.children.push({ + path: cpath, + name: child.name, + component: component, // 动态导入组件 + }) + } }) - }; + } routes.push(route); }); return routes; @@ -162,7 +189,12 @@ const getMenus = () => { if (permcodes.some(item => item.includes(ipermcode)) || ikey.toLowerCase() === 'home') { menus.push(menu) if (item.children) { - item.children.forEach((child) => { + menu.children = []; + menu.children = _menuList(item.children) + } + function _menuList(node) { + const childrenList = [] + node.forEach((child) => { let cpath = ipath + child.path; let ckey = child.key; if (ckey === undefined) { @@ -171,17 +203,23 @@ const getMenus = () => { ckey = 'Home' } } - menu.children = menu.children || []; let cpermcode = permcode + '.' + ckey.toLowerCase().replace(/-/g, '.'); if (child['isMenu'] && permcodes.some(item => item.includes(cpermcode))) { - menu.children.push({ + const itemMenu = { key: ckey, label: child.name, title: child.name, path: cpath - }) + } + if (child.children) { + ipath = ipath + child.path; + itemMenu.children = [] + itemMenu.children = _menuList(child.children); + } + childrenList.push(itemMenu) } }) + return childrenList; } } }); diff --git a/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue b/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue new file mode 100644 index 0000000..0341b8b --- /dev/null +++ b/ebike-operate/src/views/FinanCecenter/RefundApplication/CyclingOrder/index.vue @@ -0,0 +1,721 @@ + + \ No newline at end of file diff --git a/ebike-operate/src/views/Layout/index.vue b/ebike-operate/src/views/Layout/index.vue index 9a127ec..e171239 100644 --- a/ebike-operate/src/views/Layout/index.vue +++ b/ebike-operate/src/views/Layout/index.vue @@ -228,7 +228,7 @@ const onOperationClick = (e) => { .trigger { font-size: 18px; line-height: 64px; - padding: 0 24px; + padding: 0px 24px; cursor: pointer; transition: color 0.3s; } @@ -259,7 +259,7 @@ const onOperationClick = (e) => { color: #fff; } .el-avatar { - margin: 0 20px; + margin: 0px 20px; } .logoutLink { text-decoration: none;