diff --git a/pages/home/factory-list/index.js b/pages/home/factory-list/index.js
index 1d08820..472dcb2 100644
--- a/pages/home/factory-list/index.js
+++ b/pages/home/factory-list/index.js
@@ -152,9 +152,9 @@ Scene({
saveChanel(this.data.nowItem).then(result => {
wx.hideLoading()
if(this.data.nowItem.id){
- util.showToast('修改成功!')
+ util.showToast('修改成功')
} else {
- util.showToast('添加成功!')
+ util.showToast('添加成功')
}
this.onRefreshList()
}).catch(err => {
diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml
index 8ee1cad..6408147 100644
--- a/pages/storage/order-create/index.wxml
+++ b/pages/storage/order-create/index.wxml
@@ -47,7 +47,7 @@
-
+
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index bff006c..acd88e0 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -54,6 +54,7 @@ Scene({
if(result.data.weightNote.secondWeightImageUrl2){
result.data.weightNote.totalWeighingPicture.push(result.data.weightNote.secondWeightImageUrl2)
}
+ result.data.outboundDeliveryOrderSettlementInfo.netWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.netWeight, 1000)
if(result.data.outboundDeliveryOrderSettlementInfo.id){
this.setData({
safeBottom: app.globalData.safeBottom,
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 481d474..b8e5ffa 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -148,6 +148,7 @@
+
关闭订单
确认收款