From 778e90fcbd178b1d4976817e93ff55a69e595b99 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 8 Mar 2021 13:57:41 +0800
Subject: [PATCH] no message

---
 app.js                              | 2 +-
 pages/process/order-info/index.wxml | 7 ++++++-
 pages/process/order-price/index.js  | 7 ++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index c19a5ae..b262d8d 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,6 @@
 //app.js
 App({
-  evn: 0, // 0: 开发版本；1：测试版本；2：生产版本
+  evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
   tmplIds: [''],
   version: 152,
   xAppId: '503258978847953926',
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index bd588d4..335ec60 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -107,7 +107,12 @@
       </view>
     </view>
   </van-cell>
-
+  <van-cell wx:if="{{form.inspectionRemark}}">
+    <view slot="title" class="text-black">
+      <view>备注</view>
+      <view class="flex" style="margin-top:18rpx;border: 2rpx solid #f3f3f3;padding: 18rpx;">{{form.inspectionRemark}}</view>
+    </view>
+  </van-cell>
   <van-index-anchor index="订单信息" />
   <van-cell>
     <view slot="title" class="flex flex-justify">
diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js
index a0d52d7..86dd724 100644
--- a/pages/process/order-price/index.js
+++ b/pages/process/order-price/index.js
@@ -75,20 +75,20 @@ Page({
     this.data.form[e.target.id] = e.detail.value
     if(e.target.id == 'deductPercent'){
       if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){
-        this.setData({ ['form.deductWeight']: null })
+        this.setData({ ['form.deductWeight']: null, ['form.deductPercent']: null })
       } else {
         this.setData({ ['form.deductWeight']: math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(3) })
       }
     } else if(e.target.id == 'deductWeight'){
       if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){
-        this.setData({ ['form.deductPercent']: null })
+        this.setData({ ['form.deductWeight']: null, ['form.deductPercent']: null })
       } else {
         this.setData({ ['form.deductPercent']: math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) })
       }
     }
   },
   onChange: function(e) {
-    this.data.form.remark = e.detail
+    this.data.form.inspectionRemark = e.detail
   },
   paddingOrder: function(){
     this.setData({ ['form.isWithoutTare']: !this.data.form.isWithoutTare })
@@ -143,6 +143,7 @@ Page({
     }
     data.plateNumber = this.data.form.plateNumber
     data.productId = this.data.form.productId
+    data.sign = this.data.form.sign
     data.unitPrice = Number(this.data.form.unitPrice)
     data.isWithoutTare = Number(this.data.form.isWithoutTare)
     pricingOrder(data).then(result => {