From 8c76e87ba9cdefd7fcd3822b36682f3e17d3dae5 Mon Sep 17 00:00:00 2001 From: lee-soo-heon Date: Wed, 30 Oct 2019 17:21:09 +0900 Subject: [PATCH] survey error --- src/App.vue | 2 +- src/components/order/OrderList.vue | 28 ++++++--- src/components/order/OrderListNew.vue | 83 ++++++--------------------- 3 files changed, 39 insertions(+), 74 deletions(-) diff --git a/src/App.vue b/src/App.vue index 315978c..1a68d70 100644 --- a/src/App.vue +++ b/src/App.vue @@ -128,7 +128,7 @@ - My Page(Data Projection) + My Page(API 직접연결) diff --git a/src/components/order/OrderList.vue b/src/components/order/OrderList.vue index 92b4ba1..373c7f2 100644 --- a/src/components/order/OrderList.vue +++ b/src/components/order/OrderList.vue @@ -102,8 +102,12 @@ return new Promise(function (resolve, reject) { me.$http.get(`${API_HOST}/surveys`).then(function (e) { + console.log(e) + resolve(e.data._embedded.surveys) - }); + }).catch(function (error){ + reject() + } ); }); @@ -124,15 +128,21 @@ var me = this; var order = await me.getOrderList(); - var sur = await me.getSurveyList(); - - order.forEach(function(or){ - sur.forEach(function(select){ - if(select.orderId == or.orderId){ - or.surveyCompleted=true - } + try { + var sur = await me.getSurveyList(); + order.forEach(function(or){ + sur.forEach(function(select){ + if(select.orderId == or.orderId){ + or.surveyCompleted=true + } + }) }) - }) + } catch(err) { + console.log(err) + } + + + me.orderList=order }, diff --git a/src/components/order/OrderListNew.vue b/src/components/order/OrderListNew.vue index a42587d..269b4a0 100644 --- a/src/components/order/OrderListNew.vue +++ b/src/components/order/OrderListNew.vue @@ -62,30 +62,30 @@ page:5, }), computed: { - }, watch: { dialog(val) { val || this.close() }, - // orderList:function(newVal,oldVal){ - // this.orderList= newVal - // } }, - created() { this.mountedFunction() }, - mounted() { + beforeMount() { }, methods: { async mountedFunction() { var me = this; - await me.getOrderList(); - await me.getDeliveryStatus(); - console.log("Done") + try{ + await me.getOrderList(); + await me.getDeliveryStatus(); + console.log("Done") + }catch (err) { + console.log(err) + } + setTimeout(() => { this.page=10 @@ -94,21 +94,19 @@ // await me.updateList() + return me.orderList + }, - // updateList() { - // var me = this - // return new Promise(function (resolve, reject) { - // console.log(me.orderList) - // resolve(me.orderList) - // }) - // }, getDeliveryStatus() { var me = this - return new Promise(function (resolve, reject) { + if (`${API_HOST}` == 'undefined') + window.API_HOST = localStorage.getItem('api_host') + return new Promise(function (resolve, reject) { me.orderList.forEach(function (item) { - me.$http.get(`${API_HOST}/deliveries/search/findByOrderIdOrderByDeliveryIdDesc?orderId=` + item.orderId).then(function (e) { + me.$http.get(`${API_HOST}/deliveries/search/findByOrderIdOrderByDeliveryIdDesc?orderId=` + item.orderId) + .then(function (e) { if (e.data._embedded.deliveries.length != 0) { item.deli = e.data._embedded.deliveries[0].deliveryState @@ -117,22 +115,16 @@ } }); }) - // var tmp =JSON.parse(JSON.stringify(me.orderList)) resolve(me.orderList) }) }, getOrderList() { var me = this + + if (`${API_HOST}` == 'undefined') window.API_HOST = localStorage.getItem('api_host') - - // return new Promise(function (resolve, reject) { - // me.$http.get(`${API_HOST}/mypage/order/${localStorage.getItem('userId')}`).then(function (e) { - // resolve(e.data) - // }); - // }); - return new Promise(function (resolve, reject) { me.$http.get(`${API_HOST}/orders/search/findByCustomerId?customerId=${localStorage.getItem('userId')}`).then(function (e) { @@ -143,48 +135,11 @@ }) me.orderList = e.data._embedded.orders; - console.log("orderList") - // var tmp =JSON.parse(JSON.stringify(me.orderList)) resolve(me.orderList) - // resolve(me.orderList) }); }) }, - // getDeliveryStatus(orderId) { - // var me = this - // - // // if (`${API_HOST}` == 'undefined') { - // // window.API_HOST = localStorage.getItem('api_host') - // // } - // - // // me.orderList.forEach(function(order){ - // // console.log(order) - // // if (order.orderId != 'undefined') { - // Promise me.$http.get(`${API_HOST}/deliveries/search/findByOrderIdOrderByDeliveryIdDesc?orderId=2`).then(function (e) { - // // console.log(e.data._embedded.deliveries[0].deliveryState) - // if (e.data._embedded.deliveries.length > 0) { - // return "1231" - // }else{ - // return "12313" - // } - // }); - // return "123" - // - // // }) - // - // // if (orderId != 'undefined') { - // // me.$http.get(`${API_HOST}/deliveries/search/findByOrderIdOrderByDeliveryIdDesc?orderId=` + orderId).then(function (e) { - // // - // // if (e.data._embedded.deliveries.length > 0) { - // // me.orderList.forEach(function(order){ - // // if(order.orderId == orderId){ - // // order.delivery = e.data._embedded.deliveries[0].deliveryState; - // // } - // // }) - // // } - // // }); - // // } - // }, + }, }