packages/community/index/index.vue

@@ -50,11 +50,7 @@
           :key="index"
           @click="headerServerClick(item)"
         >
-          <image
+          <image :src="item.ad_picture" mode="aspectFill" class="swiperBox2_img"/>
-            :src="item.ad_picture"
-            mode="aspectFill"
-            class="swiperBox2_img"
-          />
         </swiper-item>
       </swiper>
     </div>
@@ -175,7 +171,9 @@ import {
 } from "../../../utils";
 
 import { apiArr } from "../../../api/v2Community";
-import { apiArr as apiArr2 } from "../../../api/community";
+import {
+	apiArr as apiArr2
+} from '../../../api/community';
 
 export default {
   data() {
@@ -214,8 +212,6 @@ export default {
       page_num: 1,
       flag: false,
       loadMoreText: "",
-
-      isShowBill: false,
     };
   },
   async onLoad(options) {
@@ -226,11 +222,6 @@ export default {
         page_num: this.page_num,
         page_size: this.page_size,
       }).then((res) => {
-      res.rows.find((item) => {
-        if (item.community_id == uni.getStorageSync("changeCommData").id) {
-          this.isShowBill = item.bill_front_end_display == 1 ? true : false;
-        }
-      });
         this.communityList = res.rows;
       });
     const meun = menuButtonInfo();
@@ -299,16 +290,6 @@ export default {
         this.NotOpen();
         return;
       }
-      if (
-        e == "/packages/community/propertyPayment/index" &&
-        !this.isShowBill
-      ) {
-        uni.showToast({
-          title: "请配置账单",
-          icon: "none",
-        });
-        return;
-      }
       NavgateTo(e);
     },
 
@@ -554,10 +535,7 @@ export default {
       this.flag = hasMore;
 
       // 检查数据是否重复
-      const isDataDuplicate =
+      const isDataDuplicate = !isTabChange && this.infoList.length > 0 && newData.length > 0 && 
-        !isTabChange &&
-        this.infoList.length > 0 &&
-        newData.length > 0 &&
         this.infoList[this.infoList.length - 1].id === newData[0].id;
 
       // 更新数据

packages/community/providentFund/index.vue

@@ -1,21 +1,11 @@
 <template>
 	<view class="container">
-    <u-navbar
+		<u-navbar title=" " leftIconSize="20px" leftIconColor="#FFFFFF" bgColor="transparent" :autoBack="true" />
-      title=" "
-      leftIconSize="20px"
-      leftIconColor="#FFFFFF"
-      bgColor="transparent"
-      :autoBack="true"
-    />
 		<view class="container_body" :style="{ paddingTop: top + 'px' }">
 			<view class="title">物业公积金</view>
 			<view class="title_bottom">
 				<view>￥{{ moeny }}</view>
-        <u-icon
+				<u-icon name="info-circle" size="30rpx" color="linear-gradient( 180deg, #FFFFFF 0%, #FFD7D7 100%);" />
-          name="info-circle"
-          size="30rpx"
-          color="linear-gradient( 180deg, #FFFFFF 0%, #FFD7D7 100%);"
-        />
 			</view>
 			<view class="name" @click="headerSwitchClick">
 				<text>{{defaultName.name}}</text>
@@ -23,11 +13,7 @@
 			</view>
 		</view>
 		<view class="main">
-      <view
+			<view class="person_info" v-for="(item,index) in list.owners" :key="index">
-        class="person_info"
-        v-for="(item, index) in list.owners"
-        :key="index"
-      >
 				<view class="item">
 					<view class="label">姓名</view>
 					<view class="desc">{{ item.name }}</view>
@@ -50,18 +36,9 @@
 				<view class="item">
 					<view class="label fix">
 						<text>物业费公积金总余额</text>
-            <u-icon
+						<u-icon name="info-circle-fill" size="30rpx" color="red" @click="headerIconClick(index)" />
-              name="info-circle-fill"
+						<view class="popup" v-if="item.popupShow" @click="headerIconClick(index)">
-              size="30rpx"
+							{{ item.identity == '业主' ? ownerDesc : desc }}
-              color="red"
-              @click="headerIconClick(index)"
-            />
-            <view
-              class="popup"
-              v-if="item.popupShow"
-              @click="headerIconClick(index)"
-            >
-              {{ item.identity == "业主" ? ownerDesc : desc }}
 							<view class="angle"></view>
 						</view>
 					</view>
@@ -80,12 +57,7 @@
 				</view>
 				<view class="line"></view>
 				<view class="main">
-          <view
+					<view class="item" v-for="(item,index) in houseList" :key="index" @click="headerConfirmClick(item)">
-            class="item"
-            v-for="(item, index) in houseList"
-            :key="index"
-            @click="headerConfirmClick(item)"
-          >
 						<text>{{ item.name }}</text>
 						<image
 							v-if="item.checked"
@@ -112,78 +84,74 @@ import {
 	picUrl,
 	uniqueByField,
 	menuButtonInfo,
-  NavgateTo,
+	NavgateTo
-} from "../../../utils";
+} from '../../../utils';
+
+import { apiArr } from '../../../api/v2Community';
 
