From 445d903c214a61e7ab6132e6c59f43ffdbe3844b Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Wed, 12 May 2021 11:57:05 +0800
Subject: [PATCH] =?UTF-8?q?--=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E8=A1=A5?=
=?UTF-8?q?=E8=B4=B4=E4=B8=8E=E6=89=A3=E6=AC=BE--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 2 +-
.../detail/item-money-info/money-info.wxml | 11 +++++
pages/agent/detail/pound-info/pound-info.json | 4 +-
pages/agent/detail/pound-info/pound-info.wxml | 41 +++++++++++++++++++
pages/agent/detail/pound-info/pound-info.wxss | 3 ++
5 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/app.js b/app.js
index 6b9d64e..6bb01c5 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
//app.js
App({
//----------------------------------------------globalData--------------------------------------
- evn: 1,//0:开发环境，1：测试环境，2：生产环境
+ evn: 0,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
version: 152,
diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml
index deb6bf1..ab64d82 100644
--- a/pages/agent/detail/item-money-info/money-info.wxml
+++ b/pages/agent/detail/item-money-info/money-info.wxml
@@ -64,6 +64,12 @@
调节费
-{{formate.formateAmount(item.adjustMoney)}}元
+
+ 补贴与扣款
+ {{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
+
+
尾款实收金额：
{{formate.formateAmount(item.finalPayMoney)}}元
@@ -105,6 +111,11 @@
调节费
{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
+
+ 补贴与扣款
+ {{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
+
总收款金额：
{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元
diff --git a/pages/agent/detail/pound-info/pound-info.json b/pages/agent/detail/pound-info/pound-info.json
index 50aea4d..6079606 100644
--- a/pages/agent/detail/pound-info/pound-info.json
+++ b/pages/agent/detail/pound-info/pound-info.json
@@ -2,6 +2,8 @@
"component": true,
"usingComponents": {
"wux-image": "/components/image/index",
- "sudoku-image": "/components/sudoku-image/index"
+ "sudoku-image": "/components/sudoku-image/index",
+ "wux-accordion-group": "/components/accordion-group/index",
+ "wux-accordion": "/components/accordion/index"
}
}
\ No newline at end of file
diff --git a/pages/agent/detail/pound-info/pound-info.wxml b/pages/agent/detail/pound-info/pound-info.wxml
index 9e30d67..f6aee11 100644
--- a/pages/agent/detail/pound-info/pound-info.wxml
+++ b/pages/agent/detail/pound-info/pound-info.wxml
@@ -24,6 +24,47 @@
代卖费
{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}
+
+
+
+
+
+
+ 补贴与扣款
+
+ {{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
+
+
+ 运费补贴
+ {{formate.formateAmount(item.freightSubsidies==null?0:item.freightSubsidies)}}元
+
+
+ 其他补贴
+ {{formate.formateAmount(item.otherSubsidies==null?0:item.otherSubsidies)}}元
+
+
+ 违禁物品扣款
+ {{formate.formateAmount(item.contrabandPenalty==null?0:item.contrabandPenalty)}}元
+
+
+ 装车不规范扣款
+ {{formate.formateAmount(item.nonStandardPenalty==null?0:item.nonStandardPenalty)}}元
+
+
+ 其他扣款
+ {{formate.formateAmount(item.otherPenalty==null?0:item.otherPenalty)}}元
+
+
+ 总计
+ {{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元
+
+
+ 备注
+ {{item.remark==null? '':item.remark}}
+
+
+
+
调节费
{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
diff --git a/pages/agent/detail/pound-info/pound-info.wxss b/pages/agent/detail/pound-info/pound-info.wxss
index 00093ad..3d5f84c 100644
--- a/pages/agent/detail/pound-info/pound-info.wxss
+++ b/pages/agent/detail/pound-info/pound-info.wxss
@@ -13,4 +13,7 @@
display: flex;
align-items: center;
justify-content: center;
+}
+.wux-accordion__hd{
+padding: 0px;
}
\ No newline at end of file