diff --git a/api/dining-hall.js b/api/dining-hall.js new file mode 100644 index 0000000..12a2703 --- /dev/null +++ b/api/dining-hall.js @@ -0,0 +1,10 @@ +import request from '@/utils/request'; + +// 获取订单列表 +export function getOrderList(params) { + return request({ + url: '/leopen/order/flow/query', + method: 'get', + params + }); +} \ No newline at end of file diff --git a/pages.json b/pages.json index 672592f..239a4f5 100644 --- a/pages.json +++ b/pages.json @@ -25,7 +25,8 @@ { "path": "pages/work/index", "style": { - "navigationBarTitleText": "订单" + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#F9FBFF" } }, { diff --git a/pages/components/Tabs.vue b/pages/components/Tabs.vue new file mode 100644 index 0000000..3a0a298 --- /dev/null +++ b/pages/components/Tabs.vue @@ -0,0 +1,73 @@ + + + + {{ item }} + + + + + + + + diff --git a/pages/work/index copy.vue b/pages/work/index copy.vue new file mode 100644 index 0000000..af4b1e8 --- /dev/null +++ b/pages/work/index copy.vue @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + 库存查询 + + + + + + 角色管理 + + + + + + 菜单管理 + + + + + + 部门管理 + + + + + + 岗位管理 + + + + + + 字典管理 + + + + + + 参数设置 + + + + + + 通知公告 + + + + + + 日志管理 + + + + + + + + + + diff --git a/pages/work/index.vue b/pages/work/index.vue index af4b1e8..5141097 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -1,183 +1,281 @@ - - - - - - - - - - - + + + 订单 + + + 筛选 + + + - - - - - - - - 库存查询 - - - - - - 角色管理 - - - - - - 菜单管理 - - - - - - 部门管理 - - - - - - 岗位管理 - - - - - - 字典管理 - - - - - - 参数设置 - - - - - - 通知公告 - - - - - - 日志管理 - - - - - + + + + + + 订单来源:{{ item.sourceType }} + {{ handleOrderState(item.ordState) }} + + + + {{ item.canteenName }} + {{ item.intervalName }} + + 就餐时间:{{ item.orderTime }} + + + + + {{ goods.goodsDishesName }} + + + + ¥ + {{ item.realAmount }} + + 共{{ item.detailList.length }}件 + + + + + 评价 + + + 删除订单 + + + + + + + + + + + + - diff --git a/static/images/not_order.png b/static/images/not_order.png new file mode 100644 index 0000000..0adb3a7 Binary files /dev/null and b/static/images/not_order.png differ diff --git a/static/images/pull.png b/static/images/pull.png new file mode 100644 index 0000000..edf8036 Binary files /dev/null and b/static/images/pull.png differ diff --git a/static/images/search.png b/static/images/search.png new file mode 100644 index 0000000..8f57787 Binary files /dev/null and b/static/images/search.png differ