libo
/
ztb-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

修改bug.wz

featrue/v4.3
wangzhen 5 years ago
parent
82e664fe86
commit
e795470d41
3 changed files with 6 additions and 154 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.js
  2. 8
      pages/agent/detail/index.js
  3. 150
      pages/agent/detail/index.wxml

2
app.js
View File

@ -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,

8
pages/agent/detail/index.js
View File

@ -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) {

150
pages/agent/detail/index.wxml
View File

@ -466,156 +466,6 @@
</view>
<view class="bg-white margin-top"></view>
<wux-accordion-group wx:if="{{orderInfo}}">
<view class="bg-white" wx:if="{{item.weightnoteInfo && item.weightnoteInfo.id}}" style="padding: 24rpx 30rpx">
<view class="flex flex-justify text-sg">
<text class="text-black">结算单价</text>
<text class="text-gray">{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx">
<text class="text-black">净重</text>
<text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.netWeight)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.settleWeight}}">
<text class="text-black">结算重量</text>
<text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.deductedPoint}}">
<text class="text-black">扣点</text>
<text class="text-gray">{{item.weightnoteInfo.deductedPoint}}%</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx">
<text class="text-black">代卖费</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx">
<text class="text-black">调节费</text>
<text class="text-gray">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx">
<text class="text-black">磅单图片</text>
</view>
<view style="margin-top:20rpx">
<sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}"></sudoku-image>
</view>
</view>
<!-- 预付款 -->
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum == 1}}">
<view class="flex flex-justify text-sg">
<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">
<text class="text-gray">结算单价 x 净重</text>
<text class="text-gray">{{formate.formatePrice2(item.unitPrice)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<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">
<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>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<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">
<text class="text-gray">代卖费单价 x 净重</text>
<text class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</text>
</view>
<view class="flex text-sg" style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
<text class="text-black text-bold">首笔实收金额：</text>
<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
</view>
</view>
<!-- 尾款 -->
<view wx:elif="{{item.activityOrderAuditPassNum == 2}}">
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
<view class="flex flex-justify text-sg">
<text class="text-black">预计总金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.preTotalMoney)}}元</text>
</view>
<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>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<text class="text-black">首笔应收金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.prepayMoney)}}元</text>
</view>
<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>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<text class="text-black">代卖费</text>
<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
</view>
<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>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
<text class="text-black text-bold">首笔实收金额：</text>
<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
</view>
</view>
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
<view class="flex flex-justify text-sg">
<text class="text-black">未结算金额</text>
<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">{{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 && item.adjustMoney != 0}}">
<text class="text-black">调节费</text>
<text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
<text class="text-black text-bold">尾款实收金额：</text>
<text style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
</view>
<view class="flex flex-justify text-sg" style=";margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
<text class="text-black text-bold">总收款金额：</text>
<text style="color:#F5222D">{{formate.formateAmount(item.finalSettlePrice)}}元</text>
</view>
</view>
</view>
<!-- 全款 -->
<view wx:if="{{item.activityOrderAuditPassNum == 3||orderInfo.activityId==null}}" class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
<view class="flex flex-justify text-sg">
<text class="text-black">总金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text>
</view>
<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>
<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.surcharge) || 0}}元</text>
</view>
<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==null?0:item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</text>
</view>
<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx" wx:if="{{item.adjustMoney && item.adjustMoney}}">
<text class="text-black">调节费</text>
<text style="color:#F5222D">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</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 flex-justify text-sg" style="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>
</view>
<wux-accordion>
<view slot="header" class="text-gray">订单信息</view>
<view class="flex flex-justify text-sg">

Write Preview
Loading…
Cancel
Save