From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/partner/delivery/delivery.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 771a62f..1311844 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -30,17 +30,17 @@
type: 'DELIVERY_ORDER_STATUS'
}
}).then(res => {
- var data = res.data
+ var data = res.data||[]
this.status_columns = [data || []]
this.status_columns[0].unshift({
label: '全部',
value: ''
})
+ console.log('status_columns',this.status_columns)
})
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
@@ -60,8 +60,8 @@
},
select_status(e) {
this.show_select_status = false
- this.query.statusStr = e.value[0].name
- this.query.status = e.value[0].id
+ this.query.statusStr = e.value[0].label
+ this.query.status = e.value[0].value
this.refreshList()
},
toDetail(item) {
@@ -161,7 +161,7 @@
<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
<u-picker @confirm="select_station" keyName="name" @cancel="show_select_station=false"
:show="show_select_station" :columns="columns_station"></u-picker>
- <u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false" :show="show_select_status"
+ <u-picker @confirm="select_status" keyName="label" @cancel="show_select_status=false" :show="show_select_status"
:columns="status_columns"></u-picker>
--
Gitblit v1.9.3