diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index 48ee79f..f930f0b 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -17,7 +17,8 @@ Scene({
form: null,
agent: 0,
title: '过磅详情',
- imageList: []
+ imageList: [],
+ paymentImageList: null
},
/**
* 生命周期函数--监听页面加载
@@ -65,13 +66,21 @@ Scene({
this.data.imageList.push({ url: element })
}
}
+ if(result.data.paymentImageList && result.data.paymentImageList.length){
+ this.data.paymentImageList = []
+ for (let index = 0; index < result.data.paymentImageList.length; index++) {
+ const element = result.data.paymentImageList[index]
+ this.data.paymentImageList.push({ url: element })
+ }
+ }
this.setData({
safeBottom: app.globalData.safeBottom,
form: result.data,
title: this.data.title,
admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0,
agent: this.data.agent,
- imageList: this.data.imageList
+ imageList: this.data.imageList,
+ paymentImageList: this.data.paymentImageList
})
}).catch(err => {
wx.hideLoading()
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index a0eb556..4b81233 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -175,6 +175,12 @@
{{form.id}}
+
+
+ 支付凭证
+
+
+
diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index fcbcedc..3a191a8 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -103,7 +103,11 @@ Scene({
if (orderList && orderList.length) {
for (let index = 0; index < orderList.length; index++) {
const element = orderList[index]
- amount = math.plus(amount, element.adjustedPrice)
+ if(element.adjustedPrice){
+ amount = math.plus(amount, element.adjustedPrice)
+ } else {
+ amount = math.plus(amount, element.settleWeight)
+ }
this.data.params.ids.push(element.id)
if(!util.isEmpty(element.bankCardNo)){
this.data.params.bankCardNo = element.bankCardNo
@@ -114,10 +118,10 @@ Scene({
if(settleType){
this.data.settleType = String(settleType)
}
+ this.data.orderStatus = orderList[0].status
if(this.data.orderStatus == 42 && this.data.settleType == '3'){
this.data.settleType = '1'
}
- this.data.orderStatus = orderList[0].status
this.setData({
height: app.globalData.fragmentHeight,
safeBottom: app.globalData.safeBottom,