From 15288eaa10d47c6f569213cf9d79965c3352a7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Mon, 20 Oct 2025 11:50:56 +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=E7=82=B9=E5=87=BB=E5=8E=BB=E6=8A=B5=E6=89=A3=E7=89=A9?=
 =?UTF-8?q?=E4=B8=9A=E8=B4=A6=E5=8D=95=E5=90=8E=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=B7=E6=B1=82=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/community/propertyPayment/index.vue | 19 +++++++++++++++----
 packages/community/providentFund/index.vue   |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/community/propertyPayment/index.vue b/packages/community/propertyPayment/index.vue
index 4214ba12..a7f4cac9 100644
--- a/packages/community/propertyPayment/index.vue
+++ b/packages/community/propertyPayment/index.vue
@@ -298,6 +298,15 @@ export default {
     this.localHeight = meun.height;
     this.currentCommunity = uni.getStorageSync("changeCommData");
     this.currentCommunityAddr = uni.getStorageSync("currentCommunityAddr");
+    // 解析从providentFund页面传递过来的房源信息
+    if (options.item) {
+      try {
+        const item = JSON.parse(decodeURIComponent(options.item));
+        this.currentRoom = item;
+      } catch (error) {
+        console.error("解析房源信息失败:", error);
+      }
+    }
     this.getRoomSelect();
     this.getUserGovenmentMoney();
   },
@@ -330,7 +339,7 @@ export default {
       });
     }
   },
-  
+
   // 滑动到底部生命周期函数
   onReachBottom() {
     // 只有在缴费记录页面且还有更多数据时才触发加载更多
@@ -379,7 +388,9 @@ export default {
           page_size: 50,
         }).then((res) => {
           this.roomList = res.rows;
-          this.currentRoom = this.roomList[0];
+          if (!this.currentRoom.room_id) {
+            this.currentRoom  = this.roomList[0]
+          }
           this.selectedRoomId = this.currentRoom.room_id;
           this.getOrderList().then(() => {
             resolve();
@@ -401,7 +412,7 @@ export default {
 
       this.currentRoom = item;
       this.getOrderList();
-      
+
       // 如果当前是缴费记录标签页，重新请求缴费记录数据
       if (this.active === 1) {
         // 重置分页参数
@@ -687,7 +698,7 @@ export default {
             flag = false;
           }
           this.flag = flag;
-          
+
           // 如果是第一页，直接替换数据；如果是加载更多，追加数据
           if (this.page_num === 1) {
             this.payOrderList = res.rows || [];
diff --git a/packages/community/providentFund/index.vue b/packages/community/providentFund/index.vue
index 510cee21..20d071ca 100644
--- a/packages/community/providentFund/index.vue
+++ b/packages/community/providentFund/index.vue
@@ -219,7 +219,7 @@ export default {
       });
     },
     goPay() {
-      NavgateTo("../propertyPayment/index");
+      NavgateTo("../propertyPayment/index?item=" + encodeURIComponent(JSON.stringify(this.defaultName)));
     },
   },
 };