From 60616b8c1f14ec77cff87a52dc136731e4115241 Mon Sep 17 00:00:00 2001
From: xjw123456 <xujinwei19980401@163.com>
Date: Tue, 5 Dec 2023 16:25:24 +0800
Subject: [PATCH] =?UTF-8?q?//=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=20?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E9=A1=B5=20=E6=B7=BB=E5=8A=A0=E6=88=BF?=
 =?UTF-8?q?=E5=AD=90=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js                     |  7 ++++-
 pages.json                        | 10 +++++-
 pages/homeDetails/homeDetails.vue | 27 +++++++++++++++++
 pages/index/index.vue             | 64 ++++++++++++++++++++++-----------------
 pages/notice/notice.vue           | 47 ++++++++++++++++++++++++----
 5 files changed, 119 insertions(+), 36 deletions(-)
 create mode 100644 pages/homeDetails/homeDetails.vue

diff --git a/common/api.js b/common/api.js
index 90fe50f..b8604cc 100644
--- a/common/api.js
+++ b/common/api.js
@@ -30,4 +30,9 @@ export const getHotList = (params, succCallback, errorCallback) => {
 //  请求接口获得后台列表数据信息 = 推荐房源
 export const getHouseListPage = (params, succCallback, errorCallback) => {
 	return request('/job-dev/house/applet/indexListPage', params,'GET',true, succCallback,errorCallback)
-};
\ No newline at end of file
+};
+
+// 获取公告通知
+export const getNiceInfo = (params, succCallback, errorCallback) => {
+	return request('/job-dev/house/applet/notice', params,'GET',true, succCallback,errorCallback)
+};
diff --git a/pages.json b/pages.json
index 6275506..a7a80f7 100644
--- a/pages.json
+++ b/pages.json
@@ -24,7 +24,7 @@
 		"path" : "pages/search/search",
 		"style" : 
 		{
-			"navigationBarTitleText" : "",
+			"navigationBarTitleText" : "搜索",
 			"enablePullDownRefresh" : false
 		}
 	},
@@ -35,6 +35,14 @@
 			"navigationBarTitleText" : "公告",
 			"enablePullDownRefresh" : false
 		}
+	},
+	{
+		"path" : "pages/homeDetails/homeDetails",
+		"style" : 
+		{
+			"navigationBarTitleText" : "详情",
+			"enablePullDownRefresh" : false
+		}
 	}
 	],
 	"globalStyle": {
diff --git a/pages/homeDetails/homeDetails.vue b/pages/homeDetails/homeDetails.vue
new file mode 100644
index 0000000..1767b73
--- /dev/null
+++ b/pages/homeDetails/homeDetails.vue
@@ -0,0 +1,27 @@
+<template>
+	<view>
+		这是房子详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: ''
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+		},
+		methods: {
+			getHomeDetails(id){
+				console.log(id);
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 49e7836..2df5c41 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,16 @@
 <template>
 	<view class="container">
-	
+	<!-- 吸顶搜索地址栏 -->
+	<u-sticky enable bgColor="#fff" offset-top="0">
+			<view class="sticky">
+				<view class="city">
+					长沙
+				</view>
+				<view class="search_btn">
+					<u-search placeholder="请输入您要搜索的城市" v-model="keyword" @search="toSearch" @focus="toSearch"></u-search>
+				</view>
+			</view>
+		</u-sticky>
 		<!-- </view> -->
 		<view class="ant-banner-box">
 			<!-- banner 部分 -->
@@ -12,17 +22,7 @@
 					</view>
 				</swiper-item>
 			</swiper>
-			<!-- <image class="ant-banner" mode="scaleToFill" :src="bannerList[3].image" /> -->
-			<!-- <view class="">
-				<p>一个有温度的家</p>
-				<p class="ant-font-24">超多房源｜等你来挑</p>
-			</view> -->
 		</view>
-	<!-- 	<view class="ant-float">
-			<view class="ant-flex-line">
-				<view class="ant-select">江华</view>
-			</view>
-		</view> -->
 		<view class="card_box">
 			<view class="ant-menu-card">
 				<view class="ant-flex-line">
@@ -54,21 +54,11 @@
 				</view>
 			</view>
 		</view>
-		<!-- 吸顶搜索地址栏 -->
-		<u-sticky enable h5-nav-height="44" offset-top="88">
-				<view class="sticky">
-					<view class="city">
-						长沙
-					</view>
-					<view class="search_btn">
-						<u-search placeholder="请输入您要搜索的城市" v-model="keyword" @search="toSearch" @focus="toSearch"></u-search>
-					</view>
-				</view>
-			</u-sticky>
+
 		
 		<!-- 滚动公告 -->
 		<view class="notice">
-			<u-notice-bar :volume-icon="false" autoplay is-circular more-icon :speed="200"  mode="horizontal" :text="noticeList" url="/pages/notice/notice"></u-notice-bar>
+			<u-notice-bar :volume-icon="false" autoplay is-circular more-icon :speed="200"  mode="horizontal" :text="noticeList" :url="'/pages/notice/notice?state='+notice_id"></u-notice-bar>
 		</view>
 		
 		<view class="ant-content">
@@ -82,7 +72,7 @@
 				<view class="ant-flex-line scroll-view_H_x">
 					<scroll-view class="scroll-view_H" scroll-x="true" lower-threshold="51"
 						@scrolltolower="scrollTolowerHotList">
-						<view class="ant-page-image-item" v-for="(item,index) in hotList">
+						<view class="ant-page-image-item" v-for="(item,index) in hotList" @click="toHomeDetails(item.id)">
 							<image class="ant-page-image-item" mode="aspectFill"
 								:src="item.image ? item.image :image" />
 							<view class="ant-img-tags">
@@ -100,7 +90,7 @@
 					<view class="ant-page-title">推荐房源</view>
 				</view>
 
-				<view class="ant-item-box" v-for="(item,index) in list">
+				<view class="ant-item-box" v-for="(item,index) in list" @click="toHomeDetails(item.id)">
 					<view>
 						<image class="ant-item-image" mode="aspectFill" :src="item.image? item.image : image" />
 					</view>
@@ -145,6 +135,7 @@
 				scrollPage: 1, //横向滚动
 				scrollSize: 20,
 				scrollTotal: null,
+				notice_id: '',
 			}
 		},
 		onLoad() {
@@ -153,6 +144,7 @@
 			this.getClassList();
 			this.getHotList();
 			this.getHouseListPage();
+			this.getNiceInfo();
 			// 让出导航栏和胶囊的位置
 		},
 		// 下拉刷新首页推荐房源
