From 58fb83367d9a08058f4323b518fe7a3ca5b68436 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 5 Mar 2021 22:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8D=96=E8=AE=A2=E5=8D=95=E8=AF=A6?=
=?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/agent/detail/index.js | 5 +-
pages/agent/detail/index.wxml | 97 +++++++++++++++++++------
pages/agent/factory-fragment/index.wxml | 4 +-
pages/shop/index/index.js | 1 -
4 files changed, 79 insertions(+), 28 deletions(-)
diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js
index e085b81..7778391 100644
--- a/pages/agent/detail/index.js
+++ b/pages/agent/detail/index.js
@@ -1,7 +1,8 @@
// pages/agent/detail/index.js
import { getProxyOrderInfo, cancelProxyOrder, cancelReservation, cancelProxyOrderItem } from "../../api/ztb"
const util = require('../../../utils/util')
-const event = require('../../../utils/event.js')
+const math = require('../../../utils/math')
+const event = require('../../../utils/event')
const app = getApp()
Page({
@@ -32,8 +33,8 @@ Page({
for (let index = 0; index < result.data.orderItems.length; index++) {
const element = result.data.orderItems[index]
if(element.weightnoteInfo && element.weightnoteInfo.id){
+ element.proxyAmount = math.times(element.weightnoteInfo.settleWeight, element.unitSurcharge)
this.data.cancel = false
- break
}
}
this.setData({orderInfo: result.data, safeBottom: app.globalData.safeBottom, cancel: this.data.cancel })
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index 57e24e1..4c353de 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -37,24 +37,75 @@
扣点
{{item.weightnoteInfo.deductedPoint}}%
+
+ 代卖费
+ {{formate.formatePrice2(item.unitSurcharge)}}
+
磅单图片
-
-
+
-
- 信息费
- {{formate.formatePrice2(item.unitSurcharge)}}
+
+
+
+ 预计总金额
+ {{formate.formateAmount(item.preTotalMoney)}}元
+
+
+ 预计收款金额
+
+ {{formate.formateAmount(item.preSettleMoney)}}元
+ ({{'首款70%'}})
+
+
+
+ 代卖费
+ -{{formate.formateAmount(item.proxyAmount)}}元
+
+
+ 预计结算金额：
+ {{formate.formateAmount(item.settlePrice)}}元
+
-
- 调节费
- {{item.adjustMoney}}
+
+
+
+ 总金额
+ {{formate.formateAmount(item.settlePrice)}}元
+
+
+ 调节费
+ -{{formate.formateAmount(item.adjustMoney)}}元
+
+
+ 已结算金额：
+ -{{formate.formateAmount(item.preSettleMoney)}}元
+
+
+ 剩余结算金额：
+ {{formate.formateAmount(item.finalPayMoney)}}元
+
-
- 结算金额
- {{item.weightnoteInfo.settlePrice}}
+
+
+
+ 总金额
+ {{formate.formateAmount(item.preTotalMoney)}}元
+
+
+ 调节费
+ {{formate.formateAmount(item.adjustMoney)}}元
+
+
+ 代卖费
+ -{{formate.formateAmount(item.proxyAmount)}}元
+
+
+ 结算金额：
+ {{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元
+
@@ -64,17 +115,17 @@
纸厂开户账号
- {{orderInfo.millSupplierId}}
- 复制
+ {{orderInfo.millSupplierId || ''}}
+ 复制
纸厂订单号
- {{orderInfo.millDeliveryOrderId}}
+ {{orderInfo.millDeliveryOrderId || ''}}
货到时间
- {{orderInfo.paperMillDeliveryTime}}
+ {{orderInfo.paperMillDeliveryTime || ''}}
信息费
@@ -129,17 +180,17 @@
纸厂开户账号
- {{orderInfo.millSupplierId}}
- 复制
+ {{orderInfo.millSupplierId || ''}}
+ 复制
纸厂订单号
- {{orderInfo.millDeliveryOrderId}}
+ {{orderInfo.millDeliveryOrderId || ''}}
货到时间
- {{orderInfo.paperMillDeliveryTime}}
+ {{orderInfo.paperMillDeliveryTime || ''}}
信息费
@@ -225,17 +276,17 @@
纸厂开户账号
- {{orderInfo.millSupplierId}}
- 复制
+ {{orderInfo.millSupplierId || ''}}
+ 复制
纸厂订单号
- {{orderInfo.millDeliveryOrderId}}
+ {{orderInfo.millDeliveryOrderId || ''}}
货到时间
- {{orderInfo.paperMillDeliveryTime}}
+ {{orderInfo.paperMillDeliveryTime || ''}}
信息费
diff --git a/pages/agent/factory-fragment/index.wxml b/pages/agent/factory-fragment/index.wxml
index a1087e0..54462f2 100644
--- a/pages/agent/factory-fragment/index.wxml
+++ b/pages/agent/factory-fragment/index.wxml
@@ -13,8 +13,8 @@
{{loading? '正在加载' : '暂无数据'}}
-
-
+
+
diff --git a/pages/shop/index/index.js b/pages/shop/index/index.js
index 350d944..65dd25f 100644
--- a/pages/shop/index/index.js
+++ b/pages/shop/index/index.js
@@ -58,7 +58,6 @@ Page({
wx.hideLoading()
})
},
-
showDialog: function(){
this.wuxDialog.open({
resetOnClose: true,