diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js index 269ce17..8168a96 100644 --- a/pages/agent/detail/index.js +++ b/pages/agent/detail/index.js @@ -33,11 +33,18 @@ Page({ for (let index = 0; index < result.data.orderItems.length; index++) { const element = result.data.orderItems[index] if(element.weightnoteInfo && element.weightnoteInfo.id){ - if(element.weightnoteInfo.netWeight){ - element.proxyAmount = math.times(element.weightnoteInfo.netWeight, element.unitSurcharge) - } + // 全额 if(util.isEmpty(element.activityOrderAuditPassNum)){ element.sumAmount = math.times(element.weightnoteInfo.settleUtiPrice, element.weightnoteInfo.settleWeight) + if(element.surcharge == math.times(element.weightnoteInfo.netWeight, element.unitSurcharge)){ + element.orderType = 0 + } else { + element.orderType = 1 + } + } else { + if(element.weightnoteInfo.netWeight){ + element.proxyAmount = math.times(element.weightnoteInfo.netWeight, element.unitSurcharge) + } } this.data.cancel = false } diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml index 8ec932e..9070b53 100644 --- a/pages/agent/detail/index.wxml +++ b/pages/agent/detail/index.wxml @@ -82,7 +82,7 @@ 预计总金额 {{formate.formateAmount(item.preTotalMoney)}}元 - + 结算单价 x 净重 {{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}} @@ -90,7 +90,7 @@ 首笔应收金额 {{formate.formateAmount(item.prepayMoney)}}元 - + 预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}} {{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}} @@ -98,7 +98,7 @@ 代卖费 {{formate.formateAmount(item.proxyAmount) || 0}}元 - + 代卖费单价 x 净重 {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}} @@ -113,7 +113,7 @@ {{formate.formateAmount(item.unSettleMoney)}}元 - 结算单价 x 结算重量 - 首笔应收金额 + 单价 x 结算重量 - 首笔应收金额 {{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} - {{formate.formateAmount(item.prepayMoney)}}元 @@ -136,7 +136,7 @@ 总金额 {{formate.formateAmount(item.sumAmount)}}元 - + 结算单价 x 结算重量 {{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}} @@ -146,13 +146,17 @@ 代卖费 - {{formate.formateAmount(item.proxyAmount) || 0}}元 + {{formate.formateAmount(item.surcharge) || 0}}元 - + 代卖费单价 x 结算重量 - {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settletWeight)}} + {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}} + + + 代卖费单价 x 净重 + {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}} - + 总收款金额: {{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元