diff --git a/packages/community/propertyPayment/index.css b/packages/community/propertyPayment/index.css index 45b6817e..68684e26 100644 --- a/packages/community/propertyPayment/index.css +++ b/packages/community/propertyPayment/index.css @@ -214,6 +214,7 @@ image { .payItem_money{ width: auto; + margin-right: 10rpx; } .bottom { diff --git a/packages/community/propertyPayment/index.vue b/packages/community/propertyPayment/index.vue index 07442198..145b06b7 100644 --- a/packages/community/propertyPayment/index.vue +++ b/packages/community/propertyPayment/index.vue @@ -56,7 +56,8 @@ - + {{ item.order_date }}年 @@ -72,7 +73,8 @@ - + {{ items.order_date }}年 @@ -158,7 +160,7 @@ 绑定房源 - {{ item.community_order.length }}个账单 + {{ item.community_order ? item.community_order.length : 0 }}个账单 明细可从收据查看 @@ -396,7 +398,7 @@ export default { let money = 0; this.Bill.forEach((item) => { item.community_order_rows.forEach((ite) => { - if (ite.check) { + if (ite.check && ite.pay_status == 1) { money += ite.money; } }); @@ -473,7 +475,11 @@ export default { if (this.payType == 1 || isComboPay) { //微信支付或组合支付 - payParams.money = this.currentMoney; + if (isComboPay) { + payParams.money = this.currentMoney - Number(this.balanceMoney).toFixed(2); + } else { + payParams.money = this.currentMoney; + } } if (this.payType == 2 || isComboPay) { @@ -592,15 +598,14 @@ export default { page_num: this.page_num, page_size: this.page_size, }).then((res) => { - console.log(res); let flag = false; - if (res.rows && res.rows.length == this.page_size) { + if (res.rows && (res.rows?.length == this.page_size)) { flag = true; } else { flag = false; } this.flag = flag; - this.payOrderList = res.rows; + this.payOrderList = res.rows }); }, diff --git a/pages/user/index.vue b/pages/user/index.vue index c34bd9f5..6eb28458 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -25,7 +25,7 @@