diff --git a/app.js b/app.js
index a4be9df..1b33a91 100644
--- a/app.js
+++ b/app.js
@@ -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,
diff --git a/app.json b/app.json
index c76db06..b5b0cdb 100644
--- a/app.json
+++ b/app.json
@@ -92,7 +92,8 @@
"pages/html/integral/index",
"pages/payment/index",
"pages/home/personal/personal",
- "pages/home/enterprise/enterprise"
+ "pages/home/enterprise/enterprise",
+ "pages/moment/paper/index"
],
"permission": {
"scope.userLocation": {
diff --git a/pages/agent/detail/index.js b/pages/agent/detail/index.js
index 4a499b8..b550a06 100644
--- a/pages/agent/detail/index.js
+++ b/pages/agent/detail/index.js
@@ -43,10 +43,10 @@ Page({
// 全额
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
+ if (element.surcharge) {
+ element.orderType =1
} else {
- element.orderType = 1
+ element.orderType = 0
}
} else {
if (element.weightnoteInfo.netWeight) {
diff --git a/pages/agent/detail/index.wxml b/pages/agent/detail/index.wxml
index 8decae5..7569bea 100644
--- a/pages/agent/detail/index.wxml
+++ b/pages/agent/detail/index.wxml
@@ -4,21 +4,25 @@
订单详情
-
+
{{agent.orderStatus(orderInfo.status)}}
-
-
+
+
+
+
车辆信息({{orderInfo.orderItems.length}}辆车)
+
@@ -26,7 +30,7 @@
{{item.logisticcsInfo.plateNumber}}
「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
- {{agent.orderStatus(item.status)}}
+ 进度详情
代卖费
- {{formate.formatePrice2(item.unitSurcharge)}}
+ {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}
+
+
+ 调节费
+ {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
磅单图片
@@ -149,7 +157,7 @@
-
+
总金额
{{formate.formateAmount(item.sumAmount)}}元
@@ -158,17 +166,17 @@
结算单价 x 结算重量
{{formate.formatePrice2(item.weightnoteInfo.settleUtiPrice)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
-
- 调节费
- {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
-
代卖费
{{formate.formateAmount(item.surcharge) || 0}}元
代卖费单价 x 结算重量
- {{formate.formatePrice2(item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
+ {{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} x {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}
+
+
+ 调节费
+ {{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元
代卖费单价 x 净重
@@ -285,15 +293,16 @@
{{item.logisticcsInfo.plateNumber}}
「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
- {{agent.orderStatus(item.status)}}
+ 进度详情
+
-
+
预约信息
@@ -320,6 +329,7 @@
+
@@ -333,7 +343,7 @@
{{item.logisticcsInfo.plateNumber}}
「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
- {{agent.orderStatus(item.status)}}
+ 进度详情
-
+
+
+
+ {{orderInfo.paperMillName}}
+ 地址：{{orderInfo.paperMillAddress}}
+
+
+
预约信息
@@ -428,15 +445,6 @@
{{orderInfo.deliveryTime}}
-
-
-
-
- {{orderInfo.paperMillName}}
- 地址：{{orderInfo.paperMillAddress}}
-
-
-
车辆信息({{orderInfo.orderItems.length}}辆车)
@@ -447,7 +455,7 @@
{{item.logisticcsInfo.plateNumber}}
「{{item.paperCategoryName || orderInfo.paperCategoryName}}」
- {{agent.orderStatus(item.status)}}
+ 进度详情
+
+
+
+ 结算单价
+ {{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)}}元
+
+
订单信息
diff --git a/pages/agent/order-item/index.wxml b/pages/agent/order-item/index.wxml
index d3ba999..0061df9 100644
--- a/pages/agent/order-item/index.wxml
+++ b/pages/agent/order-item/index.wxml
@@ -16,8 +16,8 @@
- {{orderItem.logisticcsInfo.plateNumber}}
- 「{{ orderItem.paperCategoryName || item.paperCategoryName }}」
+ {{orderItem.logisticcsInfo.plateNumber}}「{{ orderItem.paperCategoryName || item.paperCategoryName }}」
+
{{orderItem.promptMessage}}
@@ -29,11 +29,11 @@
- {{orderStatus(orderItem.status)}}
+ {{orderStatus(orderItem.displayStatus)}}
- {{orderStatus(orderItem.status + 1)}}
+ {{orderNextStatus(orderItem.displayStatus)}}
@@ -55,8 +55,43 @@
return '已完成'
} else if (status == 55) {
return '已关闭'
+ } else if (status == 56) {
+ return '待质检'
+ } else if (status == 57) {
+ return '待审核'
+ } else if (status == 58) {
+ return '结算中'
}
return ''
}
+
module.exports = orderStatus;
+
+
+
+
+
+function orderNextStatus(status) {
+ if (status == 50) {
+ return '待送货'
+ } else if (status == 51) {
+ return '待审核'
+ } else if (status == 52) {
+ return '结算中'
+ } else if (status == 53) {
+ return '已完成'
+ } else if (status == 54) {
+ return ''
+ } else if (status == 55) {
+ return ''
+ } else if (status == 56) {
+ return '待审核'
+ } else if (status == 57) {
+ return '结算中'
+ } else if (status == 58) {
+ return '已完成'
+ }
+ return ''
+ }
+ module.exports = orderNextStatus;
\ No newline at end of file