From fa4c7baec36d58b4bdca66159ece743b5a45a9c8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 六月 2026 10:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/pages/order/order.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app/pages/order/order.vue b/app/pages/order/order.vue
index fee7f58..ca8afcc 100644
--- a/app/pages/order/order.vue
+++ b/app/pages/order/order.vue
@@ -152,6 +152,8 @@
</template>
<script>
+ import { chooseImageWithNotice, getLocationWithNotice } from '@/utils/utils'
+
export default {
data() {
return {
@@ -371,7 +373,7 @@
this.checkOperationRadius(item.id, 'deliver')
},
checkOperationRadius(orderId, mode) {
- uni.getLocation({
+ getLocationWithNotice({
type: 'gcj02',
success: (res) => {
this.$u.api.checkDriverOperationRadius({
@@ -398,11 +400,11 @@
},
fail: () => {
uni.showToast({
- title: '鏃犳硶鑾峰彇鎮ㄧ殑浣嶇疆淇℃伅',
+ title: '鏃犳硶鑾峰彇鎮ㄧ殑浣嶇疆淇℃伅锛岃鍓嶅線璁剧疆寮�鍚畾浣嶆潈闄�',
icon: 'none'
})
}
- })
+ }).catch(() => {})
},
closePhotoPopup() {
this.showPhotoPopup = false
@@ -412,24 +414,24 @@
uni.showToast({ title: '鏈�澶氫笂浼�3寮犵収鐗�', icon: 'none' })
return
}
- uni.chooseImage({
+ chooseImageWithNotice({
count: 3 - this.uploadedPhotos.length,
sourceType: ['camera', 'album'],
success: (res) => {
this.uploadedPhotos = [...this.uploadedPhotos, ...res.tempFilePaths]
}
- })
+ }).catch(() => {})
},
deletePhoto(index) {
this.uploadedPhotos.splice(index, 1)
},
- submitPhotoPopup() {
+ submitPhotoPopup() {
if (this.uploadedPhotos.length === 0) {
uni.showToast({ title: '璇蜂笂浼犵収鐗�', icon: 'none' })
return
}
uni.showLoading({ title: '涓婁紶涓�...' })
- uni.getLocation({
+ getLocationWithNotice({
type: 'gcj02',
success: (locationRes) => {
this.doUploadPhotos(locationRes.latitude, locationRes.longitude)
@@ -437,6 +439,8 @@
fail: () => {
this.doUploadPhotos(null, null)
}
+ }).catch(() => {
+ this.doUploadPhotos(null, null)
})
},
--
Gitblit v1.9.3