From e8d258576a34f35cfefbd6bfe07b7f22e72d87d4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/partner/order-manage/order-manage.vue | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/sub_pages/partner/order-manage/order-manage.vue b/sub_pages/partner/order-manage/order-manage.vue
index 5c13c51..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>
--
Gitblit v1.9.3