需求变更进行调整

pages-assets/assets/assetsDetail.vue

@@ -1,49 +1,46 @@
 <template>
 	<view class="asset-detail">
 		<!-- 顶部导航栏 -->
-		<customNavbar
-		  title="资产详情" 
-		  ref="navbar"
-		  :is-transparent="navbarStyle.isTransparent"
-		  :bg-color="navbarStyle.bgColor"
-		  :text-color="navbarStyle.textColor"
-		  :opacity="navbarStyle.opacity"
-		  :extra-icons="navbarStyle.extraIcons"
-		  :show-home="false"
-		/>
+		<customNavbar title="资产详情" ref="navbar" :is-transparent="navbarStyle.isTransparent"
+			:bg-color="navbarStyle.bgColor" :text-color="navbarStyle.textColor" :opacity="navbarStyle.opacity"
+			:extra-icons="navbarStyle.extraIcons" :show-home="false" />
 
 		<!-- 图片展示区 -->
 		<view class="image-section" :style="{ paddingTop: navTotalHeight + 'px' }">
-			<Carousel :list="swiperList" boxHeight="740rpx" 
-			:vrIcon="staticHost + '/public/static/icon/vr.png'"
-			 vrViewPage="/pages-biz/vr/vr"
-			 :vr-list="vrList"/>
+			<Carousel :list="swiperList" boxHeight="740rpx" :vrIcon="staticHost + '/public/static/icon/vr.png'"
+				vrViewPage="/pages-biz/vr/vr" :vr-list="vrList" />
 		</view>
 
 		<!-- 资产基本信息 -->
 		<view class="container">
 			<view class="basic-info">
 				<view class="info-header">
-					<view class="category-tag">{{ asset.category || '未知' }}</view>
+					<view class="category-tag">{{ asset.type || '未知' }}</view>
 					<view class="asset-name">{{ asset.name || '未知'}}</view>
 				</view>
-				<view class="rent-price">{{asset.rent || '未知'}}/月</view>
-				<view class="community-info">
-					<text class="label">所属小区：</text>
-					<text>{{ asset.community || '暂无'}}</text>
+				<view class=" featureArea feature-list">
+						<view class="feature-tag" v-for="(item, index) in asset.features" :key="index"
+							:style="{ color: getRandomColor().color,backgroundColor: getRandomColor().bg}">
+							{{ item }}
+						</view>
 				</view>
-				<view class="address-info">
-					<text class="label">地址：</text>
-					<text>{{ asset.address || '未知'}}</text>
+				<view class="stress-info">
+					<view class="stress-item">
+						<view class="stress-value">{{ asset.rent || '未知'}}/月</view>
+						<view class="stress-label">租金</view>
+					</view>
+					<view class="stress-item">
+						<view class="stress-value">{{ asset.layout || '未知'}}</view>
+						<view class="stress-label">户型</view>
+					</view>
+					<view class="stress-item">
+						<view class="stress-value">{{ asset.area || '未知'}}㎡</view>
+						<view class="stress-label">面积</view>
+					</view>
 				</view>
-				
 			</view>
 
-			<!-- 地图位置 -->
-			<view class="map-container">
-				<map :latitude="asset.lat||'0'" :longitude="asset.lng|| '0'" :markers="markers"
-					style="width: 92%; height: 300rpx;"></map>
-			</view>
+
 
 			<!-- 资产信息表格 -->
 			<view class="asset-info-table">
@@ -51,34 +48,56 @@
 				<view class="table-content">
 					<view class="table-row">
 						<view class="row-item">
-							<view class="item-label">编号</view>
-							<view class="item-value">{{ asset.code || '未知'}}</view>
+							<view class="item-label">朝向</view>
+							<view class="item-value">{{ asset.orientation || '未知'}}</view>
 						</view>
 						<view class="row-item">
-							<view class="item-label">面积</view>
-							<view class="item-value">{{asset.area || '未知'}}㎡</view>
+							<view class="item-label">电梯</view>
+							<view class="item-value">{{ asset.hasLift|| '未知' }}</view>
 						</view>
 					</view>
 					<view class="table-row">
 						<view class="row-item">
-							<view class="item-label">类别</view>
-							<view class="item-value">{{ asset.category || '未知'}}</view>
+							<view class="item-label">单元</view>
+							<view class="item-value">{{ asset.unitNo || '未知'}}</view>
 						</view>
 						<view class="row-item">
-							<view class="item-label">价值</view>
-							<view class="item-value">¥{{ formatMoney((asset && asset.value) || 0) }}</view>
+							<view class="item-label">楼层</view>
+							<view class="item-value">{{ asset.floorNo || '暂无' }}</view>
 						</view>
 					</view>
 					<view class="table-row">
 						<view class="row-item full-width">
