diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js index 14f66b4..bfa4296 100644 --- a/pages/process/order-info/index.js +++ b/pages/process/order-info/index.js @@ -3,6 +3,7 @@ import Scene from '../../index/scene' import Dialog from '../../../components/dialog/dialog' import { cancelOrder, repeatOrder, getFactoryOrderInfo, checkingOrder, printOrder} from "../../../api/saas" const event = require('../../../utils/event') +const math = require('../../../utils/math') const util = require('../../../utils/util') const app = getApp() @@ -42,6 +43,13 @@ Scene({ } else if(result.data.status == 5){ this.data.title = '已完成' } + if(result.data.paymentOrderInfo.receivablePrice){ + if(result.data.paymentOrderInfo.paidPrice){ + result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice) + } else { + result.data.paymentOrderInfo.lessPrice = 0.00 + } + } this.setData({ safeBottom: app.globalData.safeBottom, form: result.data, diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js index 7c64843..2b7b526 100644 --- a/pages/process/outside-info/index.js +++ b/pages/process/outside-info/index.js @@ -62,6 +62,13 @@ Scene({ imageList.push({url: result.data.orderImageList[index]}) } } + if(result.data.paymentOrderInfo.receivablePrice){ + if(result.data.paymentOrderInfo.paidPrice){ + result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice) + } else { + result.data.paymentOrderInfo.lessPrice = 0.00 + } + } this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, agent: this.data.agent, imageList,safeBottom: app.globalData.safeBottom }) }).catch(err => { wx.hideLoading() diff --git a/pages/process/template/index.wxml b/pages/process/template/index.wxml index 5044452..ce1fa30 100644 --- a/pages/process/template/index.wxml +++ b/pages/process/template/index.wxml @@ -11,8 +11,26 @@ 代收结算信息 - {{agentStatus(form.paymentOrderInfo)}} + {{agentStatus(form.paymentOrderInfo)}} + + + 应付总金额(元) + {{form.paymentOrderInfo.receivablePrice}} + + + + + 已付金额(元) + {{form.paymentOrderInfo.paidPrice}} + + + + + 待付金额(元) + {{form.paymentOrderInfo.lessPrice}} + + 结算方式 @@ -61,12 +79,6 @@ {{formate.formateAmount(form.paymentOrderInfo.totalPrice, 2)}} - - - 应付总金额(元) - {{form.paymentOrderInfo.receivablePrice}} - - @@ -85,6 +97,12 @@ return '待还款' } else if(paymentOrderInfo.receivableStatus == 1) { return '已还款' + } else if(paymentOrderInfo.lessPrice > 0) { + return '部分还款' + } else if(paymentOrderInfo.paidPrice > 0 && paymentOrderInfo.lessPrice == 0) { + return '已还款' + } else if(paymentOrderInfo.paidPrice <= 0) { + return '待还款' } return '' }