From e07b79bc313a35d01d150c6a99f5254b026d92db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 06 五月 2026 15:30:56 +0800
Subject: [PATCH] 管理端bug修改
---
small-program/shop/pages/order-details/order-details.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index 6b696dd..11a1b67 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -234,7 +234,7 @@
<view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 || info.status === 5" >鑱旂郴瀹㈡埛</view>
<view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 || info.status === 3)">鑱旂郴楠戞墜</view>
<view class="btn you" v-if="info.status ===1 || info.status ===4 " @click="hexiaoOrder(info)" >鏀朵欢鏍搁攢</view>
- <view class="btn you" v-if="info.status ==2 || info.status ===3 || info.status ===4 " @click="printerOrder(info)" >鎵撳嵃鏍囩</view>
+ <view class="btn you" v-if="info.status>0||info.status<=7 " @click="printerOrder(info)" >鎵撳嵃鏍囩</view>
<view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1)" @click="hexiaoOrder(info)" >纭鍒板簵</view>
<view class="btn you" v-if="info.status ===5 && (info.overdueStatus == 4 || info.overdueStatus == 2)" @click="hexiaoOrder(info)" >鍙栦欢鏍搁攢</view>
</view>
@@ -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