diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 3749072..0263f48 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -30,20 +30,19 @@ - + {{ delivery.deliveryName }}:{{ delivery.deliveryId }} 复制 - - - {{ orderInfo._status._type === 2 ? getDay(orderInfo.orderId, delivery) : '' }} {{ delivery.estimatedTime || '' }} - @@ -56,8 +55,18 @@ - + {{ logistics[index] && logistics[index].Traces && logistics[index].Traces.length > 0 ? logistics[index] && logistics[index].Traces[logistics[index].Traces.length - 1].acceptTime : '' }} + + + {{ delivery.estimatedTime }} + @@ -554,7 +563,7 @@ export default { pageKeyId: Object.freeze('userOrderInfo'), logistics: {}, isGift: false, - loading: false + loading: true }; }, computed: { @@ -620,16 +629,17 @@ export default { title: '您已催促成功,商家正在抓紧备货' }) }, - getDay(id, delivery) { + // 获取预计送达时间 + getDay(delivery, index) { const params = { - orderId: id, + orderId: this.orderInfo.orderId, deliveryId: delivery.deliveryId, deliverySn: delivery.deliverySn } orderExpectedArrivalTime(params).then(res => { if(res.success) { - // this.orderInfo.expectedArrivalTime = res.data - delivery.estimatedTime = res.data.deliveryTime || '' + this.orderInfo.deliveryInfo[index].estimatedTime = res.data.deliveryTime || '' + this.$forceUpdate() } }) }, @@ -734,14 +744,6 @@ export default { query: { id: cart.unique } }); }, - goOrderDetails(order) { - this.$yrouter.push({ - path: "/pages/order/OrderDetails/index", - query: { - id: order.orderId - } - }); - }, goRoom(order) { const params = { goodsId: order.cartInfo[0].productId, @@ -1021,7 +1023,11 @@ export default { const orderInfo = this.orderInfo if(orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)) { for(let i = 0; i < orderInfo.deliveryInfo.length; i++) { + orderInfo.deliveryInfo[i].estimatedTime = '' this.getExpressInfo(orderInfo.deliveryInfo[i], i) + if (orderInfo._status._type === 2) { + this.getDay(orderInfo.deliveryInfo[i], i) + } } } }) @@ -1299,4 +1305,12 @@ export default { position: relative; margin-left: 10rpx; } +.order-deliver-item-show { + display: block; +} +.time-wrap { + display: flex; + align-items: center; + justify-content: space-between; +}