优化物业缴费模块的逻辑和数据展示
This commit is contained in:
parent
0bc9cace0c
commit
1f47945c98
@ -214,6 +214,7 @@ image {
|
|||||||
|
|
||||||
.payItem_money{
|
.payItem_money{
|
||||||
width: auto;
|
width: auto;
|
||||||
|
margin-right: 10rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bottom {
|
.bottom {
|
||||||
|
|||||||
@ -56,7 +56,8 @@
|
|||||||
<view class="payItem" v-for="(item, index) in Bill" :key="index">
|
<view class="payItem" v-for="(item, index) in Bill" :key="index">
|
||||||
<view class="payItem_tit">
|
<view class="payItem_tit">
|
||||||
<view class="payItem_left">
|
<view class="payItem_left">
|
||||||
<checkbox :checked="item.check" @click="checkChange(item, index)"></checkbox>
|
<checkbox :checked="item.check" @click="checkChange(item, index)"
|
||||||
|
v-if="item.community_order_rows.some(itemObj => itemObj.pay_status == 1)"></checkbox>
|
||||||
<view style="margin-left: 24rpx">{{ item.order_date }}年</view>
|
<view style="margin-left: 24rpx">{{ item.order_date }}年</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="payItem_right">
|
<view class="payItem_right">
|
||||||
@ -72,7 +73,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view v-if="item.more">
|
<view v-if="item.more">
|
||||||
<view class="payItem_List" v-for="(items, indes) in item.community_order_rows" :key="items.order_id">
|
<view class="payItem_List" v-for="(items, indes) in item.community_order_rows" :key="items.order_id">
|
||||||
<checkbox :checked="items.check" @click="itemsCheckChange(items, indes, index)"></checkbox>
|
<checkbox :checked="items.check" @click="itemsCheckChange(items, indes, index)"
|
||||||
|
v-if="items.pay_status == 1"></checkbox>
|
||||||
<view class="Item_time" v-if="items.billing_cycle == 1">
|
<view class="Item_time" v-if="items.billing_cycle == 1">
|
||||||
{{ items.order_date }}年
|
{{ items.order_date }}年
|
||||||
</view>
|
</view>
|
||||||
@ -158,7 +160,7 @@
|
|||||||
<view class="row_label">绑定房源</view>
|
<view class="row_label">绑定房源</view>
|
||||||
<view class="row_con3">
|
<view class="row_con3">
|
||||||
<view class="row_con3_1">
|
<view class="row_con3_1">
|
||||||
{{ item.community_order.length }}个账单
|
{{ item.community_order ? item.community_order.length : 0 }}个账单
|
||||||
</view>
|
</view>
|
||||||
<view class="row_con3_2">明细可从收据查看</view>
|
<view class="row_con3_2">明细可从收据查看</view>
|
||||||
</view>
|
</view>
|
||||||
@ -396,7 +398,7 @@ export default {
|
|||||||
let money = 0;
|
let money = 0;
|
||||||
this.Bill.forEach((item) => {
|
this.Bill.forEach((item) => {
|
||||||
item.community_order_rows.forEach((ite) => {
|
item.community_order_rows.forEach((ite) => {
|
||||||
if (ite.check) {
|
if (ite.check && ite.pay_status == 1) {
|
||||||
money += ite.money;
|
money += ite.money;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -473,7 +475,11 @@ export default {
|
|||||||
|
|
||||||
if (this.payType == 1 || isComboPay) {
|
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) {
|
if (this.payType == 2 || isComboPay) {
|
||||||
@ -592,15 +598,14 @@ export default {
|
|||||||
page_num: this.page_num,
|
page_num: this.page_num,
|
||||||
page_size: this.page_size,
|
page_size: this.page_size,
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
console.log(res);
|
|
||||||
let flag = false;
|
let flag = false;
|
||||||
if (res.rows && res.rows.length == this.page_size) {
|
if (res.rows && (res.rows?.length == this.page_size)) {
|
||||||
flag = true;
|
flag = true;
|
||||||
} else {
|
} else {
|
||||||
flag = false;
|
flag = false;
|
||||||
}
|
}
|
||||||
this.flag = flag;
|
this.flag = flag;
|
||||||
this.payOrderList = res.rows;
|
this.payOrderList = res.rows
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="section section1">
|
<view class="section section1">
|
||||||
<view class="section_label">
|
<view class="section_label">
|
||||||
<view>{{ userInfo.balance }}</view>
|
<view>{{ userInfo.property_housing_fund }}</view>
|
||||||
<view>积分</view>
|
<view>积分</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="section_label">
|
<view class="section_label">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user