改为物业费

packages/community/choseCommunity/index.vue

@@ -107,7 +107,7 @@
 
       <div class="roomList">
         <!-- <div class="roomItem" v-for="(item,index) in 5" :class="index == 1?'active2':''"> -->
-        <div @click="nextStep(item, index, 'room')" :class="{ active2: index === selectedRoomIndex }" class="roomItem"
+        <div @click="nextStep(item, index, 'room')" :class="{ active2: index === selectedFinalRoomIndex }" class="roomItem"
           v-for="(item, index) in filteredFloorsList" :key="index">
           {{ item.label }}
         </div>
@@ -152,6 +152,7 @@ export default {
     return {
       selectedFloorIndex: -1,
       selectedRoomIndex: -1,
+      selectedFinalRoomIndex: -1, // 添加新的选中索引变量
       show: false,
       step: "1",
       communityName: "",
@@ -188,6 +189,13 @@ export default {
         region: val.confirmDist.ad_name.split(",").join(""),
         ...val.confirmDist,
       };
+      // 切换城市后重置step为1
+      this.step = "1";
+      // 重置选中状态
+      this.selectedFloorIndex = -1;
+      this.selectedRoomIndex = -1;
+      this.selectedFinalRoomIndex = -1;
+      // 调用搜索方法加载对应城市的数据
       this.searchByName();
       this.show = false;
     },
@@ -209,7 +217,12 @@ export default {
     },
     async nextStep(item, index, type = "") {
       if (type === "room") {
+        // 根据当前步骤设置不同的选中索引
+        if (this.step == 3) {
           this.selectedRoomIndex = index;
+        } else if (this.step == 4) {
+          this.selectedFinalRoomIndex = index;
+        }
       } else {
         this.selectedFloorIndex = index;
       }

packages/community/index/data.json

@@ -10,7 +10,7 @@
     },
     {
       "id": 3,
-      "category_name": "物业公积金"
+      "category_name": "物业费"
     },
     {
       "id": 4,
@@ -30,7 +30,7 @@
     },
     {
       "id": 3,
-      "title": "物业公积金",
+      "title": "物业费",
       "pic": "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/Group_3679.png"
     },
     {
@@ -52,8 +52,8 @@
     },
     {
       "id": 3,
-      "title": "物业公积金",
+      "title": "物业费",
-      "content": "各位业主：\n     上线\"物业公积金\"功能，其核心规则与使用方式如下，覆盖所有房产通用场景：\n一、物业公积金的获取方式\n     通过周边合作门店消费，即可获得物业公积金；\n二、跨房产通用：一份公积金，多房产可用\n     您的个人物业公积金不绑定单一房产，可通用至您已加入的所有房产。例如：您的个人公积金，既可抵扣A小区的物业费，也可抵扣您加入的B小区的水电费、C小区的燃气费，无需额外转移或申请。\n三、查询与透明化\n     在物业平台\"我的-物业公积金\"页面，可实时查看：个人公积金余额、所属房产的总额、抵扣记录（含抵扣房产、金额、个人扣除份额），确保每笔使用清晰可溯。"
+      "content": "各位业主：\n     上线\"物业费\"功能，其核心规则与使用方式如下，覆盖所有房产通用场景：\n一、物业费的获取方式\n     通过周边合作门店消费，即可获得物业费；\n二、跨房产通用：一份公积金，多房产可用\n     您的个人物业费不绑定单一房产，可通用至您已加入的所有房产。例如：您的个人公积金，既可抵扣A小区的物业费，也可抵扣您加入的B小区的水电费、C小区的燃气费，无需额外转移或申请。\n三、查询与透明化\n     在物业平台\"我的-物业费\"页面，可实时查看：个人公积金余额、所属房产的总额、抵扣记录（含抵扣房产、金额、个人扣除份额），确保每笔使用清晰可溯。"
     },
     {
       "id": 4,

packages/community/index/index.vue

@@ -227,7 +227,7 @@ export default {
         },
         {
           nav_icon: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/noValFunction3.png',
-          nav_name: "物业公积金",
+          nav_name: "物业费",
         },
         {
           nav_icon: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/noValFunction1.png',
@@ -346,7 +346,7 @@ export default {
         jump_target: 1,
         mini_program_url: "/packages/community/providentFund/index",
         nav_icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/noValFunction3.png",
-        nav_name: "物业公积金",
+        nav_name: "物业费",
         other_appid: "",
         other_path: "",
         sort: 2,

packages/community/propertyPayment/index.vue

@@ -35,7 +35,7 @@
     <view class="homeMoney" v-if="active == 0">
       <view class="homeMoney_box">
         <view class="homeMoney_box_left">
-          <view class="homeMoney_box_left1">物业公积金</view>
+          <view class="homeMoney_box_left1">物业费</view>
           <view class="homeMoney_box_left2">可抵扣账户金额</view>
         </view>
         <view class="homeMoney_box_right">
@@ -120,7 +120,7 @@
               src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png" alt="" />
           </view>
           <view class="PayTypeItem_con">
-            <view class="PayTypeItem_con_tit">物业公积金支付</view>
+            <view class="PayTypeItem_con_tit">物业费支付</view>
             <view class="PayTypeItem_con_msg">
               可用公积金：<span>￥</span>{{ balanceMoney }}
               <view class="PayTypeItem_con_msg2" @click="changeShow2">
@@ -238,7 +238,7 @@
             <view class="banlenceItem_left">
               <image mode="aspectFill"
                 src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_homeMoney.png" alt="" />
-              物业公积金支付
+              物业费支付
             </view>
             <view class="banlenceItem_right">
               <span>￥</span>{{ balanceMoney > currentMoney ? currentMoney : balanceMoney }}
@@ -247,7 +247,7 @@
         </view>
 
         <view class="btn" @click="createPay">
-          物业公积金+微信支付 <span>￥</span>{{ currentMoney }}
+          物业费+微信支付 <span>￥</span>{{ currentMoney }}
         </view>
       </view>
     </view>
@@ -306,10 +306,10 @@ export default {
   onPullDownRefresh() {
     // 根据当前激活的标签页，重新加载对应的数据
     if (this.active === 0) {
-      // 账单页面，重新获取公积金和账单数据
+      // 账单页面，重新获取公积金和账单数据，不重置已选择的小区
       Promise.all([
         this.getUserGovenmentMoney(),
-        this.getRoomSelect()
+        this.getOrderList()
       ]).then(() => {
         // 数据加载完成后停止下拉刷新
         uni.stopPullDownRefresh();
@@ -513,9 +513,9 @@ export default {
       if (this.payType == 1) {
         name_mini = "微信";
       } else if (this.payType == 2) {
-        name_mini = "物业公积金";
+        name_mini = "物业费";
       } else {
-        name_mini = "微信 + 物业公积金";
+        name_mini = "微信 + 物业费";
       }
       if (!this.currentMoney) {
         return uni.showToast({
@@ -576,7 +576,7 @@ export default {
       // 组合支付
       if (isComboPay && (payParams.money != 0.00 || payParams.money != 0)) {
         this.payType = 3;
-        name_mini = "微信 + 物业公积金";
+        name_mini = "微信 + 物业费";
       }
 
       payParams.name_mini = name_mini;
@@ -584,7 +584,7 @@ export default {
       if (this.payType == 2) {
         uni.showModal({
           title: '提示',
-          content: '确定使用物业公积金支付？',
+          content: '确定使用物业费支付？',
           success: async (res) => {
             if (res.confirm) {
               await request(apiArr.createPayOrder, "POST", payParams).then((res) => {
@@ -701,7 +701,7 @@ export default {
       });
     },
 
-    //物业公积金详情
+    //物业费详情
     more(item) {
       NavgateTo(`../providentFund/index?item=${JSON.stringify(item)}`);
     },

packages/community/providentFund/index.vue

@@ -8,7 +8,7 @@
       :autoBack="true"
     />
     <view class="container_body" :style="{ paddingTop: top + 'px' }">
-      <view class="title">物业公积金</view>
+      <view class="title">物业费</view>
       <view class="title_bottom">
         <view>￥{{ getTotal(list.owners) }}</view>
         <u-icon
@@ -124,8 +124,8 @@ export default {
       moeny: "0.00",
       show: false,
       ownerDesc:
-        "本房产的物业公积金为该房产的所有成员物业公积金总和。无需经过成员同意便可用于本房产的物业费抵扣，一旦成功抵扣，成员所拥有的物业公积金将自动进行扣除。",
+        "本房产的物业费为该房产的所有成员物业费总和。无需经过成员同意便可用于本房产的物业费抵扣，一旦成功抵扣，成员所拥有的物业费将自动进行扣除。",
-      desc: "物业公积金可通用至您加入的所有房产，任一房产的物业相关费用均可用该物业公积金抵扣。",
+      desc: "物业费可通用至您加入的所有房产，任一房产的物业相关费用均可用该物业费抵扣。",
       defaultName: "",
       list: [],
       houseList: [],

packages/community/serverList/index.vue

@@ -96,7 +96,7 @@ export default {
 				},
 				{
 					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_serverIcon5.png",
-					name: "物业公积金",
+					name: "物业费",
 					url: ""
 				},
 				{
@@ -106,7 +106,7 @@ export default {
 				},
 				{
 					icon: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_serverIcon7.png",
-					name: "物业公积金",
+					name: "物业费",
 					url: ""
 				},
 				{

packages/localLife/pay/index.vue

@@ -28,7 +28,7 @@
 
         <view class="Msg2">
             <view class="Msg2_tit">
-                <view class="Msg2_tit_left">获得物业公积金</view>
+                <view class="Msg2_tit_left">获得物业费</view>
                 <!-- <view class="Msg2_tit_right" @click="choseComminty">
                     绑定房源
                     <u-icon name="arrow-right" color="#999999" size="28"></u-icon>

packages/localLife/paySucess/index.vue

@@ -9,7 +9,7 @@
 
         <div class="msg">
             <div class="msgItem">
-                <div class="msgItem_left">获得物业公积金</div>
+                <div class="msgItem_left">获得物业费</div>
                 <div class="msgItem_right">
                     ￥53.1
                     <u-icon name="arrow-right" color="#999999" size="40" style="max-lines: 10rpx;"></u-icon>

packages/user/wallet/index.vue

@@ -80,7 +80,7 @@ export default {
         const meun = menuButtonInfo();
         this.top = meun.top;
         this.localHeight = meun.height;
-        this.topVal = options.type == 1 ? '积分' : (options.type == 2 ? '物业公积金' : '红包卡券');
+        this.topVal = options.type == 1 ? '积分' : (options.type == 2 ? '物业费' : '红包卡券');
         this.photoVal = options.type == 1 ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet1.png' : (options.type == 2 ? 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet2.png' : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com//user_wallet3.png');
         this.itemObj = JSON.parse(options.item);
         this.itemType = options.type;

packages/workOrderDashboard/guide/index.vue

@@ -27,7 +27,7 @@
                 </view>
                 <view class="walletBox_item" @click="goWallet(3, walletInfo.pending ? walletInfo.pending.toFixed(2) : '0.00')">
                     <view>{{ walletInfo.pending ? walletInfo.pending.toFixed(2) : "0.00" }}元</view>
-                    <view class="walletBox_item_text">待收物业公积金</view>
+                    <view class="walletBox_item_text">待收物业费</view>
                 </view>
                 <!-- <view class="walletBox_item" @click="goWallet(4, walletInfo.handling_fee.toFixed(2))">
                     <view>{{ walletInfo.handling_fee ? walletInfo.handling_fee.toFixed(2) : "0.00" }}元</view>

packages/workOrderDashboard/wallet/index.vue

@@ -24,7 +24,7 @@
 
         <!-- 余额变动记录 -->
         <view class="records-container">
-            <view class="records-title" v-if="topVal == '待收物业公积金'">物业费公积金变动记录</view>
+            <view class="records-title" v-if="topVal == '待收物业费'">物业费公积金变动记录</view>
             <view v-if="records.length == 0">
                 <view class="records-list">暂无变动记录</view>
             </view>
@@ -39,7 +39,7 @@
                         <view class="record-balance" v-if="topVal == '应收' || topVal == '已收'">{{ record.change_reason ==
                             1 ? '收款' :
                             '退款' }}</view>
-                        <view class="record-balance" v-else-if="topVal == '待收物业公积金'">待收</view>
+                        <view class="record-balance" v-else-if="topVal == '待收物业费'">待收</view>
                         <view class="record-balance" v-else-if="topVal == '手续费'">手续费</view>
                         <view>
                             <text :class="['amount-sign', record.change_reason == 1 ? 'positive' : 'negative']">{{
@@ -94,7 +94,7 @@ export default {
                     this.topVal = '已收';
                     break;
                 case 3:
-                    this.topVal = '待收物业公积金';
+                    this.topVal = '待收物业费';
                     break;
                 case 4:
                     this.topVal = '手续费';
@@ -112,7 +112,7 @@ export default {
                     filteredRows = res.rows.filter(item => item.change_category == 2);
                 } else if (this.topVal == '已收') {
                     filteredRows = res.rows.filter(item => item.change_category == 1);
-                } else if (this.topVal == '待收物业公积金') {
+                } else if (this.topVal == '待收物业费') {
                     filteredRows = res.rows.filter(item => item.change_category == 4);
                 } else {
                     filteredRows = res.rows.filter(item => item.change_category == 3);