From 1f47945c98b4a0e54954721190b445be6f4518ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 26 Sep 2025 11:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E4=B8=9A=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E6=A8=A1=E5=9D=97=E7=9A=84=E9=80=BB=E8=BE=91=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/community/propertyPayment/index.css |  1 +
 packages/community/propertyPayment/index.vue | 21 ++++++++++++--------
 pages/user/index.vue                         |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

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 @@
       <view class="payItem" v-for="(item, index) in Bill" :key="index">
         <view class="payItem_tit">
           <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>
           <view class="payItem_right">
@@ -72,7 +73,8 @@
         </view>
         <view v-if="item.more">
           <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">
               {{ items.order_date }}年
             </view>
@@ -158,7 +160,7 @@
           <view class="row_label">绑定房源</view>
           <view class="row_con3">
             <view class="row_con3_1">
-              {{ item.community_order.length }}个账单
+              {{ item.community_order ? item.community_order.length : 0 }}个账单
             </view>
             <view class="row_con3_2">明细可从收据查看</view>
           </view>
@@ -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 @@
 		</view>
 		<view class="section section1">
 			<view class="section_label">
-				<view>{{ userInfo.balance }}</view>
+				<view>{{ userInfo.property_housing_fund }}</view>
 				<view>积分</view>
 			</view>
 			<view class="section_label">