diff --git a/owner-vue/package.json b/owner-vue/package.json index 6033c79..2b4a234 100644 --- a/owner-vue/package.json +++ b/owner-vue/package.json @@ -3,15 +3,15 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve --port 8080", + "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "service": "node service.js" + "lint": "vue-cli-service lint" }, "dependencies": { "@mdi/js": "^6.5.95", "axios": "^0.26.0", "core-js": "^3.6.5", + "moment": "^2.29.1", "vue": "^2.6.11", "vue-router": "^3.2.0", "vuedraggable": "^2.24.3", @@ -26,8 +26,6 @@ "babel-eslint": "^10.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", - "font-awesome": "^4.7.0", - "gulp": "^3.9.1", "sass": "~1.32.0", "sass-loader": "^10.0.0", "vue-cli-plugin-vuetify": "~2.4.2", diff --git a/owner-vue/src/api/order.js b/owner-vue/src/api/order.js new file mode 100644 index 0000000..fb44238 --- /dev/null +++ b/owner-vue/src/api/order.js @@ -0,0 +1,23 @@ +import axios from "axios"; + +export default { + requestPrevOrder(startDate, endDate, page) { + const options = { + params: { + startDate: startDate, + endDate: endDate, + page: page + } + } + return axios.get("http://localhost:8001/order-service/prevOrder", options); + }, + requestOrder(orderDate, lastOrderId) { + const options = { + params: { + orderDate: orderDate, + lastOrderId: lastOrderId + } + } + return axios.get("http://localhost:8001/order-service/orderMain", options); + } +} \ No newline at end of file diff --git a/owner-vue/src/components/DatePicker.vue b/owner-vue/src/components/DatePicker.vue new file mode 100644 index 0000000..669644e --- /dev/null +++ b/owner-vue/src/components/DatePicker.vue @@ -0,0 +1,55 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/owner-vue/src/components/OrderCard.vue b/owner-vue/src/components/OrderCard.vue new file mode 100644 index 0000000..5b63bc4 --- /dev/null +++ b/owner-vue/src/components/OrderCard.vue @@ -0,0 +1,44 @@ + + + + {{ userName }} + + 상세보기 + + {{ itemNames.join(", ") }} + + {{ orderTime }} + + + 주문 대기 + + + 주문 수령 + + + + + + + + \ No newline at end of file diff --git a/owner-vue/src/router/index.js b/owner-vue/src/router/index.js index e7f6764..12f7d17 100644 --- a/owner-vue/src/router/index.js +++ b/owner-vue/src/router/index.js @@ -19,6 +19,16 @@ const routes = [ name: 'menu', component: () => import('./../views/Menu') }, + { + path: '/prev-order', + name: 'prev-order', + component: () => import('./../views/PrevOrder') + }, + { + path: '/order', + name: 'order', + component: () => import('./../views/Order.vue') + } ] const router = new VueRouter({ diff --git a/owner-vue/src/views/Order.vue b/owner-vue/src/views/Order.vue new file mode 100644 index 0000000..303a431 --- /dev/null +++ b/owner-vue/src/views/Order.vue @@ -0,0 +1,119 @@ + + + + 주문 + + 검색 + + + + + + + + + + + + + + + + + + 더보기 + + + + + + + \ No newline at end of file diff --git a/owner-vue/src/views/PrevOrder.vue b/owner-vue/src/views/PrevOrder.vue new file mode 100644 index 0000000..be67d30 --- /dev/null +++ b/owner-vue/src/views/PrevOrder.vue @@ -0,0 +1,163 @@ + + + + 지난 주문 + + 검색 + + + + + + + + + + + {{startDate}} ~ {{endDate}} 내역 + + + + + + + + + + + + + + \ No newline at end of file