From a84efbee3b1c835f11277e523114df5233c210b5 Mon Sep 17 00:00:00 2001
From: wangzhen <37717239@qq.com>
Date: Thu, 22 Apr 2021 20:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=81=9A=E4=BB=A3=E5=8D=96=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E3=80=82wz?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/delivery-info/delivery-info.js | 26 +
.../detail/delivery-info/delivery-info.json | 6 +
.../detail/delivery-info/delivery-info.wxml | 28 +
.../detail/delivery-info/delivery-info.wxss | 16 +
pages/agent/detail/header-info/header-info.js | 26 +
.../agent/detail/header-info/header-info.json | 5 +
.../agent/detail/header-info/header-info.wxml | 7 +
.../agent/detail/header-info/header-info.wxss | 16 +
pages/agent/detail/index.json | 10 +-
pages/agent/detail/index.wxml | 526 ++----------------
.../detail/item-car-info/item-car-info.js | 28 +
.../detail/item-car-info/item-car-info.json | 13 +
.../detail/item-car-info/item-car-info.wxml | 24 +
.../detail/item-car-info/item-car-info.wxss | 16 +
.../detail/item-money-info/money-info.js | 28 +
.../detail/item-money-info/money-info.json | 4 +
.../detail/item-money-info/money-info.wxml | 137 +++++
.../detail/item-money-info/money-info.wxss | 16 +
pages/agent/detail/order-info/order-info.js | 27 +
pages/agent/detail/order-info/order-info.json | 13 +
pages/agent/detail/order-info/order-info.wxml | 24 +
pages/agent/detail/order-info/order-info.wxss | 16 +
pages/agent/detail/pound-info/pound-info.js | 28 +
pages/agent/detail/pound-info/pound-info.json | 7 +
pages/agent/detail/pound-info/pound-info.wxml | 38 ++
pages/agent/detail/pound-info/pound-info.wxss | 16 +
.../agent/detail/reserve-info/reserve-info.js | 26 +
.../detail/reserve-info/reserve-info.json | 13 +
.../detail/reserve-info/reserve-info.wxml | 30 +
.../detail/reserve-info/reserve-info.wxss | 16 +
30 files changed, 714 insertions(+), 472 deletions(-)
create mode 100644 pages/agent/detail/delivery-info/delivery-info.js
create mode 100644 pages/agent/detail/delivery-info/delivery-info.json
create mode 100644 pages/agent/detail/delivery-info/delivery-info.wxml
create mode 100644 pages/agent/detail/delivery-info/delivery-info.wxss
create mode 100644 pages/agent/detail/header-info/header-info.js
create mode 100644 pages/agent/detail/header-info/header-info.json
create mode 100644 pages/agent/detail/header-info/header-info.wxml
create mode 100644 pages/agent/detail/header-info/header-info.wxss
create mode 100644 pages/agent/detail/item-car-info/item-car-info.js
create mode 100644 pages/agent/detail/item-car-info/item-car-info.json
create mode 100644 pages/agent/detail/item-car-info/item-car-info.wxml
create mode 100644 pages/agent/detail/item-car-info/item-car-info.wxss
create mode 100644 pages/agent/detail/item-money-info/money-info.js
create mode 100644 pages/agent/detail/item-money-info/money-info.json
create mode 100644 pages/agent/detail/item-money-info/money-info.wxml
create mode 100644 pages/agent/detail/item-money-info/money-info.wxss
create mode 100644 pages/agent/detail/order-info/order-info.js
create mode 100644 pages/agent/detail/order-info/order-info.json
create mode 100644 pages/agent/detail/order-info/order-info.wxml
create mode 100644 pages/agent/detail/order-info/order-info.wxss
create mode 100644 pages/agent/detail/pound-info/pound-info.js
create mode 100644 pages/agent/detail/pound-info/pound-info.json
create mode 100644 pages/agent/detail/pound-info/pound-info.wxml
create mode 100644 pages/agent/detail/pound-info/pound-info.wxss
create mode 100644 pages/agent/detail/reserve-info/reserve-info.js
create mode 100644 pages/agent/detail/reserve-info/reserve-info.json
create mode 100644 pages/agent/detail/reserve-info/reserve-info.wxml
create mode 100644 pages/agent/detail/reserve-info/reserve-info.wxss
diff --git a/pages/agent/detail/delivery-info/delivery-info.js b/pages/agent/detail/delivery-info/delivery-info.js
new file mode 100644
index 0000000..d087dac
--- /dev/null
+++ b/pages/agent/detail/delivery-info/delivery-info.js
@@ -0,0 +1,26 @@
+// pages/agent/detail/delivery-info/delivery-info.js
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null }
+ },
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/delivery-info/delivery-info.json b/pages/agent/detail/delivery-info/delivery-info.json
new file mode 100644
index 0000000..a14199f
--- /dev/null
+++ b/pages/agent/detail/delivery-info/delivery-info.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-button": "/components/button/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/agent/detail/delivery-info/delivery-info.wxml b/pages/agent/detail/delivery-info/delivery-info.wxml
new file mode 100644
index 0000000..1a03280
--- /dev/null
+++ b/pages/agent/detail/delivery-info/delivery-info.wxml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ 送货信息
+
+ 纸厂开户账号
+
+ {{orderInfo.millSupplierId || ''}}
+ 复制
+
+
+
+
+ 纸厂订单号
+ {{orderInfo.millDeliveryOrderId || ''}}
+
+
+ 货到时间
+ {{orderInfo.paperMillDeliveryTime || ''}}
+
+
+ 注意事项
+ {{orderInfo.attenssion || ''}}
+
+
\ No newline at end of file
diff --git a/pages/agent/detail/delivery-info/delivery-info.wxss b/pages/agent/detail/delivery-info/delivery-info.wxss
new file mode 100644
index 0000000..ac0a139
--- /dev/null
+++ b/pages/agent/detail/delivery-info/delivery-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/delivery-info/delivery-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/header-info/header-info.js b/pages/agent/detail/header-info/header-info.js
new file mode 100644
index 0000000..f890c6d
--- /dev/null
+++ b/pages/agent/detail/header-info/header-info.js
@@ -0,0 +1,26 @@
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/header-info/header-info.json b/pages/agent/detail/header-info/header-info.json
new file mode 100644
index 0000000..78013bd
--- /dev/null
+++ b/pages/agent/detail/header-info/header-info.json
@@ -0,0 +1,5 @@
+{
+ "component": true,
+ "usingComponents": {
+ }
+}
\ No newline at end of file
diff --git a/pages/agent/detail/header-info/header-info.wxml b/pages/agent/detail/header-info/header-info.wxml
new file mode 100644
index 0000000..1d53e86
--- /dev/null
+++ b/pages/agent/detail/header-info/header-info.wxml
@@ -0,0 +1,7 @@
+
+
+
+
+
+ {{agent.orderStatus(orderInfo.status)}}
+
\ No newline at end of file
diff --git a/pages/agent/detail/header-info/header-info.wxss b/pages/agent/detail/header-info/header-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/header-info/header-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/index.json b/pages/agent/detail/index.json
index da6aae3..6de5a2e 100644
--- a/pages/agent/detail/index.json
+++ b/pages/agent/detail/index.json
@@ -8,6 +8,14 @@
"wux-accordion-group": "/components/accordion-group/index",
"wux-accordion": "/components/accordion/index",
"wux-steps": "/components/steps/index",
- "wux-step": "/components/step/index"
+ "wux-step": "/components/step/index",
+ "delivery-info": "/pages/agent/detail/delivery-info/delivery-info",
+ "item-money-info": "/pages/agent/detail/item-money-info/money-info",
+ "item-car-info": "/pages/agent/detail/item-car-info/item-car-info",
+ "order-info": "/pages/agent/detail/order-info/order-info",
+ "pound-info": "/pages/agent/detail/pound-info/pound-info",
+ "reserve-info": "/pages/agent/detail/reserve-info/reserve-info",
+ "header-info": "/pages/agent/detail/header-info/header-info"
+
}
}
\ No newline at end of file
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index 1b6881d..9631591 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -4,500 +4,84 @@
订单详情
-
-
-
- {{agent.orderStatus(orderInfo.status)}}
-
+
+
+
+
-
-
-
- 车辆信息({{orderInfo.orderItems.length}}辆车)
-
-
-
-
-
-
-
-
- {{item.logisticcsInfo.plateNumber}}
- 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
-
- 进度详情
-
-
-
-
-
-
-
-
- 结算单价
- {{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)}}元
-
-
-
-
-
- 送货信息
-
- 纸厂开户账号
-
- {{orderInfo.millSupplierId || ''}}
- 复制
-
-
-
- 纸厂订单号
- {{orderInfo.millDeliveryOrderId || ''}}
-
-
- 货到时间
- {{orderInfo.paperMillDeliveryTime || ''}}
-
-
- 注意事项
- {{orderInfo.attenssion || ''}}
-
-
-
-
-
-
+
+
+
+
+
- {{orderInfo.paperMillName}}
- 地址:{{orderInfo.paperMillAddress}}
+ 货物即将发往{{orderInfo.paperMillName}}
+ {{orderInfo.paperMillAddress}}
-
-
-
-
- 预约信息
-
- 纸品品类
- {{orderInfo.paperCategoryName}}
-
-
- 预估单价
- {{formate.formatePrice2(orderInfo.paperCategoryPrice)}}
-
-
- 预计重量
- {{formate.formateWeight(orderInfo.totalEstimatedWeight)}}
-
-
- 货车数量
- {{orderInfo.orderItems.length}}
-
-
- 货到时间
- {{orderInfo.deliveryTime}}
-
-
-
-
-
-
-
-
-
-
- {{orderInfo.paperMillName}}
- 地址:{{orderInfo.paperMillAddress}}
-
-
-
- 送货信息
-
- 纸厂开户账号
-
- {{orderInfo.millSupplierId || ''}}
- 复制
-
-
-
- 纸厂订单号
- {{orderInfo.millDeliveryOrderId || ''}}
-
-
- 货到时间
- {{orderInfo.paperMillDeliveryTime || ''}}
-
-
- 信息费
- {{formate.formatePrice2(orderInfo.unitSurcharge)}}
-
-
- 注意事项
- {{orderInfo.attenssion || ''}}
-
+
+
+
+
-
- 车辆信息({{orderInfo.orderItems.length}}辆车)
-
-
-
-
-
- {{item.logisticcsInfo.plateNumber}}
- 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
-
- 进度详情
-
-
-
-
-
-
-
-
-
-
- 预约信息
-
- 纸品品类
- {{orderInfo.paperCategoryName}}
-
-
- 预估单价
- {{formate.formatePrice2(orderInfo.paperCategoryPrice)}}
-
-
- 预计重量
- {{formate.formateWeight(orderInfo.totalEstimatedWeight)}}
-
-
- 货车数量
- {{orderInfo.orderItems.length}}
-
-
- 货到时间
- {{orderInfo.deliveryTime}}
-
-
-
+
+
-
-
+
+
+
+
+
+ 车辆信息({{orderInfo.orderItems.length}}辆车)
+
+
+
+
+
+
+
+
+
+
-
- 车辆信息({{orderInfo.orderItems.length}}辆车)
-
-
-
-
-
- {{item.logisticcsInfo.plateNumber}}
- 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
-
- 进度详情
-
-
-
-
-
-
-
-
-
- {{orderInfo.paperMillName}}
- 地址:{{orderInfo.paperMillAddress}}
-
-
+
+
+
+
+
+
+
+
+
+
+
-
- 送货信息
-
- 纸厂开户账号
-
- {{orderInfo.millSupplierId || ''}}
- 复制
-
-
-
- 纸厂订单号
- {{orderInfo.millDeliveryOrderId || ''}}
-
-
- 货到时间
- {{orderInfo.paperMillDeliveryTime || ''}}
-
-
- 信息费
- {{formate.formatePrice2(orderInfo.unitSurcharge)}}
-
-
- 注意事项
- {{orderInfo.attenssion}}
-
-
+
+
+
+
-
- 预约信息
-
- 纸品品类
- {{orderInfo.paperCategoryName}}
-
-
- 预估单价
- {{formate.formatePrice2(orderInfo.paperCategoryPrice)}}
-
-
- 预计重量
- {{formate.formateWeight(orderInfo.totalEstimatedWeight)}}
-
-
- 货车数量
- {{orderInfo.orderItems.length}}
-
-
- 货到时间
- {{orderInfo.deliveryTime}}
-
-
-
-
-
-
-
-
- {{orderInfo.paperMillName}}
- 地址:{{orderInfo.paperMillAddress}}
-
-
-
-
- 预约信息
-
-
- 纸品品类
- {{orderInfo.paperCategoryName}}
-
-
- 预估单价
- {{formate.formatePrice2(orderInfo.paperCategoryPrice)}}
-
-
- 预计重量
- {{formate.formateWeight(orderInfo.totalEstimatedWeight)}}
-
-
- 货车数量
- {{orderInfo.orderItems.length}}
-
-
- 货到时间
- {{orderInfo.deliveryTime}}
-
-
-
- 车辆信息({{orderInfo.orderItems.length}}辆车)
-
-
-
-
-
- {{item.logisticcsInfo.plateNumber}}
- 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
-
- 进度详情
-
-
-
-
-
-
-
-
-
-
- 订单信息
-
- 订单编号
- {{orderInfo.orderId}}
-
-
- 创建时间
- {{orderInfo.createTime}}
-
-
- 订单备注
- {{orderInfo.remark || ''}}
-
-
-
-
-
+
function statusStep(status) {
- return status==1?"process":"wait";
+ return status == 1 ? "process" : "wait";
}
module.exports = statusStep
\ No newline at end of file
diff --git a/pages/agent/detail/item-car-info/item-car-info.js b/pages/agent/detail/item-car-info/item-car-info.js
new file mode 100644
index 0000000..ee9cb0f
--- /dev/null
+++ b/pages/agent/detail/item-car-info/item-car-info.js
@@ -0,0 +1,28 @@
+// pages/agent/detail/item-history-part/item-history-info.js
+Component({
+
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null },
+ item: { type: Object, value: null }
+ },
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/item-car-info/item-car-info.json b/pages/agent/detail/item-car-info/item-car-info.json
new file mode 100644
index 0000000..2fa1a90
--- /dev/null
+++ b/pages/agent/detail/item-car-info/item-car-info.json
@@ -0,0 +1,13 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-dialog": "/components/dialog/index",
+ "wux-image": "/components/image/index",
+ "sudoku-image": "/components/sudoku-image/index",
+ "wux-button": "/components/button/index",
+ "wux-divider": "/components/divider/index",
+ "wux-accordion-group": "/components/accordion-group/index",
+ "wux-accordion": "/components/accordion/index",
+ "wux-steps": "/components/steps/index",
+ "wux-step": "/components/step/index"}
+}
\ No newline at end of file
diff --git a/pages/agent/detail/item-car-info/item-car-info.wxml b/pages/agent/detail/item-car-info/item-car-info.wxml
new file mode 100644
index 0000000..19b915a
--- /dev/null
+++ b/pages/agent/detail/item-car-info/item-car-info.wxml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+ {{item.logisticcsInfo.plateNumber}}
+ 「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
+
+ 进度详情
+
+
+
+
+
+
+
+ function statusStep(status) {
+ return status==1?"process":"wait";
+ }
+ module.exports = statusStep
+
diff --git a/pages/agent/detail/item-car-info/item-car-info.wxss b/pages/agent/detail/item-car-info/item-car-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/item-car-info/item-car-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/item-money-info/money-info.js b/pages/agent/detail/item-money-info/money-info.js
new file mode 100644
index 0000000..1def1a4
--- /dev/null
+++ b/pages/agent/detail/item-money-info/money-info.js
@@ -0,0 +1,28 @@
+// pages/agent/detail/money-info/money-info.js
+Component({
+
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null },
+ item: { type: Object, value: null }
+ },
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/item-money-info/money-info.json b/pages/agent/detail/item-money-info/money-info.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/agent/detail/item-money-info/money-info.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml
new file mode 100644
index 0000000..50637ec
--- /dev/null
+++ b/pages/agent/detail/item-money-info/money-info.wxml
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+ 预计总金额
+ {{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)}}
+
+
+ 代卖费单价 x 净重
+ {{formate.formatePrice2(item.unitSurcharge)}} x
+ {{formate.formateWeight(item.weightnoteInfo.netWeight)}}
+
+
+ 调节费
+ {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
+
+
+ 总收款金额:
+ {{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元
+
+
\ No newline at end of file
diff --git a/pages/agent/detail/item-money-info/money-info.wxss b/pages/agent/detail/item-money-info/money-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/item-money-info/money-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/order-info/order-info.js b/pages/agent/detail/order-info/order-info.js
new file mode 100644
index 0000000..669a0c8
--- /dev/null
+++ b/pages/agent/detail/order-info/order-info.js
@@ -0,0 +1,27 @@
+// pages/agent/detail/order-info/order-info.js
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/order-info/order-info.json b/pages/agent/detail/order-info/order-info.json
new file mode 100644
index 0000000..2fa1a90
--- /dev/null
+++ b/pages/agent/detail/order-info/order-info.json
@@ -0,0 +1,13 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-dialog": "/components/dialog/index",
+ "wux-image": "/components/image/index",
+ "sudoku-image": "/components/sudoku-image/index",
+ "wux-button": "/components/button/index",
+ "wux-divider": "/components/divider/index",
+ "wux-accordion-group": "/components/accordion-group/index",
+ "wux-accordion": "/components/accordion/index",
+ "wux-steps": "/components/steps/index",
+ "wux-step": "/components/step/index"}
+}
\ No newline at end of file
diff --git a/pages/agent/detail/order-info/order-info.wxml b/pages/agent/detail/order-info/order-info.wxml
new file mode 100644
index 0000000..ff2d51c
--- /dev/null
+++ b/pages/agent/detail/order-info/order-info.wxml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+ 订单信息
+
+ 订单编号
+ {{orderInfo.orderId}}
+
+
+ 创建时间
+ {{orderInfo.createTime}}
+
+
+ 订单备注
+ {{orderInfo.remark || ''}}
+
+
+
+
diff --git a/pages/agent/detail/order-info/order-info.wxss b/pages/agent/detail/order-info/order-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/order-info/order-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/pound-info/pound-info.js b/pages/agent/detail/pound-info/pound-info.js
new file mode 100644
index 0000000..9653dc5
--- /dev/null
+++ b/pages/agent/detail/pound-info/pound-info.js
@@ -0,0 +1,28 @@
+// pages/agent/detail/pound-info/pound-info.js
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null },
+ item: { type: Object, value: null }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/pound-info/pound-info.json b/pages/agent/detail/pound-info/pound-info.json
new file mode 100644
index 0000000..50aea4d
--- /dev/null
+++ b/pages/agent/detail/pound-info/pound-info.json
@@ -0,0 +1,7 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-image": "/components/image/index",
+ "sudoku-image": "/components/sudoku-image/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/agent/detail/pound-info/pound-info.wxml b/pages/agent/detail/pound-info/pound-info.wxml
new file mode 100644
index 0000000..9e30d67
--- /dev/null
+++ b/pages/agent/detail/pound-info/pound-info.wxml
@@ -0,0 +1,38 @@
+
+
+
+
+
+ 结算单价
+ {{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)}}元
+
+
+ 磅单图片
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/agent/detail/pound-info/pound-info.wxss b/pages/agent/detail/pound-info/pound-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/pound-info/pound-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/agent/detail/reserve-info/reserve-info.js b/pages/agent/detail/reserve-info/reserve-info.js
new file mode 100644
index 0000000..9d11775
--- /dev/null
+++ b/pages/agent/detail/reserve-info/reserve-info.js
@@ -0,0 +1,26 @@
+// pages/agent/detail/reserve-info/reserve-info.js
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ orderInfo: { type: Object, value: null }
+ },
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/agent/detail/reserve-info/reserve-info.json b/pages/agent/detail/reserve-info/reserve-info.json
new file mode 100644
index 0000000..41682c7
--- /dev/null
+++ b/pages/agent/detail/reserve-info/reserve-info.json
@@ -0,0 +1,13 @@
+{
+ "component": true,
+ "usingComponents": {
+ "wux-dialog": "/components/dialog/index",
+ "wux-image": "/components/image/index",
+ "sudoku-image": "/components/sudoku-image/index",
+ "wux-button": "/components/button/index",
+ "wux-divider": "/components/divider/index",
+ "wux-accordion-group": "/components/accordion-group/index",
+ "wux-accordion": "/components/accordion/index",
+ "wux-steps": "/components/steps/index",
+ "wux-step": "/components/step/index"}
+}
\ No newline at end of file
diff --git a/pages/agent/detail/reserve-info/reserve-info.wxml b/pages/agent/detail/reserve-info/reserve-info.wxml
new file mode 100644
index 0000000..4e03ab2
--- /dev/null
+++ b/pages/agent/detail/reserve-info/reserve-info.wxml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+ 预约信息
+
+ 纸品品类
+ {{orderInfo.paperCategoryName}}
+
+
+ 预估单价
+ {{formate.formatePrice2(orderInfo.paperCategoryPrice)}}
+
+
+ 预计重量
+ {{formate.formateWeight(orderInfo.totalEstimatedWeight)}}
+
+
+ 货车数量
+ {{orderInfo.orderItems.length}}
+
+
+ 货到时间
+ {{orderInfo.deliveryTime}}
+
+
+
+
\ No newline at end of file
diff --git a/pages/agent/detail/reserve-info/reserve-info.wxss b/pages/agent/detail/reserve-info/reserve-info.wxss
new file mode 100644
index 0000000..00093ad
--- /dev/null
+++ b/pages/agent/detail/reserve-info/reserve-info.wxss
@@ -0,0 +1,16 @@
+/* pages/agent/detail/header-info/header-info.wxss */
+.margin-top{
+ margin-top: 16rpx;
+}
+
+.margin-right{
+ margin-right: 24rpx;
+}
+
+.image-load {
+ width: 50px;
+ height: 50px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
\ No newline at end of file