From 42c73b117baa2f39e362f879e06467c8c937f528 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 27 Nov 2023 18:29:00 +0800
Subject: [PATCH] 修复楼盘表问题

---
 subPackage/house/family/index.vue |    8 --------
 subPackage/house/list/index.vue   |   43 +++++++++++++++++++++++++------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index a71ad31..27abc69 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -185,21 +185,13 @@
 	.container {
 		width: 100%;
 		height: 100%;
-
 		display: flex;
 		flex-direction: column;
 		background: #F9F9FA;
 		font-size: 26rpx;
-
-
 		.main {
-			position: relative;
-			height: 0;
 			flex: 1;
 			overflow-y: auto;
-
-
-
 			.content {
 				margin-top: 20rpx;
 				background-color: #fff;
diff --git a/subPackage/house/list/index.vue b/subPackage/house/list/index.vue
index 59bd4a3..2318cf5 100644
--- a/subPackage/house/list/index.vue
+++ b/subPackage/house/list/index.vue
@@ -5,19 +5,30 @@
 			<text>{{ curSelectSite.name }}/{{ curHouseTitle }}</text>
 		</view>
 		<view class="flex f-d-c main">
-			<u-icon name="/static/icon/blue_floor.png"></u-icon>
-			<view class="r">测试</view>
-		</view>
-		<!-- <view class="flex f-d-c main">
 			<view class="flex house-container">
-				<view class="house-list-box">
+				<view class="house-list-box" v-if="isShowAoi" v-for="(item, index) in houseList"
+					@click="pushPage(item)"  :key="index">
 					<view class="l">
 						<u-icon name="/static/icon/blue_floor.png"></u-icon>
 					</view>
-					<view class="r">测试</view>
+					<view class="r">
+						{{item.name}}
+					</view>
+				</view>
+				<!-- 商铺 -->
+				<view class="house-list-box" v-if="isShowShop" v-for="(item, index) in shopList"
+					@click="pushPage(item)"   :key="index">
+					<view class="l">
+						<u-icon name="/static/icon/store.png"></u-icon>
+					</view>
+					<view class="r">
+						{{item.name}}
+					</view>
 				</view>
 			</view>
-		</view> -->
+			<u-toast ref="uToast"></u-toast>
+			<u-divider text="已经到底了"></u-divider>
+		</view>
 	</view>
 </template>
 
@@ -35,7 +46,7 @@
 				currentId: '',
 				curSelectSite: {},
 				curHouseTitle: '',
-				addressType: 1,
+				addressType:1,
 				houseList: [{
 					name: '-'
 				}],
@@ -59,7 +70,7 @@
 			this.curSelectSite = uni.getStorageSync('siteInfo')
 		},
 		mounted() {
-			// this.getHouseInfo()
+			this.getHouseInfo()
 		},
 		methods: {
 			async getHouseInfo() {
@@ -72,21 +83,18 @@
 					type: 2,
 					code: this.currentId,
 					roleName: uni.getStorageSync('activeRole').roleName,
-					addressType: this.addressType
+					addressType:this.addressType
 				}
 				const res = await getHouseList(param)
 				// const aoiList = res.data.aoiList
 				// const shopList = res.data.shopList
-				let {
-					aoiList,
-					shopList
-				} = res.data;
+				let { aoiList ,shopList} = res.data;
 				this.houseList = aoiList;
 				this.shopList = shopList;
 				if (aoiList.length) {
 					this.isShowAoi = true
 				}
-				if (shopList.length) {
+				if(shopList.length){
 					this.isShowShop = true
 				}
 				// if (aoiList.length > 0) {
@@ -157,9 +165,7 @@
 				margin-left: 15rpx;
 			}
 		}
-
 		.main {
-			height: 0;
 			flex: 1;
 			overflow-y: auto;
 			margin-top: 20rpx;
@@ -167,6 +173,7 @@
 			.house-container {
 				flex-wrap: wrap;
 				padding: 14rpx;
+
 				.house-list-box {
 					margin: 16rpx;
 					padding: 0 16rpx;
@@ -178,7 +185,7 @@
 					border-radius: 12rpx;
 					color: #333333;
 					// background: #FAFBFE;
-					background-color: rgb(236, 244, 255);
+					background-color:rgb(236,244,255);
 					box-sizing: border-box;
 				}
 			}

--
Gitblit v1.9.3