|
|
|
@ -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, |
|
|
|
|