From e795470d418a36b8ad9b347465b10cae7ae600f3 Mon Sep 17 00:00:00 2001
From: wangzhen <37717239@qq.com>
Date: Thu, 22 Apr 2021 12:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug.wz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 2 +-
pages/agent/detail/index.js | 8 +-
pages/agent/detail/index.wxml | 150 ----------------------------------
3 files changed, 6 insertions(+), 154 deletions(-)
diff --git a/app.js b/app.js
index a4be9df..1b33a91 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
//app.js
App({
//----------------------------------------------globalData--------------------------------------
- evn: 0,//0:开发环境，1：测试环境，2：生产环境
+ evn: 1,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152,
diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js
index b550a06..7ec9eeb 100644
--- a/pages/agent/detail/index.js
+++ b/pages/agent/detail/index.js
@@ -43,10 +43,12 @@ Page({
// 全额
if (util.isEmpty(element.activityOrderAuditPassNum)) {
element.sumAmount = math.times(element.weightnoteInfo.settleUtiPrice, element.weightnoteInfo.settleWeight)
- if (element.surcharge) {
- element.orderType =1
- } else {
+ if (element.unitSurcharge!=null&element.surcharge !=null&&element.surcharge == math.times(element.weightnoteInfo.netWeight, element.unitSurcharge)) {
+ //按照净重,计算代卖费
element.orderType = 0
+ } else {
+ //按照结算重量计算代卖费
+ element.orderType = 1
}
} else {
if (element.weightnoteInfo.netWeight) {
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index 7569bea..1c5ae2d 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -466,156 +466,6 @@
-
-
-
- 结算单价
- {{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}}
-
-
- 净重
- {{formate.formateWeight(item.weightnoteInfo.netWeight)}}
-
-
- 结算重量
- {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
-
-
- 扣点
- {{item.weightnoteInfo.deductedPoint}}%
-
-
- 代卖费
- {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}
-
-
- 调节费
- {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
-
-
- 磅单图片
-
-
-
-
-
-
-
-
- 预计总金额
- {{formate.formateAmount(item.preTotalMoney)}}元
-
-
- 结算单价 x 净重
- {{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}
-
-
- 首笔应收金额
- {{formate.formateAmount(item.prepayMoney)}}元
-
-
- 预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}
- {{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}
-
-
- 代卖费
- {{formate.formateAmount(item.proxyAmount) || 0}}元
-
-
- 代卖费单价 x 净重
- {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}
-
-
- 首笔实收金额：
- {{formate.formateAmount(item.preSettleMoney)}}元
-
-
-
-
-
-
- 预计总金额
- {{formate.formateAmount(item.preTotalMoney)}}元
-
-
- 结算单价 x 净重
- {{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}
-
-
- 首笔应收金额
- {{formate.formateAmount(item.prepayMoney)}}元
-
-
- 预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}
- {{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}
-
-
- 代卖费
- {{formate.formateAmount(item.proxyAmount) || 0}}元
-
-
- 代卖费单价 x 净重
- {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}
-
-
- 首笔实收金额：
- {{formate.formateAmount(item.preSettleMoney)}}元
-
-
-
-
- 未结算金额
- {{formate.formateAmount(item.unSettleMoney)}}元
-
-
- 单价 x 结算重量 - 首笔应收金额
- {{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} - {{formate.formateAmount(item.prepayMoney)}}元
-
-
- 调节费
- -{{formate.formateAmount(item.adjustMoney)}}元
-
-
- 尾款实收金额：
- {{formate.formateAmount(item.finalPayMoney)}}元
-
-
- 总收款金额：
- {{formate.formateAmount(item.finalSettlePrice)}}元
-
-
-
-
-
-
- 总金额
- {{formate.formateAmount(item.sumAmount)}}元
-
-
- 结算单价 x 结算重量
- {{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
-
-
- 代卖费
- {{formate.formateAmount(item.surcharge) || 0}}元
-
-
- 代卖费单价 x 结算重量
- {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
-
-
- 调节费
- {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
-
-
- 代卖费单价 x 净重
- {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}
-
-
- 总收款金额：
- {{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元
-
-
订单信息