diff --git a/pages/order/add.vue b/pages/order/add.vue index cd9a944..d1edc97 100644 --- a/pages/order/add.vue +++ b/pages/order/add.vue @@ -464,11 +464,14 @@ export default { }; uni.$u.api.freightOrder.getServiceAmount(params).then(res => { if (res.success) { - this.form.paidAmount = res.result.paidAmount || paidAmount; - this.form.deliveryAmount = res.result.deliveryAmount || deliveryAmount; - this.form.prepaidAmount = res.result.prepaidAmount || prepaidAmount; - this.form.oilAmount = res.result.oilAmount || oilAmount; - this.form.balancePaymentAmount = res.result.balancePaymentAmount || balancePaymentAmount; + // this.form.paidAmount = res.result.paidAmount || paidAmount; + // this.form.prepaidAmount = res.result.prepaidAmount || prepaidAmount; + // this.form.oilAmount = res.result.oilAmount || oilAmount; + if (this.autoComputedArrival) { + this.form.deliveryAmount = res.result.deliveryAmount || deliveryAmount; + } else { + this.form.balancePaymentAmount = res.result.balancePaymentAmount || balancePaymentAmount; + } this.form.oilPayRebateRate = res.result.oilPayRebateRate || ''; this.form.driverSecurityServiceAmount = res.result.driverSecurityServiceAmount || ''; this.form.securityServiceAmount = res.result.securityServiceAmount || ''; -- libgit2 0.21.0