-							<view class="item-label">权属</view>
-							<view class="item-value">{{ asset.owner || '未知'}}</view>
+							<view class="item-label">门牌号</view>
+							<view class="item-value">{{ asset.roomNo || '未知'}}</view>
+						</view>
+					</view>
+					<view class="table-row">
+						<view class="row-item full-width">
+							<view class="item-label">资产描述</view>
+							<view class="item-value">{{asset.remark || '未知'}}</view>
+						</view>
+					</view>
+					<view class="table-row">
+						<view class="row-item full-width">
+							<view class="item-label">商圈：</view>
+							<view class="item-value">{{ asset.bizZone || '暂无'}}</view>
+						</view>
+					</view>
+					<view class="table-row">
+						<view class="row-item full-width">
+							<view class="item-label">地址：</view>
+							<view class="item-value">{{ asset.address || '未知'}}</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-
+        <!-- 地图位置 -->
+        <view class="map-container">
+        	<map :latitude="asset.lat||'0'" :longitude="asset.lng|| '0'" :markers="markers"
+        		style="width: 92%; height: 300rpx;"></map>
+        </view>
 		<!-- 预约弹窗 -->
 		<u-popup v-model="showReserve" mode="bottom" border-radius="20">
 			<view class="popup-content">
@@ -90,17 +109,10 @@
 		</u-popup>
 
 		<!-- 底部导航栏 -->
-		<assetBottomBar v-if="asset.status === '闲置中'" 
-		:assetId="assetId" 
-		:phone="managerPhone" 
-		@reserve="showReserve = true"
-		 btn-title="预约看资产"
-		 shareBtnTitle="分享资产"
-		 page-path="/pages-assets/assets/detail/assetsDetail"
-		 minicode-api="/pages-assets/assets/detail/assetsDetail"
-		 btnColor="#FF2F31"
-		 :query="assetId"
-		 />
+		<assetBottomBar v-if="asset.status === '闲置中'" :assetId="assetId" :phone="managerPhone"
+			@reserve="showReserve = true" btn-title="预约看资产" shareBtnTitle="分享资产"
+			page-path="/pages-assets/assets/detail/assetsDetail" minicode-api="/pages-assets/assets/detail/assetsDetail"
+			btnColor="#FF2F31" :query="assetId" />
 	</view>
 </template>
 
