From 0278c356dfed4006b917c2f1cb87cf0728528e1d Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 28 May 2021 14:30:40 +0800
Subject: [PATCH] ui

---
 pages/home/factory-list/index.js          | 4 ++--
 pages/storage/order-create/index.wxml     | 2 +-
 pages/storage/order-settlement/index.js   | 1 +
 pages/storage/order-settlement/index.wxml | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

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 @@
   </van-cell>
   <van-field id="driverName" label="司机姓名" value="{{ form.driverName || '' }}" maxlength="12" placeholder="请输司机姓名" clearable input-align="right" bind:change="bindInput"></van-field>
 
-  <van-field id="unitPrice" label="出货单价(元/公斤)" title-width="240rpx" value="{{ form.driverName || '' }}" maxlength="8" type="digit" placeholder="请输入出货单价" clearable input-align="right" bind:change="bindInput"></van-field>
+  <van-field id="unitPrice" label="出货单价(元/公斤)" title-width="240rpx" value="{{ form.unitPrice || '' }}" maxlength="8" type="digit" placeholder="请输入出货单价" clearable input-align="right" bind:change="bindInput"></van-field>
 
   <van-field id="estimatedAmount" label="预估金额" value="{{ form.estimatedAmount || '' }}" maxlength="8" type="digit" placeholder="请输入预估金额" clearable input-align="right" bind:change="bindInput"></van-field>
   
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 @@
   </van-collapse-item>
 </van-collapse>
 
+<view style="height:16rpx" wx:if="{{orderInfo && orderInfo.status == 1}}"></view>
 <submit-layout wx:if="{{orderInfo && orderInfo.status == 1}}">
   <van-button type="danger" custom-style="height:88rpx;width:254rpx" bind:click="closeForm">关闭订单</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="settlementForm">确认收款</van-button>