From 4beea1ee97f194ef35d477e18604dd91436acfa3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 14 九月 2024 18:34:03 +0800
Subject: [PATCH] update merge
---
sub_pages/partner/order-manage/order-manage.vue | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/sub_pages/partner/order-manage/order-manage.vue b/sub_pages/partner/order-manage/order-manage.vue
index 66ea822..8e9de6d 100644
--- a/sub_pages/partner/order-manage/order-manage.vue
+++ b/sub_pages/partner/order-manage/order-manage.vue
@@ -16,38 +16,43 @@
<view>
订单：{{ item.orderNo }}
</view>
- <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount }}</view>
+ <view class="status t-red m-l-a m-r-0">{{ item.paymentAmount || '' }}</view>
</view>
- <view class="desc flex">
- <view class="label">
- 订单状态:
- </view>
- <view class="value">{{ item.statusBackendStr }}</view>
- </view>
- <view class="desc flex">
- <view class="label">
- 收货人:
- </view>
- <view class="value">{{ item.customer }}</view>
- </view>
- <view class="desc flex">
- <view class="label">
- 收货人手机号码:
- </view>
- <view class="value">{{ item.customerTel }}</view>
- </view>
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 订单状态:
+ </view>
+ <view class="value">{{ item.statusBackendStr }}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 支付时间:
+ </view>
+ <view class="value">{{ item.paymentTime||'-' }}</view>
+ </view>
+ </view>
+ <ivew class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人:
+ </view>
+ <view class="value">{{ item.customer ||'-'}}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人手机号码:
+ </view>
+ <view class="value">{{ item.customerTel ||'-'}}</view>
+ </view>
+ </ivew>
<view class="desc flex">
<view class="label">
收货地址:
</view>
- <view class="value">{{ item.customerAddress }}</view>
+ <view class="value">{{ item.customerAddress ||'-'}}</view>
</view>
- <view class="desc flex">
- <view class="label">
- 支付时间:
- </view>
- <view class="value">{{ item.paymentTime }}</view>
- </view>
+
<view class="button-green-1" v-if="false">确认配送完成</view>
</view>
@@ -72,12 +77,11 @@
}
},
onLoad() {
- this.listApi = `/api/partner/list`
+ this.listApi = `/api/partner/order/list`
this.getList()
},
onReachBottom() {
- this.page.current += 1
this.getMore()
},
async onPullDownRefresh() {
--
Gitblit v1.9.3