@@ -113,29 +125,6 @@
 			CarouselVue
 		},
 		data() {
-			const staticAsset = {
-				name: '',
-				community: '',
-				code: '',
-				category: '',
-				area: 0,
-				value: 0,
-				rent: 0,
-				owner: '',
-				address: '',
-				lat: 0,
-				lng: 0,
-				images: [],
-				vrImage: '',
-				vr: '',
-				videos: [],
-				plans: [],
-				adImage: '',
-				remark: '',
-				isFavorite: false,
-				status: 0,
-				contact: ''
-			};
 			return {
 				// 控制预约弹窗显示
 				showReserve: false,
@@ -146,32 +135,31 @@
 				assetId: null,
 				// 直接使用静态数据
 				asset: null,
-				managerPhone:null,
+				managerPhone: null,
 				// 根据静态数据初始化标记
-				vrList:[],
-				markers: [{
-					id: 1,
-					latitude: staticAsset.lat,
-					longitude: staticAsset.lng,
-					title: staticAsset.name,
-				}],
+				vrList: [],
+				markers: [],
 				background: {
 					backgroundColor: '#ffffff',
 					// 渐变色
 					// backgroundImage: 'linear-gradient(-90deg, #F9DED9 0%, #F8DFC0 99%);'
 				},
-				
+
 				// 导航栏样式控制
 				navbarStyle: {
 					isTransparent: true,
 					bgColor: '#ffffff',
 					textColor: '#000000',
-					opacity: 0,
-					extraIcons: ['ellipsis', 'eye'] // 右侧额外图标
+					opacity: 1,
+					extraIcons: ['ellipsis'] // 右侧额外图标
 				},
-				
+
 				// 滚动距离
-				scrollTop: 0
+				scrollTop: 0,
+				tagColors: [{
+					color: '#ffffff',
+					bg: '#FF2F31'
+				}]
 			};
 		},
 		onLoad(options) {
@@ -182,8 +170,8 @@
 		},
 		mounted() {
 			const navbar = this.$refs.navbar;
-			 const navHeight = navbar.navContentHeight; // 直接拿子组件 data
-			 this.navTotalHeight = navHeight; // 加上额外间距
+			const navHeight = navbar.navContentHeight; // 直接拿子组件 data
+			this.navTotalHeight = navHeight; // 加上额外间距
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -191,64 +179,56 @@
 			this.updateNavbarStyle(e.scrollTop);
 		},
 		computed: {
-		staticHost() {
-			return this.$config.staticUrl
+			staticHost() {
+				return this.$config.staticUrl
 			},
-			swiperList(){
+			swiperList() {
 				let list = [];
-				if(this.asset && this.asset.vrImgs && this.asset.vrImgs.length > 0) {
-					this.asset.vrImgs.forEach(img=> {
+				if (this.asset && this.asset.vrImgs && this.asset.vrImgs.length > 0) {
+					this.asset.vrImgs.forEach(img => {
 						list.push({
 							src: this.$config.staticUrl + img,
-							mediaType:'vr',
-							bizType:'vr'
+							mediaType: 'vr',
+							bizType: 'vr'
 						})
 					})
 				}
-				// if(this.asset && this.asset.detailImgs && this.asset.detailImgs.length > 0) {
-				// 	this.asset.detailImgs.forEach(img=> {
-				// 		list.push({
-				// 			src: this.$config.staticUrl + img,
-				// 			mediaType:'vr',
-				// 			bizType:'vr'
-				// 		})
-				// 		this.vrList.push(this.$config.staticUrl + img)
-				// 	})
-				// }
-				
-				if(this.asset && this.asset.detailImgs && this.asset.detailImgs.length > 0) {
-					this.asset.detailImgs.forEach(img=> {
+				if (this.asset && this.asset.detailImgs && this.asset.detailImgs.length > 0) {
+					this.asset.detailImgs.forEach(img => {
 						list.push({
 							src: this.$config.staticUrl + img,
-							mediaType:'image',
-							bizType:'详细图片'
+							mediaType: 'image',
+							bizType: '详细图片'
 						})
 					})
 				}
-			   return list;
+				return list;
 			}
-		},	
+		},
 		methods: {
 			// 根据滚动距离更新导航栏样式
 			updateNavbarStyle(scrollTop) {
 				// 定义滚动阈值，超过此值导航栏变为不透明
 				const threshold = 200;
-				
+
 				// 计算透明度
 				let opacity = scrollTop / threshold;
 				opacity = Math.min(opacity, 1);
 				opacity = Math.max(opacity, 0);
-				
-				// 更新导航栏样式
-				this.navbarStyle.opacity = opacity;
 
-				if (opacity > 0.5) {
-					this.navbarStyle.isTransparent = false;
-				} else {
-					this.navbarStyle.isTransparent = true;
-				}
+				// 更新导航栏样式
+				// this.navbarStyle.opacity = opacity;
+
+				// if (opacity > 0.5) {
+				// 	this.navbarStyle.isTransparent = false;
+				// } else {
+				// 	this.navbarStyle.isTransparent = true;
+				// }
+			},
+			getRandomColor() {
+				const index = Math.floor(Math.random() * this.tagColors.length)
+				return this.tagColors[index]
 			},
-			
 			// 模拟接口请求
 			loadAssetDetail() {
 				let url = `/assets/detail?id=${this.assetId}`
@@ -257,33 +237,34 @@
 					console.log(data)
 					this.asset = {
 						name: data.assetsName,
-						community: data.community,
+						bizZone: data.bizZone,
 						code: data.assetsNo,
-						category: data.assetsType,
+						type: data.assetsType,
 						area: data.footPrint,
-						value: data.assetsValue,
 						rent: data.rentFee,
-						owner: data.owner,
 						address: data.assetsAddress,
+						hasLift: data.hasLift,
 						lat: data.latitude,
 						lng: data.longitude,
+						unitNo: data.unitNo,
 						roomNo: data.roomNo,
 						floorNo: data.floorNo,
-					    description: data.assetsDesc,
+						description: data.assetsDesc,
 						detailImgs: data.detailImgs,
+						layout: data.layout, //户型
+						orientation: data.orientation, //朝向
 						vrImgs: data.vrImgs,
 						remark: data.assetsDesc,
-						status: data.assetsStatus
+						status: data.assetsStatus,
+						features: ['家电齐全']
 					};
 					this.managerPhone = data.managerPhone
-					this.markers = [
-						{
-							id: 1,
-							latitude: this.asset.lat,
-							longitude: this.asset.lng,
-							title: this.asset.name,
-						},
-					];
+					this.markers = [{
+						id: 1,
+						latitude: this.asset.lat,
+						longitude: this.asset.lng,
+						title: this.asset.name,
+					}, ];
 				}).catch(err => {
 					console.log("获取资产信息失败：", err)
 				})
@@ -299,13 +280,13 @@
 				});
 			},
 			validatePhoneNumber(phone) {
-			    const regex = /^1[3-9]\d{9}$/;
-			    return regex.test(phone);
+				const regex = /^1[3-9]\d{9}$/;
+				return regex.test(phone);
 			},
 			submitReserve() {
 				console.log('提交预约看房申请')
 				// 身份证校验
-				if (this.validatePhoneNumber(this.reservePhone)) {
+				if (!this.validatePhoneNumber(this.reservePhone)) {
 					uni.showToast({
 						title: '手机号格式不正确',
 						icon: 'none'
@@ -313,18 +294,18 @@
 					return;
 				}
 				let url = '/reservate/submit'
-				this.$u.post(url,{
+				this.$u.post(url, {
 					reserveName: this.reserveName,
 					assetsNo: this.assetId,
 					assetsName: this.asset.name,
 					phone: this.reservePhone
-				},{
+				}, {
 					WT: this.$getToken()
-				}).then(res=>{
-					if(res.flag) {
+				}).then(res => {
+					if (res.flag) {
 						this.$mytip.toast('提交预约成功成功')
-					}else{
-						
+					} else {
+
 						this.$mytip.toast('预约提交失败，请重试')
 					}
 				})
@@ -332,17 +313,17 @@
 			},
 			recordView(assetId) {
 				let token = this.$getToken()
-				if(token){
+				if (token) {
 					let url = "/potential/add";
-				this.$u.get(url, {
-					assetId: this.assetId
-				}, {
-					'WT': this.$getToken()
-				}).then(obj => {
+					this.$u.get(url, {
+						assetId: this.assetId
+					}, {
+						'WT': this.$getToken()
+					}).then(obj => {
 
-				}).catch(err => {
-					console.log("记录客户浏览记录失败", err)
-				})
+					}).catch(err => {
+						console.log("记录客户浏览记录失败", err)
+					})
 				}
 			},
 		},
@@ -353,7 +334,7 @@
 	.asset-detail {
 		background-color: #f7f8fa;
 		min-height: 100vh;
-		padding-bottom: 120rpx;
+		padding-bottom: 400rpx;
 		padding-top: 0;
 		/* 不再需要固定的顶部内边距，由动态计算的 navTotalHeight 控制 */
 	}
@@ -383,6 +364,48 @@
 		padding-top: 50rpx;
 	}
 
+	.stress-info {
+		display: flex;
+		height: 150rpx;
+		background-color: #fff;
+	}
+
+	.stress-item {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		justify-content: center; // 垂直居中
+		align-items: center; // 水平居中
+		position: relative;
+	}
+
+	/* 分隔线：不是最后一个才显示 */
+	.stress-item:not(:last-child)::after {
+		content: '';
+		position: absolute;
+		right: 0;
+		top: 25%;
+		width: 1px;
+		height: 50%;
+		background-color: #eee;
+	}
+
+	/* 上面的 value */
+	.stress-value {
+		font-size: 40rpx;
+		font-weight: 600;
+		color: #FF2F31;
+		line-height: 1.2;
+	}
+
+	/* 下面的 label */
+	.stress-label {
+		margin-top: 8rpx;
+		font-size: 24rpx;
+		color: #999;
+	}
+
+
 	.info-header {
 		display: flex;
 		align-items: center;
@@ -405,13 +428,26 @@
 		flex: 1;
 	}
 
-	.rent-price {
-		font-size: 36rpx;
-		color: #FF2F31;
-		margin: 15rpx 0;
+	.feature-list {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
 	}
 
-	.community-info,
+	.feature-tag {
+		padding: 6rpx 16rpx;
+		font-size: 28rpx;
+		border-radius: 10rpx;
+		line-height: 1.4;
+	}
+
+    .featureArea{
+		margin-top: 30rpx;
+		margin-bottom: 10rpx;
+		display: flex;
+		align-items: center;
+	}
+	
 	.address-info {
 		font-size: 26rpx;
 		color: #666;
@@ -429,9 +465,13 @@
 	/* 地图容器 */
 	.map-container {
 		width: 100%;
+		height: 168px;
+		padding: 20rpx;
 		overflow: hidden;
 		display: flex;
 		justify-content: center;
+		background-color: white;
+		border-radius: 20rpx;
 	}
 
 	/* 资产信息表格 */
@@ -442,7 +482,7 @@
 	}
 
 	.table-title {
-		font-size: 30rpx;
+		font-size: 33rpx;
 		font-weight: bold;
 		color: #333;
 		margin-bottom: 20rpx;
@@ -473,12 +513,12 @@
 	}
 
 	.item-label {
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #999;
 	}
 
 	.item-value {
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #333;
 		font-weight: 500;
 	}