diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index e331a27..0cec00e 100644 --- a/src/components/SvgIcon/index.vue +++ b/src/components/SvgIcon/index.vue @@ -33,9 +33,9 @@ export default { \ No newline at end of file diff --git a/src/icons/svg/order-return.svg b/src/icons/svg/order-return.svg new file mode 100644 index 0000000..a8b4b4c --- /dev/null +++ b/src/icons/svg/order-return.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/order-setting.svg b/src/icons/svg/order-setting.svg new file mode 100644 index 0000000..646a621 --- /dev/null +++ b/src/icons/svg/order-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/order.svg b/src/icons/svg/order.svg new file mode 100644 index 0000000..208ac14 --- /dev/null +++ b/src/icons/svg/order.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/product-list.svg b/src/icons/svg/product-list.svg index 312763a..619a69e 100644 --- a/src/icons/svg/product-list.svg +++ b/src/icons/svg/product-list.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index bd4a4b2..10df4c3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -55,7 +55,7 @@ export const constantRouterMap = [ name: 'updateProduct', component: () => import('@/views/pms/product/update'), meta: {title: '修改商品', icon: 'product-add'}, - hidden:true + hidden: true }, { path: 'productRecycle', @@ -140,7 +140,34 @@ export const constantRouterMap = [ } ] }, - + { + path: '/oms', + component: Layout, + redirect: '/oms/order', + name: 'oms', + meta: {title: '订单', icon: 'order'}, + children: [{ + path: 'order', + name: 'order', + component: () => import('@/views/oms/order/index'), + meta: {title: '订单列表', icon: 'product-list'} + }, { + path: 'orderSetting', + name: 'orderSetting', + component: () => import('@/views/oms/order/setting'), + meta: {title: '订单设置', icon: 'order-setting'} + }, { + path: 'returnApply', + name: 'returnApply', + component: () => import('@/views/oms/apply/index'), + meta: {title: '退货申请处理', icon: 'order-return'} + }, { + path: 'returnReason', + name: 'returnReason', + component: () => import('@/views/oms/apply/reason'), + meta: {title: '退货原因设置', icon: 'order-return-reason'} + }] + }, {path: '*', redirect: '/404', hidden: true} ] diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d751b7b..8a26518 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -22,8 +22,8 @@
- username: test - password: 123 + username: admin + password: 123456
@@ -51,8 +51,8 @@ export default { } return { loginForm: { - username: 'test', - password: '123' + username: 'admin', + password: '123456' }, loginRules: { username: [{ required: true, trigger: 'blur', validator: validateUsername }], diff --git a/src/views/oms/apply/index.vue b/src/views/oms/apply/index.vue new file mode 100644 index 0000000..c76e7ee --- /dev/null +++ b/src/views/oms/apply/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/oms/apply/reason.vue b/src/views/oms/apply/reason.vue new file mode 100644 index 0000000..b5bf04a --- /dev/null +++ b/src/views/oms/apply/reason.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue new file mode 100644 index 0000000..43422d1 --- /dev/null +++ b/src/views/oms/order/index.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/views/oms/order/setting.vue b/src/views/oms/order/setting.vue new file mode 100644 index 0000000..6fc8e61 --- /dev/null +++ b/src/views/oms/order/setting.vue @@ -0,0 +1,13 @@ + + + + +