From 7b09eac2ce6af45cb08a5630580b452de3ee4761 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 2 Feb 2021 16:52:20 +0800
Subject: [PATCH] no message
---
pages/process/order-info/index.wxml | 26 ++++++++++++++++++++++----
pages/process/order-price/index.js | 16 ++++++++--------
pages/process/order-price/index.wxml | 11 ++++++-----
3 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 70fdf94..d3a3318 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -6,7 +6,7 @@
- 待过毛重
+ 待过皮重
@@ -56,6 +56,18 @@
{{form.netWeight}}
+
+
+ 扣重(KG)
+ -{{form.deductWeight}}
+
+
+
+
+ 扣点(%)
+ {{form.deductPercent}}
+
+
定价员
@@ -81,7 +93,7 @@
-
+
过皮重照片
@@ -104,13 +116,19 @@
- 金额(元)
+ 扣减金额(元)
+ {{form.deductPrice || ''}}
+
+
+
+
+ 结算金额(元)
{{form.settlePrice || ''}}
- 订单时间
+ 下单时间
{{form.createTime || ''}}
diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js
index a8df06c..4814701 100644
--- a/pages/process/order-price/index.js
+++ b/pages/process/order-price/index.js
@@ -98,14 +98,14 @@ Page({
util.showToast('请输入单价')
return
}
- if(this.data.deductType == 1 && (util.isEmpty(this.data.form.deductWeight) || Number(this.data.form.deductWeight) <= 0)){
- util.showToast('请输入扣重')
- return
- }
- if(this.data.deductType == 2 && (util.isEmpty(this.data.form.deductPercent) || Number(this.data.form.deductPercent) <= 0)){
- util.showToast('请输入扣点')
- return
- }
+ // if(this.data.deductType == 1 && (util.isEmpty(this.data.form.deductWeight) || Number(this.data.form.deductWeight) <= 0)){
+ // util.showToast('请输入扣重')
+ // return
+ // }
+ // if(this.data.deductType == 2 && (util.isEmpty(this.data.form.deductPercent) || Number(this.data.form.deductPercent) <= 0)){
+ // util.showToast('请输入扣点')
+ // return
+ // }
wx.showLoading({ title: '处理中', mask: true })
var data = {id: this.data.form.id}
if(Number(this.data.form.deductWeight) > 0){
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index 619baa3..ee2bdce 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -40,9 +40,8 @@
-
+
扣重(KG)
- *
@@ -51,9 +50,8 @@
-
+
扣点(%)
- *
@@ -62,7 +60,10 @@
是否无皮过磅
-
+
+
+ {{ form.isWithoutTare ? '是' : '否'}}
+