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-settlement/order-settlement.vue | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index f76c55c..ad8e7fc 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -18,6 +18,16 @@
</view>
<view class="line"></view>
<view class="form">
+ <!-- <view class="flex">
+ <view class="form-item flex1">
+ <view class="label">结算对象</view>
+ <view class="value">{{item.userName||''}}</view>
+ </view>
+ <view class="form-item flex1">
+ <view class="label"></view>
+ <view class="value"></view>
+ </view>
+ </view> -->
<view class="flex">
<view class="form-item flex1">
<view class="label">结算单价/均价</view>
@@ -25,37 +35,47 @@
</view>
<view class="form-item flex1">
<view class="label">商品数量</view>
- <view class="value">{{item.flowerNum||0}}</view>
+ <view class="value">{{item.flowerNum||0}}扎</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">订单数量</view>
- <view class="value">{{item.orderNum}}</view>
+ <view class="value">{{item.orderNum}}单</view>
</view>
<view class="form-item">
<view class="label">买家数量</view>
- <view class="value">{{item.customerNum}}</view>
+ <view class="value">{{item.customerNum}}个</view>
</view>
</view>
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
- <view class="value">{{item.serviceFee}}</view>
+ <view class="value">￥{{item.serviceFee||0}}</view>
</view>
<view class="form-item">
<view class="label">售后理赔</view>
- <view class="value">{{item.salesFee}}</view>
+ <view class="value">￥{{item.salesFee||0}}</view>
</view>
</view>
<view class="flex">
<view class="form-item">
- <view class="label">质检扣款</view>
- <view class="value">{{item.checkFee}}</view>
+ <view class="label">缺货扣款</view>
+ <view class="value">￥{{item.lackFee||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">补货扣款</view>
+ <view class="value">￥{{item.replaceFee||0}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">降级扣款</view>
+ <view class="value">￥{{item.checkFee||0}}</view>
</view>
<view class="form-item">
<view class="label">集货站运费</view>
- <view class="value">{{item.stationFee}}</view>
+ <view class="value">￥{{item.stationFee||0}}</view>
</view>
</view>
</view>
--
Gitblit v1.9.3