diff --git a/owner-vue/src/api/order.js b/owner-vue/src/api/order.js index aaee3b7..b309bf6 100644 --- a/owner-vue/src/api/order.js +++ b/owner-vue/src/api/order.js @@ -9,7 +9,7 @@ export default { page: page } } - return axios.get( process.env.VUE_APP_ORDER_URL + "/order/prev-order", options); + return axios.get( process.env.VUE_APP_API_URL + "/order/prev-order", options); }, requestOrder(orderDate, lastOrderId) { const options = { @@ -18,6 +18,12 @@ export default { lastOrderId: lastOrderId } } - return axios.get(process.env.VUE_APP_ORDER_URL + "/order/order-main", options); + return axios.get(process.env.VUE_APP_API_URL + "/order/order-main", options); + }, + patchOrder(orderId, orderStatus) { + const body = { + orderStatus: orderStatus + } + return axios.patch(process.env.VUE_APP_OWNER_SERVICE_BASEURL + "/order-service/order/" + orderId, body); } } \ No newline at end of file diff --git a/owner-vue/src/components/OrderCard.vue b/owner-vue/src/components/OrderCard.vue index 5b63bc4..afae546 100644 --- a/owner-vue/src/components/OrderCard.vue +++ b/owner-vue/src/components/OrderCard.vue @@ -9,19 +9,44 @@ {{ orderTime }} - - 주문 대기 - - - 주문 수령 - + + + + 주문 수령 + + + + + 주문 거절 + + + + + + + 수락됨 + + + + + + + 거절됨 + + + diff --git a/owner-vue/src/views/Order.vue b/owner-vue/src/views/Order.vue index 303a431..53e066d 100644 --- a/owner-vue/src/views/Order.vue +++ b/owner-vue/src/views/Order.vue @@ -15,18 +15,20 @@


- + 더보기 @@ -53,45 +55,38 @@ export default { date: '', cards: [], lastOrderId: null, - showButton: false + hasNext: false } }, methods: { - search: function() { + search: async function() { this.cards = []; this.lastOrderId = null; - OrderApi.requestOrder(this.date, this.lastOrderId) - .then( (response) => { - this.renderCard(response.data); - }) - .catch( (error) => { - console.log(error); - }) + + const response = await OrderApi.requestOrder(this.date, this.lastOrderId); + + this.renderCard(response.data) }, renderCard: function (json) { - const orders = json.data; + console.log(json); + const orders = json.data.orders; const size = orders.length; - if (size === 0) { - alert("검색 데이터가 없습니다."); - this.showButton = false; - } else { - this.showButton = true; - } + this.hasNext = json.data.hasNext; orders.forEach( (order, index) => { if (index === (size - 1)) { - this.lastOrderId = order.orderId; + this.lastOrderId = order.id; } - let orderItemNames = [] - order.orderItemResponses.forEach( (orderItem) => { - orderItemNames.push(orderItem.itemId); + let orderItemNames = []; + order.orderItems.forEach( (orderItem) => { + orderItemNames.push(orderItem.itemName); }) this.cards.push({ - orderId: order.orderId, - userName: order.orderId, + orderId: order.id, + userName: order.userName, itemNames: orderItemNames, orderTime: order.orderTime, orderStatus: order.orderStatus @@ -101,14 +96,9 @@ export default { inputDate: function(value) { this.date = value; }, - more: function() { - OrderApi.requestOrder(this.date, this.lastOrderId) - .then( (response) => { - this.renderCard(response.data); - }) - .catch( (error) => { - console.log(error); - }) + more: async function() { + const response = await OrderApi.requestOrder(this.date, this.lastOrderId); + this.renderCard(response.data); } } }