From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index a0ac80b..bb5c1ab 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -49,6 +49,12 @@
class="desc-gray m-r-5">合计</span>￥{{item.totalAmount||'0.00'}}</view>
</view>
</view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">订单号</view>
+ <view class="value">{{item.orderNo||'-'}}</view>
+ </view>
+ </view>
<view v-if="item.status">
@@ -239,7 +245,8 @@
if (this.list) {
for (var item of this.list) {
if (!item.status) {
- v += item.totalAmount || 0
+ // v += item.totalAmount || 0
+ v += item.income || 0
} else {
v += (item.income || 0)
}
--
Gitblit v1.9.3