diff --git a/pages/login/index.js b/pages/login/index.js
index 9b39e8f..5256f4b 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -180,7 +180,7 @@ Page({
if(applicationStatus == -1){
this.setData({ loging: false})
Dialog.alert({ title: '温馨提示', message: '还没有您所属的打包站信息，请联系相关客服人员' }).then(() => {
- wx.redirectTo({ url: '/pages/agent/appointment/index' })
+ wx.redirectTo({ url: '/pages/process/order-check/index' })
})
return
}
diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js
index 7bb232e..5573cbb 100644
--- a/pages/process/order-check/index.js
+++ b/pages/process/order-check/index.js
@@ -13,7 +13,7 @@ Scene({
data: {
safeBottom: app.globalData.safeBottom,
paperList: null,
- form: null,
+ form: {},
columns: [],
focus: 0,
visible: false,
@@ -77,29 +77,26 @@ Scene({
this.setData({ ['form.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type })
},
bindInput: function (e) {
- this.data.form[e.target.id] = e.detail.value
+ this.data.form[e.target.id] = e.detail
if(e.target.id == 'deductPercent'){
- if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){
+ if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
this.data.form.deductWeight = null
this.data.form.deductPercent = null
} else {
- this.data.form.deductWeight = math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(2)
+ this.data.form.deductWeight = math.divide(math.times(this.data.form.totalWeight, Number(e.detail)), 100).toFixed(2)
// 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){
+ if(util.isEmpty(e.detail) || Number(e.detail) <= 0){
this.data.form.deductWeight = null
this.data.form.deductPercent = null
} else {
- this.data.form.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2)
+ this.data.form.deductPercent = math.times(math.divide(Number(e.detail), this.data.form.totalWeight), 100).toFixed(2)
// this.setData({ ['form.deductPercent']: math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) })
}
}
this.statAmount()
},
- onChange: function(e) {
- this.data.form.inspectionRemark = e.detail
- },
statAmount: function(){
this.data.form.settleWeight = this.data.form.netWeight
if(!util.isEmpty(this.data.form.deductWeight)){
diff --git a/pages/process/order-check/index.json b/pages/process/order-check/index.json
index 5abef9c..95a7894 100644
--- a/pages/process/order-check/index.json
+++ b/pages/process/order-check/index.json
@@ -1,6 +1,6 @@
{
"usingComponents": {
- "van-index-anchor": "/components/index-anchor/index",
+ "van-field": "/components/field/index",
"van-cell": "/components/cell/index",
"van-button": "/components/button/index",
"van-checkbox": "/components/checkbox/index",
diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml
index dc550f4..45f2a56 100644
--- a/pages/process/order-check/index.wxml
+++ b/pages/process/order-check/index.wxml
@@ -4,14 +4,17 @@
-
+
+
+ 订单信息
+
客户姓名
{{form.factoryCustomerName}}
-
+
车牌号码
{{form.plateNumber || '请输入车牌号码'}}
@@ -29,8 +32,11 @@
{{form.emptyWeight || '- -'}}
-
-
+
+
+ 定价信息
+
+
*
@@ -39,7 +45,7 @@
{{form.productName || '请选择废纸品类'}}
-
+
+
+
+ *
+ 单价(元/公斤)
+
+
+
+
+
+
+ 扣重(公斤)
+
+
+
+
+
+
+ 扣点(%)
+
+
结算重量(公斤)
diff --git a/pages/process/order-check/index.wxss b/pages/process/order-check/index.wxss
index 5a0d819..086471d 100644
--- a/pages/process/order-check/index.wxss
+++ b/pages/process/order-check/index.wxss
@@ -2,6 +2,9 @@
.page-icon {
margin-right: 24rpx;
}
+.margin-top{
+ margin-top: 16rpx;
+}
.big-icon{
margin-top: 24rpx;
diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml
index a0e1c04..81672db 100644
--- a/pages/process/outside-item/index.wxml
+++ b/pages/process/outside-item/index.wxml
@@ -95,8 +95,8 @@
-->
-
-
+
+
扣重(公斤)
@@ -112,7 +112,7 @@
-->
-
+
扣点(%)