From a240b43f1908abdecb87092502b3ed69d665336c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 30 四月 2026 13:41:12 +0800
Subject: [PATCH] 小程序 | app
---
app/pages/order-detail/order-detail.vue | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/app/pages/order-detail/order-detail.vue b/app/pages/order-detail/order-detail.vue
index adcf2a0..1b35417 100644
--- a/app/pages/order-detail/order-detail.vue
+++ b/app/pages/order-detail/order-detail.vue
@@ -284,7 +284,7 @@
</template>
<script>
-import image from 'uview-ui/libs/config/props/image';
+ import { mapState } from 'vuex'
export default {
data() {
@@ -303,6 +303,7 @@
showGrabModal: false,
currentLocation: null,
routePoints: [],
+ locationTimer: null,
distance: 0,
duration: 0,
statusTextMap: {
@@ -318,6 +319,7 @@
}
},
computed: {
+ ...mapState(['userInfo']),
formattedRemainTime() {
const minutes = this.orderDetail.remainMinutes
if (!minutes) return null
@@ -332,11 +334,9 @@
return this.orderDetail.status === 3 || this.orderDetail.status === 4
},
mapData() {
- const startPoint = this.currentLocation || { latitude: 31.829512, longitude: 117.239211 }
+ const startPoint = this.currentLocation || { latitude: this.orderDetail.navigateLat, longitude: this.orderDetail.navigateLng }
const hasEndPoint = this.orderDetail.navigateLat && this.orderDetail.navigateLng
- const endPoint = hasEndPoint
- ? { latitude: this.orderDetail.navigateLng, longitude: this.orderDetail.navigateLat }
- : { latitude: 31.841268, longitude: 117.278695 }
+ const endPoint = { latitude: this.orderDetail.navigateLng, longitude: this.orderDetail.navigateLat }
let center
let scale = 12
@@ -370,7 +370,7 @@
} else if (this.currentLocation) {
center = this.currentLocation
} else {
- center = { latitude: 31.83539, longitude: 117.258953 }
+ center = { latitude: this.orderDetail.navigateLat, longitude: this.orderDetail.navigateLng }
}
const markers = [
@@ -381,10 +381,6 @@
const routePoints = this.routePoints.length > 0 ? this.routePoints : [
startPoint,
- { latitude: 31.831624, longitude: 117.247836 },
- { latitude: 31.834918, longitude: 117.255467 },
- { latitude: 31.838214, longitude: 117.265358 },
- { latitude: 31.840126, longitude: 117.272481 },
endPoint
]
@@ -456,6 +452,12 @@
this.getOrderDetail()
}
},
+ onUnload() {
+ if (this.locationTimer) {
+ clearInterval(this.locationTimer)
+ this.locationTimer = null
+ }
+ },
methods: {
handleBack() {
uni.navigateBack({ delta: 1 });
@@ -477,6 +479,13 @@
},
getCurrentLocation() {
+ this.fetchLocation()
+ this.locationTimer = setInterval(() => {
+ this.fetchLocation()
+ }, 60000)
+ },
+
+ fetchLocation() {
uni.getLocation({
type: 'gcj02',
success: (res) => {
@@ -502,11 +511,11 @@
this.$u.api.directionInfo({
from,
to,
- mode: 'driving'
+ mode: this.userInfo.driverType
}).then(res => {
- console.log('directionInfo success:', res)
- if (res && res.paths && res.paths.length > 0) {
- const path = res.paths[0]
+ console.log('paths success:', res.data.route.paths[0])
+ if (res.code === 200) {
+ const path = res.data.route.paths[0]
this.distance = path.distance
this.duration = path.duration
const points = []
@@ -523,11 +532,7 @@
})
this.routePoints = points
this.$forceUpdate()
- } else {
- console.log('No route data returned:', res)
}
- }).catch(err => {
- console.log('璺緞瑙勫垝澶辫触', err)
})
},
@@ -668,15 +673,31 @@
return
}
uni.showLoading({ title: '涓婁紶涓�...' })
+ uni.getLocation({
+ type: 'gcj02',
+ success: (locationRes) => {
+ this.doUploadPhotos(locationRes.latitude, locationRes.longitude)
+ },
+ fail: () => {
+ this.doUploadPhotos(null, null)
+ }
+ })
+ },
+
+ doUploadPhotos(latitude, longitude) {
const uploadTasks = this.uploadedPhotos.map(path => {
return new Promise((resolve, reject) => {
+ const formData = { folder: 'orders' }
+ if (latitude && longitude) {
+ formData.latitude = latitude
+ formData.longitude = longitude
+ }
+ console.log('formData:', formData)
uni.uploadFile({
url: this.$baseUrl + 'web/public/upload',
filePath: path,
name: 'file',
- formData: {
- folder: 'order'
- },
+ formData: formData,
success: (uploadRes) => {
const data = JSON.parse(uploadRes.data)
if (data.code === 200) {
@@ -699,6 +720,10 @@
orderId: this.orderId,
remark: this.photoRemark
}
+ if (latitude && longitude) {
+ params.latitude = latitude
+ params.longitude = longitude
+ }
return this.$u.api[api](params)
}).then(res => {
uni.hideLoading()
--
Gitblit v1.9.3