From 3f9032e92fdd383bfefc87a0bec9b242e1223851 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 09 六月 2026 17:08:44 +0800
Subject: [PATCH] 改bug
---
app/pages/index/index.vue | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 61 insertions(+), 30 deletions(-)
diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue
index b944afc..a3695b9 100644
--- a/app/pages/index/index.vue
+++ b/app/pages/index/index.vue
@@ -341,13 +341,9 @@
this.scrollHeight = Math.max(windowHeight - this.headerHeight, 0)
if (this.userInfo.auditStatus === 99) return;
this.acceptingStatus = this.userInfo.acceptingStatus || 0
- this.$u.api.centerInfo().then(res => {
- if (res.code === 200) {
- this.acceptingStatus = res.data.acceptingStatus
- if (res.data.acceptingStatus === 1) {
- this.loadOrdersByTab(this.activeTab)
- }
- }
+ this.init()
+ uni.$on('locationPermissionGranted', () => {
+ this.init()
})
uni.$on('jiedanSuccess', () => {
this.loadOrdersByTab(this.activeTab)
@@ -398,6 +394,17 @@
},
methods: {
+ init() {
+ console.log('index-init')
+ this.$u.api.centerInfo().then(res => {
+ if (res.code === 200) {
+ this.acceptingStatus = res.data.acceptingStatus
+ if (res.data.acceptingStatus === 1) {
+ this.loadOrdersByTab(this.activeTab)
+ }
+ }
+ })
+ },
handleScrollToLower() {
if (this.acceptingStatus === 0) return;
this.hallPage++
@@ -506,12 +513,19 @@
})
},
getActiveOrderCount() {
- this.$u.api.activeOrderCount().then(res => {
- if (res.code === 200) {
- this.activeOrderCount = res.data
+ checkLocationPermission().then((granted) => {
+ if (granted) {
+ console.log('宸叉湁浣嶇疆鏉冮檺-璁㈠崟鏁伴噺')
+ this.$u.api.activeOrderCount().then(res => {
+ if (res.code === 200) {
+ this.activeOrderCount = res.data
+ }
+ }).catch((err) => {
+ this.activeOrderCount = null
+ })
+ } else {
+ console.log('杩樻病鏈変綅缃潈闄�-璁㈠崟鏁伴噺')
}
- }).catch((err) => {
- this.activeOrderCount = null
})
},
@@ -624,14 +638,17 @@
if (this.userInfo.auditStatus === 99) return;
if (this.acceptingStatus === 0) return;
if (tab === 'hall') {
+ console.log('鎶㈠崟澶у巺')
this.hallPage = 1
this.hallHasMore = true
this.orderList = []
this.getHallOrders()
} else if (tab === 'pickup') {
+ console.log('寰呭彇璐�')
this.pickupOrderList = []
this.getPickupOrders()
} else if (tab === 'delivering') {
+ console.log('閰嶉�佷腑')
this.deliveringOrderList = []
this.getDeliveringOrders()
}
@@ -672,7 +689,6 @@
}
}
- console.log('鎺ュ崟澶у巺:', { distance, gradeId, sortType })
this.$u.api.grabOrderHall({
capacity: this.hallPageSize,
page: this.hallPage,
@@ -682,7 +698,6 @@
sortType: sortType
}
}).then(res => {
- console.log('鎺ュ崟澶у巺', res)
this.hallLoading = false
if (res.code === 200) {
const list = res.data.records || []
@@ -701,30 +716,46 @@
getPickupOrders() {
if (this.acceptingStatus === 0) return;
if (this.pickupLoading) return
- this.pickupLoading = true
- this.$u.api.activeOrders({ status: 3 }).then(res => {
- console.log('寰呭彇璐�:', res)
- this.pickupLoading = false
- if (res.code === 200) {
- this.pickupOrderList = res.data.records || res.data || []
+
+ checkLocationPermission().then((granted) => {
+ if (granted) {
+ console.log('宸叉湁浣嶇疆鏉冮檺')
+ this.pickupLoading = true
+ this.$u.api.activeOrders({ status: 3 }).then(res => {
+ console.log('寰呭彇璐�:', res)
+ this.pickupLoading = false
+ if (res.code === 200) {
+ this.pickupOrderList = res.data.records || res.data || []
+ }
+ }).catch((err) => {
+ this.pickupLoading = false
+ })
+ } else {
+ console.log('杩樻病鏈変綅缃潈闄�')
}
- }).catch((err) => {
- this.pickupLoading = false
})
},
getDeliveringOrders() {
if (this.acceptingStatus === 0) return;
if (this.deliveringLoading) return
- this.deliveringLoading = true
- this.$u.api.activeOrders({ status: 4 }).then(res => {
- console.log('閰嶉�佷腑:', res)
- this.deliveringLoading = false
- if (res.code === 200) {
- this.deliveringOrderList = res.data || []
+
+ checkLocationPermission().then((granted) => {
+ if (granted) {
+ console.log('宸叉湁浣嶇疆鏉冮檺')
+ this.deliveringLoading = true
+ this.$u.api.activeOrders({ status: 4 }).then(res => {
+ console.log('閰嶉�佷腑:', res)
+ this.deliveringLoading = false
+ if (res.code === 200) {
+ this.deliveringOrderList = res.data || []
+ }
+ }).catch((err) => {
+ this.deliveringLoading = false
+ })
+ } else {
+ console.log('杩樻病鏈変綅缃潈闄�')
}
- }).catch((err) => {
- this.deliveringLoading = false
})
},
--
Gitblit v1.9.3