From 8720b4651d13e84a078269b03725a3d1a15ae1c9 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 20 May 2021 09:40:56 +0800
Subject: [PATCH] no message
---
pages/agent/appointment/index.wxml | 2 +-
pages/process/order-info/index.js | 4 ++--
pages/process/order-info/index.wxml | 4 ++++
pages/process/outside-add/index.wxml | 2 +-
pages/process/outside-info/index.js | 15 ++++++++++-----
pages/process/outside-info/index.wxml | 6 +++++-
pages/process/outside-list/index.wxml | 2 +-
7 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml
index de97c0c..62f1bd2 100644
--- a/pages/agent/appointment/index.wxml
+++ b/pages/agent/appointment/index.wxml
@@ -94,7 +94,7 @@
提交订单
-
+
diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index 439d227..a691f63 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -29,7 +29,7 @@ Scene({
event.on('OrderMessage', this, this.onEvent)
},
onEvent: function(message){
- if (message.what == 12) {
+ if (message.what == 12 && message.desc == 'PaymentOrder') {
wx.navigateBack()
}
},
@@ -122,7 +122,7 @@ Scene({
checkingOrder({ id: this.data.form.id }).then(result => {
wx.hideLoading()
util.showBackToast('订单审核已通过')
- event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' })
+ event.emit('OrderMessage', { what: 12, desc: 'checkingOrder' })
}).catch(err => {
wx.hideLoading()
util.showToast(err)
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 1be48eb..54e0ac1 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -32,6 +32,10 @@
已完成
+
+
+ 已取消
+
客户姓名
diff --git a/pages/process/outside-add/index.wxml b/pages/process/outside-add/index.wxml
index f0bb93e..04f18a3 100644
--- a/pages/process/outside-add/index.wxml
+++ b/pages/process/outside-add/index.wxml
@@ -92,7 +92,7 @@
-
+
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index ee09bf7..d8df2be 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -39,16 +39,21 @@ Scene({
for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
const element = result.data.productCategoryInfos[index]
element.fileList = []
- for (let k = 0; k < element.weightNoteImages.length; k++) {
- element.fileList.push({url: element.weightNoteImages[k]})
+ if(element.weightNoteImages){
+ for (let k = 0; k < element.weightNoteImages.length; k++) {
+ element.fileList.push({url: element.weightNoteImages[k]})
+ }
+ }
+ if(element.settleUnitPrice && element.settleWeight){
+ element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
+ result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
+ result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
}
- element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
- result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
- result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
}
this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
}).catch(err => {
wx.hideLoading()
+ console.log(err)
util.showToast(err)
})
},
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index 038a005..f3f9b8f 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -27,6 +27,10 @@
已完成
+
+
+ 已取消
+
客户姓名
@@ -195,7 +199,7 @@
客户结算
-
+
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 4ab3344..1a0b182 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -38,7 +38,7 @@
- 车牌号码：{{item.plateNumber}}
+ 车牌号码：{{item.plateNumber || ''}}
品类：{{item.productCategoryName}}