-import { apiArr } from "../../../api/v2Community";
 
 export default {
 	data() {
 		return {
-      top: "",
+			top: '',
-      moeny: "0.00",
+			moeny: '0.00',
 			show: false,
-      ownerDesc:
+			ownerDesc: '本房产的物业公积金为该房产的所有成员物业公积金总和。无需经过成员同意便可用于本房产的物业费抵扣，一旦成功抵扣，成员所拥有的物业公积金将自动进行扣除。',
-        "本房产的物业公积金为该房产的所有成员物业公积金总和。无需经过成员同意便可用于本房产的物业费抵扣，一旦成功抵扣，成员所拥有的物业公积金将自动进行扣除。",
+			desc: '物业公积金可通用至您加入的所有房产，任一房产的物业相关费用均可用该物业公积金抵扣。',
-      desc: "物业公积金可通用至您加入的所有房产，任一房产的物业相关费用均可用该物业公积金抵扣。",
+			defaultName: '',
-      defaultName: "",
+			list: [
-      list: [],
-      houseList: [],
-      roomList: [],
 			
-      itemObj: '',
+			],
-    };
+			houseList: [
+			
+			],
+			roomList:[]
+		}
 	},
 	async onLoad(options) {
-    if (options.item) {
+		const itemObj = JSON.parse(decodeURIComponent(options.item));
-      this.itemObj = JSON.parse(decodeURIComponent(options.item));
+		console.log("🚀 ~ onLoad ~ options.item:", itemObj)
+		// 首次加载时从itemObj获取defaultName数据
 		this.defaultName = {
-        ...this.itemObj,
+			...itemObj,
-        checked: true,
+			checked: true
 		};
-    } else {
-      this.defaultName = {
-        ...this.houseList[0],
-        checked: true,
-      };
-    }
-	console.log(this.itemObj)
 		const meun = menuButtonInfo();
 		this.top = meun.height + meun.top;
-    await this.getRoomList();
+		await this.getRoomList()
-    await this.getInfo();
+		await this.getInfo()
 	},
 
 	methods: {
 		headerConfirmClick(item) {
 			this.defaultName = {
 				...item,
-        checked: true,
+				checked: true
 			};
 			this.show = false;
-      this.getInfo();
+			this.getInfo()
 		},
 		//选择房产
 		headerSwitchClick() {
 			this.show = true;
-      const newRes = this.roomList.map((item) => {
+			const newRes = this.roomList.map(item => {
 				if (item.name === this.defaultName.name) {
 					return {
 						...item,
-            checked: true,
+						checked: true
-          };
+					}
 				}
 				return {
 					...item,
-          checked: false,
+					checked: false
-        };
+				}
 			});
-      console.log("newResnewRes", newRes);
+			console.log('newResnewRes', newRes);
 			this.houseList = newRes;
 		},
 		// 业主点击弹出层
 		headerIconClick(ind) {
-      this.list.owners[ind].popupShow = !this.list.owners[ind].popupShow;
+			this.list.owners[ind].popupShow = !this.list.owners[ind].popupShow
 		},
 		close() {
 			this.show = false;
@@ -193,34 +161,33 @@ export default {
 			await request(apiArr.getCommunityList,"POST",{
 				page_num:1,
 				page_size:50,
-        community_id: uni.getStorageSync("changeCommData").id,
+				community_id:uni.getStorageSync("changeCommData").id
-      }).then((res) => {
+			}).then(res=>{
-        res.rows.forEach((item) => {
+				res.rows.forEach(item=>{
-          item.checked = false;
+					item.checked = false
-        });
+				})
-        this.roomList = res.rows;
+				this.roomList = res.rows
-        if (!this.itemObj) {
+				// this.defaultName = res.rows[0]
-          this.defaultName = res.rows[0];
+			})
-        }
-      });
 		},
 		async getInfo(){
 			await request(apiArr.getGovernmentByRoom,"POST",{
-        room_id: this.defaultName.room_id,
+				room_id:this.defaultName.room_id
-      }).then((res) => {
+			}).then(res=>{
-        res.owners.forEach((item) => {
+				res.owners.forEach(item => {
-          item.popupShow = false;
+					item.popupShow = false
-        });
-        this.list = res;
 				});
+				this.list = res
+			})
 		},
 		goPay(){
-      NavgateTo("../propertyPayment/index");
+			NavgateTo("../propertyPayment/index")
+		}
 	},
-  },
+}
-};
 </script>
 
 <style lang="scss">
-@import "./index.scss";
+@import './index.scss';
+
 </style>