From 27355aa36b7f8b0e2e9681c4f907aef0a5e961a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 03 Nov 2023 16:26:45 +0800
Subject: [PATCH] 楼盘表下转逻辑调整

---
 subPackage/house/family/index.vue |   21 +++++++++++++++++----
 subPackage/house/list/index.vue   |    6 ++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/subPackage/house/family/index.vue b/subPackage/house/family/index.vue
index feb43cd..ff570b8 100644
--- a/subPackage/house/family/index.vue
+++ b/subPackage/house/family/index.vue
@@ -47,13 +47,13 @@
 							</view>
 						</view>
 					</u-collapse-item>
-					<u-collapse-item v-show="isShowShop" style="border: none;" title="商铺" 
+					<u-collapse-item class="sp-list" v-show="isShowShop" style="border: none;" title="商铺" 
 						>
-						<view class="house-list-box" v-for="(item, index) in shopList" :name="index" :key="index" @click.native="pushShopPage(item)">
+						<view class="house-list-box flex" v-for="(item, index) in shopList" :name="index" :key="index" @click.native="pushShopPage(item)">
 							<view class="l">
 								<u-icon name="home" color="#fff"></u-icon>
 							</view>
-							<view class="r">
+							<view class="r nowrap-ellipsis-hidden">
 								{{item.floor}}
 							</view>
 						</view>
@@ -105,7 +105,7 @@
 					type:3,
 					code:this.currentId,
 					name: this.addressType==1?"":this.neiCode,
-					addressType :this.addressType
+					addressType :this.addressType==3?2:1
 				}
 				const res = await getHouseList(param)
 				const aoiList = res.data.aoiList
@@ -219,7 +219,20 @@
 				color: #fff;
 				background: linear-gradient(to right, #417BE9, #6D9FFB);
 				box-sizing: border-box;
+				
+				.r {
+					width: 0;
+					flex: 1;
+				}
 			}
 		}
 	}
+	
+	.sp-list {
+		/deep/ .u-collapse-item__content__text {
+			display: flex;
+			flex-direction: row;
+			flex-wrap: wrap;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/subPackage/house/list/index.vue b/subPackage/house/list/index.vue
index e829ec1..4c2e089 100644
--- a/subPackage/house/list/index.vue
+++ b/subPackage/house/list/index.vue
@@ -92,14 +92,16 @@
 			},
 			pushPage(value) {
 				const { id, title,addressType } = value
-				if(addressType == 1){
+				// addressType == 3 街路巷
+				if(addressType == 1 || addressType == 3){
 					if (id !== void 0) {
 						let url = `/subPackage/house/family/index?id=${id}&housingName=${this.curHouseTitle}
 						&buildingName=${title}&addressType=${addressType}&neiCode=${this.currentId}`
 						this.$u.func.globalNavigator(url, "navTo")
 					}
 				}else{
-					// 跳转场所页面
+					// 跳转场所页面 addressType == 2
+					
 				}
 			}
 		}

--
Gitblit v1.9.3