mindol1004/ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

survey error

Browse Source
This commit is contained in:
lee-soo-heon
2019-10-30 17:21:09 +09:00
parent 778fae8e59
commit 8c76e87ba9
3 changed files with 39 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -128,7 +128,7 @@
</v-list-item-action>
<v-list-item-content>
<v-list-item-title class="grey--text">
My Page(Data Projection)
My Page(API 직접연결)
</v-list-item-title>
</v-list-item-content>
</v-list-item>

28
src/components/order/OrderList.vue
View File

@@ -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
},

83
src/components/order/OrderListNew.vue
View File

@@ -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;
// // }
// // })
// // }
// // });
// // }
// },
},
}
</script>