From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
app/pages/order-detail/order-detail.vue | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 40 deletions(-)
diff --git a/app/pages/order-detail/order-detail.vue b/app/pages/order-detail/order-detail.vue
index 7fb7fe5..5e481af 100644
--- a/app/pages/order-detail/order-detail.vue
+++ b/app/pages/order-detail/order-detail.vue
@@ -22,9 +22,6 @@
:enable-zoom="true"
:enable-scroll="true"
></map>
- <view class="order-detail-page__map-bubble">
- <text class="order-detail-page__map-bubble-text">{{ distance > 0 ? `鍓╀綑${(distance / 1000).toFixed(1)}km锛岀害${Math.ceil(duration / 60)}鍒嗛挓` : '姝ｅ湪鑾峰彇浣嶇疆淇℃伅...' }}</text>
- </view>
</view>
<view class="order-detail-page__status-bar">
@@ -287,7 +284,7 @@
</template>
<script>
-import image from 'uview-ui/libs/config/props/image';
+ import { mapState } from 'vuex'
export default {
data() {
@@ -306,8 +303,10 @@
showGrabModal: false,
currentLocation: null,
routePoints: [],
+ locationTimer: null,
distance: 0,
duration: 0,
+ isWithinOperationRadius: true,
statusTextMap: {
2: '寰呮帴鍗�',
3: '寰呭彇璐�',
@@ -321,6 +320,7 @@
}
},
computed: {
+ ...mapState(['userInfo']),
formattedRemainTime() {
const minutes = this.orderDetail.remainMinutes
if (!minutes) return null
@@ -335,11 +335,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
@@ -373,7 +371,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 = [
@@ -384,10 +382,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
]
@@ -457,12 +451,52 @@
this.topFixedHeight = uni.upx2px(500 + 92)
if (this.orderId) {
this.getOrderDetail()
+ this.initOperationRadius()
}
},
+
+ onUnload() {
+ if (this.locationTimer) {
+ clearInterval(this.locationTimer)
+ this.locationTimer = null
+ }
+ },
+
methods: {
handleBack() {
uni.navigateBack({ delta: 1 });
},
+
+ initOperationRadius() {
+ uni.getLocation({
+ type: 'gcj02',
+ success: (res) => {
+ this.$u.api.checkDriverOperationRadius({
+ lat: res.latitude,
+ lng: res.longitude,
+ orderId: this.orderId
+ }).then(res => {
+ if (res.code === 200) {
+ this.isWithinOperationRadius = res.data
+ if (!this.isWithinOperationRadius) {
+ uni.showToast({
+ title: '鎮ㄥ綋鍓嶄綅缃笌鏀惰揣鍦板潃璺濈瓒呭嚭鑼冨洿锛岃鍦ㄥ湴鍧�闄勮繎閲嶆柊鎷嶇収',
+ icon: 'none'
+ })
+ }
+ }
+ })
+ },
+ fail: () => {
+ this.isWithinOperationRadius = false
+ uni.showToast({
+ title: '鎮ㄥ綋鍓嶄綅缃潈闄愭病鏈夊紑鍚紝璇峰厛寮�鍚悗鍐嶆潵鎿嶄綔',
+ icon: 'none'
+ })
+ }
+ })
+ },
+
getOrderDetail() {
this.$u.api.orderDetail({ orderId: this.orderId }).then(res => {
if (res.code === 200) {
@@ -480,6 +514,13 @@
},
getCurrentLocation() {
+ this.fetchLocation()
+ this.locationTimer = setInterval(() => {
+ this.fetchLocation()
+ }, 60000)
+ },
+
+ fetchLocation() {
uni.getLocation({
type: 'gcj02',
success: (res) => {
@@ -505,11 +546,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 = []
@@ -526,11 +567,7 @@
})
this.routePoints = points
this.$forceUpdate()
- } else {
- console.log('No route data returned:', res)
}
- }).catch(err => {
- console.log('璺緞瑙勫垝澶辫触', err)
})
},
@@ -597,6 +634,13 @@
}
if (action === 'pickup' || action === 'deliver') {
+ if (!this.isWithinOperationRadius) {
+ uni.showToast({
+ title: '鎮ㄥ綋鍓嶄綅缃笌鏀惰揣鍦板潃璺濈瓒呭嚭鑼冨洿锛岃鍦ㄥ湴鍧�闄勮繎閲嶆柊鎷嶇収',
+ icon: 'none'
+ })
+ return
+ }
this.uploadedPhotos = []
this.photoRemark = ''
this.photoPopupMode = action
@@ -671,15 +715,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) {
@@ -701,6 +761,10 @@
images: images.map(img => img.imgaddr),
orderId: this.orderId,
remark: this.photoRemark
+ }
+ if (latitude && longitude) {
+ params.latitude = latitude
+ params.longitude = longitude
}
return this.$u.api[api](params)
}).then(res => {
@@ -771,22 +835,6 @@
&__map {
width: 750rpx;
height: 500rpx;
- }
-
- &__map-bubble {
- position: absolute;
- left: 34rpx;
- bottom: 32rpx;
- padding: 12rpx 18rpx;
- border-radius: 14rpx;
- background: rgba(255, 255, 255, 0.96);
- box-shadow: 0 8rpx 18rpx rgba(23, 74, 163, 0.12);
- }
-
- &__map-bubble-text {
- font-size: 24rpx;
- font-weight: 600;
- color: #2f6ff2;
}
&__status-bar {
--
Gitblit v1.9.3