From 621d682c6c7859c635100cf69ea273738aa9cdbf Mon Sep 17 00:00:00 2001 From: zhh Date: Fri, 12 Oct 2018 17:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SvgIcon/index.vue | 6 +-- src/icons/svg/order-return-reason.svg | 1 + src/icons/svg/order-return.svg | 1 + src/icons/svg/order-setting.svg | 1 + src/icons/svg/order.svg | 1 + src/icons/svg/product-list.svg | 2 +- src/router/index.js | 31 ++++++++++++- src/views/login/index.vue | 8 ++-- src/views/oms/apply/index.vue | 13 ++++++ src/views/oms/apply/reason.vue | 13 ++++++ src/views/oms/order/index.vue | 66 +++++++++++++++++++++++++++ src/views/oms/order/setting.vue | 13 ++++++ 12 files changed, 146 insertions(+), 10 deletions(-) create mode 100644 src/icons/svg/order-return-reason.svg create mode 100644 src/icons/svg/order-return.svg create mode 100644 src/icons/svg/order-setting.svg create mode 100644 src/icons/svg/order.svg create mode 100644 src/views/oms/apply/index.vue create mode 100644 src/views/oms/apply/reason.vue create mode 100644 src/views/oms/order/index.vue create mode 100644 src/views/oms/order/setting.vue 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 @@ + + + + +