From 1a7b2c6b107c902b732fd5bbba2caf0bac73f32f Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 21 Apr 2021 09:30:13 +0800
Subject: [PATCH] no message

---
 pages/formate.wxs                         | 5 +++++
 pages/storage/order-create/index.js       | 6 ++++++
 pages/storage/order-create/index.wxml     | 3 +--
 pages/storage/order-info/index.wxml       | 6 +++---
 pages/storage/order-settlement/index.wxml | 2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pages/formate.wxs b/pages/formate.wxs
index 0a74ffd..94892a3 100644
--- a/pages/formate.wxs
+++ b/pages/formate.wxs
@@ -63,6 +63,10 @@ function formateWeight(weight) {
   return (parseFloat(weight) / 1000).toFixed(2)
 }
 
+function formatePrice(weight) {
+  return (parseFloat(weight) * 1000).toFixed(0)
+}
+
 function maxWeight(fweight, sweight) {
   if(fweight && sweight){
     if(fweight > sweight){
@@ -91,6 +95,7 @@ function minWeight(fweight, sweight) {
 
 module.exports = {
   formateAmount: formateAmount,
+  formatePrice: formatePrice,
   formateWeight: formateWeight,
   formatTime: formatTime,
   formateDate: formateDate,
diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index cc80a93..39dc46d 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -112,6 +112,12 @@ Scene({
   onChange: function({detail}) {
     this.setData({ activeNames: detail })
   },
+  bindInput: function (e) {
+    this.data.form[e.currentTarget.id] = e.detail.value
+  },
+  onInputChange: function(e){
+    this.data.form[e.currentTarget.id] = e.detail
+  },
   submitForm: function(){
     if(util.isEmpty(this.data.form.factoryName)){
       util.showToast('请选择出货方名称')
diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml
index 03b0ae2..b9018d2 100644
--- a/pages/storage/order-create/index.wxml
+++ b/pages/storage/order-create/index.wxml
@@ -48,7 +48,6 @@
         placeholder="请输司机姓名" value="{{form.driverName || ''}}" bindinput="bindInput" />
     </view>
   </van-cell>
-  <van-field label="备注" type="textarea" input-align="right" placeholder="请输入备注" autosize border="{{ false }}" />
 </view>
 <view class="margin-top"></view>
 <van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{poundInfo}}">
@@ -84,7 +83,7 @@
     <van-cell wx:if="{{poundInfo.netWeight}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">净重（公斤）</view>
-        <view class="text-gray">{{form.netWeight}}</view>
+        <view class="text-gray">{{poundInfo.netWeight}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{poundInfo.operaterId}}">
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index 8acee68..414004e 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -20,10 +20,10 @@
         <view class="text-gray">{{orderInfo.productName || ''}}</view>
       </view>
     </van-cell>
-    <van-cell wx:if="{{orderInfo.packageNumber}}">
+    <van-cell wx:if="{{orderInfo.packageQuantity}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">纸品包数</view>
-        <view class="text-gray">{{orderInfo.packageNumber || ''}}</view>
+        <view class="text-gray">{{orderInfo.packageQuantity || ''}}</view>
       </view>
     </van-cell>
     <van-cell center>
@@ -98,7 +98,7 @@
     <van-cell center>
       <view slot="title" class="flex flex-justify">
         <view class="text-black">结算单价(元/吨)</view>
-        <view class="text-gray">{{orderInfo.settleUnitPrice || ''}}</view>
+        <view class="text-gray">{{formate.formatePrice(orderInfo.settleUnitPrice)}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{orderInfo.packageNumber}}">
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index bc17c35..70566a3 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -138,7 +138,7 @@
     <van-cell wx:if="{{poundInfo.netWeight}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">净重（公斤）</view>
-        <view class="text-gray">{{form.netWeight}}</view>
+        <view class="text-gray">{{poundInfo.netWeight}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{poundInfo.operaterId}}">