Browse Source

no message

featrue/v4.3
xpz2018 5 years ago
parent
commit
1ab04ad440
2 changed files with 23 additions and 12 deletions
  1. 13
      pages/agent/detail/index.js
  2. 22
      pages/agent/detail/index.wxml

13
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
}

22
pages/agent/detail/index.wxml

@ -82,7 +82,7 @@
<text class="text-black">预计总金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
</view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx">
<view class="flex flex-justify text-xs" style="margin-top:2rpx">
<text class="text-gray">结算单价 x 净重</text>
<text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</text>
</view>
@ -90,7 +90,7 @@
<text class="text-black">首笔应收金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.prepayMoney)}}元</text>
</view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx">
<view class="flex flex-justify text-xs" style="margin-top:2rpx">
<text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
<text class="text-gray">{{formate.formateAmount(item.preTotalMoney)}}元 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
</view>
@ -98,7 +98,7 @@
<text class="text-black">代卖费</text>
<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
</view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx">
<view class="flex flex-justify text-xs" style="margin-top:2rpx">
<text class="text-gray">代卖费单价 x 净重</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</text>
</view>
@ -113,7 +113,7 @@
<text style="color:#F5222D">{{formate.formateAmount(item.unSettleMoney)}}元</text>
</view>
<view class="flex flex-justify text-xs" style="margin-top:2rpx">
<text class="text-gray">结算单价 x 结算重量 - 首笔应收金额</text>
<text class="text-gray">单价 x 结算重量 - 首笔应收金额</text>
<text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.settleWeight)}} - {{formate.formateAmount(item.prepayMoney)}}元</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx" wx:if="{{item.adjustMoney}}">
@ -136,7 +136,7 @@
<text class="text-black">总金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text>
</view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx">
<view class="flex flex-justify text-xs" style="margin-top:2rpx">
<text class="text-gray">结算单价 x 结算重量</text>
<text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
</view>
@ -146,13 +146,17 @@
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<text class="text-black">代卖费</text>
<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
<text style="color:#F5222D">{{formate.formateAmount(item.surcharge) || 0}}元</text>
</view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx">
<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.orderType == 1}}">
<text class="text-gray">代卖费单价 x 结算重量</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settletWeight)}}</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
</view>
<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:else>
<text class="text-gray">代卖费单价 x 净重</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
</view>
<view class="flex text-sg" style="justify-content: flex-end;margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
<view class="flex text-sg" style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
<text class="text-black text-bold">总收款金额:</text>
<text style="color:#F5222D">{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元</text>
</view>

Loading…
Cancel
Save