Commit 3e396c1e39498d1dae9f4d1d5320f29e2a0f9098

Authored by youxiw2000
2 parents ca63eaae 087df2e6

Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into

dev

# Conflicts:
#	trash-ui/src/views/ask/ask/orderDetail.vue
Showing 1 changed file with 0 additions and 19 deletions
trash-ui/src/router/index.js
@@ -65,25 +65,6 @@ export const constantRoutes = [ @@ -65,25 +65,6 @@ export const constantRoutes = [
65 } 65 }
66 ] 66 ]
67 }, 67 },
68 - {  
69 - path: '/ask',  
70 - component: Layout,  
71 - redirect: '/ask/list',  
72 - name: 'Ask',  
73 - meta: {  
74 - title: '电子联单',  
75 - icon: 'form'  
76 - },  
77 - children: [  
78 - {  
79 - path: 'orderDetail/:orderId',  
80 - name: 'OrderDetail',  
81 - component: () => import('@/views/ask/ask/orderDetail.vue'),  
82 - meta: { title: '订单详情', icon: 'detail' },  
83 - props: true  
84 - }  
85 - ]  
86 - },  
87 { 68 {
88 path: '/user', 69 path: '/user',
89 component: Layout, 70 component: Layout,