@@ -306,9 +298,22 @@
 
 			// 下拉刷新 首页推荐房源分页下拉加载，上拉刷新。如果加载完了提示 没有更多了
 
-
-			// 上拉加载
+			getNiceInfo(){
+				this.$api.getNiceInfo().then(res => {
+					console.log(res,"tonggaos")
+					this.noticeList = res.result[0].title;
+					this.notice_id = res.result[0].id;
+				}).catch(err => {
+					console.log(err)
+				})
+			},
 			
+			// 跳转详情页
+			toHomeDetails(id){
+				uni.navigateTo({
+					url: '/pages/homeDetails/homeDetails?id='+id
+				})
+			},
 			// 跳转 搜索页面
 			toSearch(){
 				uni.navigateTo({
@@ -331,6 +336,9 @@
 	/deep/ .u-sticky{
 		display: flex;
 		justify-content: center;
+		align-items: center;
+		height: 90rpx;
+		border-bottom: 1px solid #aaa9a5 ;
 		.sticky{
 			display: flex;
 			align-items: center;
@@ -433,7 +441,7 @@
 		// position: absolute;
 		width: 100%;
 		margin-top: 24rpx;
-		height: 140rpx;
+		height: 210rpx;
 		.ant-menu-card {
 			// position: absolute;
 			// top: -40rpx;
diff --git a/pages/notice/notice.vue b/pages/notice/notice.vue
index 7aafc7d..f6ed127 100644
--- a/pages/notice/notice.vue
+++ b/pages/notice/notice.vue
@@ -1,7 +1,13 @@
 <template>
-	<view>
+	<view class="content_box">
 		<!-- 公告页面 -->
-		这是一个公告页面
+		<view class="title">
+			<text>{{title}}</text>
+		</view>
+		<!-- 富文本 -->
+		<view class="parse_box">
+			<u-parse :content="content"></u-parse>
+		</view>
 	</view>
 </template>
 
@@ -9,15 +15,44 @@
 	export default {
 		data() {
 			return {
-				
+				state: '',	
+				content: "",
+				title: "",
 			}
 		},
+		onLoad(options) {
+			console.log(options)
+			this.state = options.state;
+			this.getNoticeInfo(options.state);
+		},
 		methods: {
-			
+			getNoticeInfo(state) {
+				this.$api.getNiceInfo({state}).then( res => {
+					this.title = res.result[0].title;
+					this.content = res.result[0].content;
+				}).catch(err => {
+					console.log(err)
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+	.content_box{
+		background-color: rgba(255, 0, 0, .5) ;
+		min-height: 100vh;
+		.title{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 80rpx;
+			font-size: 46rpx;
+			font-weight: 700;
+		}
+		.parse_box{
+			margin: 0 30rpx;
+		}
+	}
+	
 </style>