From 1d85389aca70aa7536e01639fab863d4259753b2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/shop/pages/order-details/order-details.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 468a864..4f95466 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -421,8 +421,10 @@
console.log('data.paths:', data.paths)
console.log('driverLng:', driverLng, 'driverLat:', driverLat, 'depositShopLng:', depositShopLng, 'depositShopLat:', depositShopLat)
var points = []
+ var duration = 0
if (data.paths && data.paths.length > 0) {
var path = data.paths[0]
+ duration = path.duration || 0
console.log('path:', path)
console.log('path keys:', Object.keys(path))
@@ -458,6 +460,17 @@
}
}
console.log('points:', points)
+
+ var expectedTime = ''
+ if (duration > 0) {
+ var now = new Date()
+ var arrivalTime = new Date(now.getTime() + duration * 1000)
+ var month = arrivalTime.getMonth() + 1
+ var day = arrivalTime.getDate()
+ var hours = arrivalTime.getHours()
+ var minutes = arrivalTime.getMinutes()
+ expectedTime = month + '.' + (day < 10 ? '0' + day : day) + ' ' + (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
+ }
that.polyline = [{
points: points,
@@ -495,7 +508,7 @@
height: 30,
anchor: { x: 0.5, y: 0.5 },
callout: {
- content: '棰勮鍒板簵鏃堕棿\n' + (that.info.expectedDepositTime || ''),
+ content: '棰勮鍒板簵鏃堕棿\n' + expectedTime,
color: '#222222',
fontSize: 14,
borderRadius: 4,
--
Gitblit v1.9.3