From 057758772e7fd9263ce914d3bab1d0f78e8ab7df Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 22 Apr 2026 18:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=88=87=E6=8D=A2=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity-list/activityList.vue            |   5 +-
 .../pageSubPack/api/api.js                    |  24 +-
 .../pageSubPack/api/request.js                |   2 +-
 .../pageSubPack/loginSub/login.vue            |  84 +++--
 .../pageSubPack/loginSub/pwd-login.vue        |  98 ++---
 .../pageSubPack/notice-list/noticeList.vue    | 186 ++++++----
 .../notice-list/noticeListDetails.vue         |  10 +-
 .../pageSubPack/notice-list/selectHome.vue    | 336 ++++++++----------
 property-uniapp-project/pages/index/index.vue | 152 +++++---
 9 files changed, 493 insertions(+), 404 deletions(-)

diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
index 4992d14..f34aeee 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -438,7 +438,7 @@
 	.container {
 		width: 100%;
 		height: 100vh;
-		background-color: #f9f9f9;
+		background-color: #fff;
 		display: flex;
 		flex-direction: column;
 		padding: 0;
@@ -453,7 +453,7 @@
 	.top-bar {
 		width: 100%;
 		flex-shrink: 0;
-		background: #f9f9f9;
+		background: #fff;
 	}
 
 	/* 滚动区域 */
@@ -551,6 +551,7 @@
 		margin-bottom: 30rpx;
 		box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
 		position: relative;
+		border: 1px solid #e1e1e1;
 	}
 
 	/* 活动状态标签 */
diff --git a/property-uniapp-project/pageSubPack/api/api.js b/property-uniapp-project/pageSubPack/api/api.js
index 7ca875a..896602a 100644
--- a/property-uniapp-project/pageSubPack/api/api.js
+++ b/property-uniapp-project/pageSubPack/api/api.js
@@ -23,6 +23,26 @@ export const getResetPassword = (data) =>{
 }
 // =========首页=======
 // 首页最新公告
-export const getNoticeList = () =>{
+export const getNoticeLatest = () =>{
 	return get('/api/resident/notice/latest')
-}
\ No newline at end of file
+}
+
+// 查询已认证的小区
+export const getVillageList = (data) =>{
+	return get('/api/resident/village/myList', data)
+}
+// 获取当前小区
+export const getCurrentVillage = () =>{
+	return get('/api/resident/village/current')
+}
+// 切换小区
+export const getVillageSwitch = (data)=>{
+	return post('/api/resident/village/switch',data)
+}
+// ====公告列表======
+// 获取公告列表
+export const getNoticeList = (data) =>{
+	return get('/api/resident/notice/list',data)
+}
+// 获取公告详情
+// export const getNoticeDetails = 
\ No newline at end of file
diff --git a/property-uniapp-project/pageSubPack/api/request.js b/property-uniapp-project/pageSubPack/api/request.js
index 9929930..7dfb08f 100644
--- a/property-uniapp-project/pageSubPack/api/request.js
+++ b/property-uniapp-project/pageSubPack/api/request.js
@@ -43,7 +43,7 @@ export default function request(url, data = {}, method = "GET") {
 					uni.showToast({ title: '登录过期，请重新登录', icon: 'none', duration: 2000 });
 					uni.clearStorageSync('token');
 					setTimeout(() => {
-						uni.reLaunch({ url: '/pages/login/login' });
+						uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' });
 					}, 1500);
 					reject('token 过期');
 					return;
diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue
index ea4155b..b72c0fc 100644
--- a/property-uniapp-project/pageSubPack/loginSub/login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/login.vue
@@ -13,10 +13,10 @@
 	   <uni-easyinput  class="input-content"  type="number" v-model="phoneNumber"
 	  	   placeholder="请输入手机号" :inputBorder="false" maxlength="11"  :placeholderStyle="placeholderStyle">
 	  	   </uni-easyinput>
-   <!--   <input 
-        class="input-content" 
-        type="number" 
-        placeholder="请输入手机号" 
+   <!--   <input
+        class="input-content"
+        type="number"
+        placeholder="请输入手机号"
         v-model="phoneNumber"
         maxlength="11"
         @input="checkForm"
@@ -31,16 +31,16 @@
 	  <uni-easyinput  class="input-content verify-input"  type="number" v-model="verifyCode"
 	  	  	   placeholder="请输入验证码" :inputBorder="false" maxlength="6"  :placeholderStyle="placeholderStyle">
 		</uni-easyinput>
-    <!--  <input 
-        class="input-content verify-input" 
-        type="number" 
-        placeholder="请输入验证码" 
+    <!--  <input
+        class="input-content verify-input"
+        type="number"
+        placeholder="请输入验证码"
         v-model="verifyCode"
         maxlength="6"
         @input="checkForm"
       /> -->
-      <button 
-        class="get-verify-btn" 
+      <button
+        class="get-verify-btn"
         :disabled="!canGetVerify || countDown > 0"
         @click="getVerifyCode"
       >
@@ -50,15 +50,15 @@
 
     <!-- 协议勾选 -->
     <view class="agreement-item" @click="toggleAgreement">
-      <uni-icons 
-        type="checkbox-filled" 
-        size="24" 
+      <uni-icons
+        type="checkbox-filled"
+        size="24"
         color="#007aff"
         v-if="agreeAgreement"
       ></uni-icons>
-      <uni-icons 
-        type="checkbox" 
-        size="24" 
+      <uni-icons
+        type="checkbox"
+        size="24"
         color="#999"
         v-else
       ></uni-icons>
@@ -66,8 +66,8 @@
     </view>
 
     <!-- 登录按钮 -->
-    <button 
-      class="login-btn" 
+    <button
+      class="login-btn"
       :disabled="!canLogin"
       @click="handleLogin"
     >
@@ -134,13 +134,12 @@ const getVerifyCode = () => {
   }
   uni.showLoading({ title: '发送中...', mask: true });
   getSendCode(params).then(res =>{
-	  console.log('44444',res)
   	  if(res.code === 200){
 		  uni.hideLoading();
   		 uni.showToast({
   		   title: '验证码已发送',
   		   icon: 'success'
-  		 }); 
+  		 });
 		 // 开始60秒倒计时
 		 countDown.value = 60;
 		 timer = setInterval(() => {
@@ -149,19 +148,19 @@ const getVerifyCode = () => {
 		     clearInterval(timer);
 		     timer = null;
 		   }
-		 }, 1000);  		
+		 }, 1000);
   	  }else{
   		 uni.showToast({
   		   title: '验证码发送失败',
   		   icon: 'error'
-  		 }); 
+  		 });
   	  }
   }).catch(err => {
     uni.showToast({
       title: '网络异常',
       icon: 'error'
     });
-  }) 
+  })
 
 };
 
@@ -176,25 +175,36 @@ const handleLogin = () => {
   }
   getLoginBySms(params).then(res =>{
   	if(res.code === 200){
-  		//uni.setStorageSync('token', res.token); // 假设后端返回token字段
-		uni.hideLoading();
-  		uni.showToast({ title: '登录成功', icon: 'success' });
-		setTimeout(() =>{
-			uni.switchTab({ url: '/pages/index/index' });
-		},1500)
-  		
+		if(res.data){
+			uni.setStorageSync('token', res.data.token);
+			// 存用户ID
+			if(res.data.userId) {
+				uni.setStorageSync('userId', res.data.userId);
+			}
+			// 存当前绑定的小区ID，0 表示未绑定
+			const currentVillageId = res.data.currentVillageId || 0;
+			uni.setStorageSync('currentVillageId', currentVillageId);
+			uni.hideLoading();
+			uni.showToast({ title: '登录成功', icon: 'success' });
+			setTimeout(() =>{
+				uni.switchTab({ url: '/pages/index/index' });
+			},1500)
+		}else{
+			uni.showToast({ title: '登录失败', icon: 'error' });
+		}
+
   	}else{
   		uni.showToast({ title:'登录失败', icon: 'error' });
   	}
-  	
+
   }).catch(err => {
-		uni.showToast({ 
-			title: '网络异常，请重试', 
-			icon: 'error' 
+		uni.showToast({
+			title: '网络异常，请重试',
+			icon: 'error'
 		});
 	})
-	
- 
+
+
   // 模拟登录请求
   // uni.showLoading({
   //   title: '登录中...'
@@ -346,4 +356,4 @@ button:after{
   color: #007aff;
   text-decoration: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
index 627add4..b3b3f83 100644
--- a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
@@ -24,21 +24,21 @@
 	  <uni-easyinput  class="input-content"  type="password" v-model="password"
 	   placeholder="请输入密码" :inputBorder="false"  :placeholderStyle="placeholderStyle">
 	   </uni-easyinput>
-  
+
     </view>
 
     <!-- 协议勾选 + 忘记密码 -->
     <view class="agreement-wrap">
       <view class="agreement-item" @click="toggleAgreement">
-        <uni-icons 
-          type="checkbox-filled" 
-          size="24" 
+        <uni-icons
+          type="checkbox-filled"
+          size="24"
           color="#007aff"
           v-if="agreeAgreement"
         ></uni-icons>
-        <uni-icons 
-          type="checkbox" 
-          size="24" 
+        <uni-icons
+          type="checkbox"
+          size="24"
           color="#999"
           v-else
         ></uni-icons>
@@ -48,9 +48,9 @@
     </view>
 
     <!-- 登录按钮 -->
-    <button 
+    <button
       class="login-btn"
-	  
+	  :disabled="!canLogin"
       @click="handleLogin"
     >
       登录
@@ -100,6 +100,7 @@ const handleLogin = () => {
 	 //  uni.showToast({ title: '请输入账号和密码', icon: 'none' });
 	 //  return
   // }
+
   if (!phoneNumber.value) {
 		uni.showToast({ title: '请输入账号', icon: 'none' });
 		return;
@@ -112,42 +113,49 @@ const handleLogin = () => {
 	  uni.showToast({ title: '请勾选协议', icon: 'none' });
 	  return;
   }
- //   uni.showLoading({ title: '登录中...', mask: true });
- //  	let params = {
- //  		username:phoneNumber.value,
- //  		password:password.value
- //  	}
- //  	getLoginPassword(params).then(res =>{
- //  		// console.log('33333',res)
- //  		if(res.code === 200){
- //  			uni.setStorageSync('token', res.token);
-	// 		uni.hideLoading();
- //  			uni.showToast({ title: '登录成功', icon: 'success' });
-	// 		setTimeout(() => {
-	// 		      uni.switchTab({ url: '/pages/index/index' });
-	// 		    }, 1500);
- //  		}else{
- //  			uni.showToast({ title: `${res.msg},请先注册账号`, icon: 'error' });
- //  		}
-  		
- //  	}).catch(err => {
-	// 	// console.error('登录接口异常：', err);
-	// 	uni.showToast({ 
-	// 			title: '网络异常', 
-	// 			icon: 'error' 
-	// 		});
-	// })
-	
+   uni.showLoading({ title: '登录中...', mask: true });
+  	let params = {
+  		username:phoneNumber.value,
+  		password:password.value
+  	}
+  	getLoginPassword(params).then(res =>{
+  		console.log('33333',res)
+  		if(res.code === 200){
+  			uni.setStorageSync('token', res.data.token);
+			// 存用户ID
+			if(res.data) {
+				// 存当前绑定的小区ID，0 表示未绑定
+				const currentVillageId = res.data.currentVillageId || 0;
+				uni.setStorageSync('currentVillageId', currentVillageId);
+			}
+			uni.hideLoading();
+			uni.showToast({ title: '登录成功', icon: 'success' });
+			setTimeout(() =>{
+				uni.switchTab({
+				  url: '/pages/index/index'
+				},1000);
+			})
+  		}else{
+  			uni.showToast({ title: res.msg, icon: 'error' });
+  		}
+
+  	}).catch(err => {
+		uni.showToast({
+				title: '网络异常',
+				icon: 'error'
+			});
+	})
+
 	// 测试
-	uni.showLoading({
-	  title: '登录中...',
-	  mask:true
-	});
-	setTimeout(() => {
-	      uni.switchTab({ url: '/pages/index/index' });
-	    }, 1500);
-		uni.hideLoading()
-	
+	// uni.showLoading({
+	//   title: '登录中...',
+	//   mask:true
+	// });
+	// setTimeout(() => {
+	//       uni.switchTab({ url: '/pages/index/index' });
+	//     }, 1500);
+	// 	uni.hideLoading()
+
 };
 </script>
 
@@ -234,7 +242,7 @@ const handleLogin = () => {
   background-color: #99c8ff;
   color: #fff;
   border-radius: 50px;
-  
+
 }
 
 .bottom-link {
diff --git a/property-uniapp-project/pageSubPack/notice-list/noticeList.vue b/property-uniapp-project/pageSubPack/notice-list/noticeList.vue
index 98a46d7..83824db 100644
--- a/property-uniapp-project/pageSubPack/notice-list/noticeList.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/noticeList.vue
@@ -1,10 +1,12 @@
 <template>
 	   <!-- 通知列表 -->
-	    <scroll-view 
-	      class="notice-list" 
-	      scroll-y 
-	      :refresher-enabled="true" 
-	      :refresher-triggered="refreshing" 
+	    <scroll-view
+	      class="notice-list"
+	      scroll-y
+	      :refresher-enabled="true"
+	      :refresher-triggered="refreshing"
+	      @refresherrefresh="onRefresh"
+	      @scrolltolower="loadMore"
 	      :style="{ height: `calc(100vh - ${statusBarHeight + navBarHeight}px)` }"
 	    >
 		<view class="status_bar"></view>
@@ -17,25 +19,25 @@
 	        <uni-icons type="spinner-cycle" size="20" color="#999" class="loading"></uni-icons>
 	        <text class="refresh-text">刷新中...</text>
 	      </view>
-	
+
 	      <!-- 通知列表项 -->
-	      <view 
-	        v-for="(notice, index) in noticeList" 
-	        :key="notice.id" 
+	      <view
+	        v-for="(notice, index) in noticeList"
+	        :key="notice.noticeId"
 	        class="notice-item"
 	        @click="goToDetail(notice)"
 	      >
 	        <!-- 通知标题 -->
 			<view class="notice-header">
 				<view class="notice-title">
-				  {{notice.title}}
+				  {{notice.noticeTitle}}
 				</view>
-				 <view class="unread-dot" v-if="notice.hasRead"></view>
+				 <view class="unread-dot" v-if="notice.readStatus"></view>
 			</view>
-	       
+
 			<!-- 红点 -->
-			
-	        
+
+
 	        <!-- 发布者和时间 -->
 	        <view class="notice-meta">
 	          <view class="notice-author">
@@ -44,11 +46,11 @@
 	            <text class="publish-time">{{notice.publishTime}}</text>
 	          </view>
 	        </view>
-	        
+
 	        <!-- 通知摘要 -->
 	        <view class="notice-summary">
-	          {{ notice.summary }}
-	        </view> 
+	          {{ notice.noticeContent }}
+	        </view>
 	        <!-- 详情 -->
 	        <view class="notice-actions"  @click.stop="goToDetail(notice)">
 	       <!--  <view class="read-status" :class="{ unread: !notice.hasRead }">
@@ -63,63 +65,101 @@
 	          <!-- </button> -->
 	        </view>
 	      </view>
-	
+
 	      <!-- 加载更多 -->
 	      <view v-if="loadingMore" class="load-more">
 	        <uni-icons type="spinner-cycle" size="18" color="#999" class="loading"></uni-icons>
 	        <text>加载中...</text>
 	      </view>
-	
+
 	      <!-- 没有更多数据 -->
 	      <view v-if="noMoreData && noticeList.length > 0" class="no-more">
 	        没有更多通知了
 	      </view>
-	
+
 	      <!-- 空状态 -->
 	      <view v-if="noticeList.length === 0 && !loading" class="empty-state">
-	        <image src="/static/empty-notice.png" mode="aspectFit" class="empty-image"></image>
+	        <!-- <image src="/static/empty-notice.png" mode="aspectFit" class="empty-image"></image> -->
 	        <text class="empty-text">暂无通知</text>
 	        <button class="btn-refresh" @click="loadNotices">刷新试试</button>
 	      </view>
 	    </scroll-view>
-	
+
 </template>
 
 <script setup>
 	import { ref } from 'vue';
-	
-	
-	const noticeList = ref([
-		{
-			id:'1',
-			title:'我那我是咖啡牛奶附件说的都是vv的v给v梵蒂冈v辅导报告发布',
-			author:'张三',
-			publishTime:'2026.3.5',
-			summary:'为保障社区居民生命财产安全，维护社区和谐稳定，根据上级部门要求，结合我社区实际情况，现就进一步加强社区安全管理工作通知如下',
-			hasRead:true
-		},
-		{
-			id:'2',
-			title:'今天停水了',
-			author:'张三',
-			publishTime:'2026.3.5',
-			summary:'为保障社区居民生命财产安全，维护社区和谐稳定，根据上级部门要求，结合我社区实际情况，现就进一步加强社区安全管理工作通知如下',
-			hasRead:true
-			
-		}
-	])
+	import { onLoad } from '@dcloudio/uni-app'
+	import { getNoticeList } from '../api/api.js'
+
+	const noticeList = ref([])
 	const refreshing = ref(false)
 	const loadingMore = ref(false)
 	const noMoreData = ref(false)
+	const loading = ref(false)
+	const pageNum = ref(1)
 	const pageSize = 10
 	const statusBarHeight = ref(0)
 	const navBarHeight = 44
+
 	// --方法----
-	const goToDetail = () =>{
+	const goToDetail = (notice) =>{
 		uni.navigateTo({
-			url:'/pageSubPack/notice-list/noticeListDetails'
+			url:'/pageSubPack/notice-list/noticeListDetails?id=' + (notice.id || '')
 		})
 	}
+
+	// 获取列表接口
+	const loadNotices = async (isRefresh = false) => {
+		if (loading.value) return
+		loading.value = true
+
+		if (isRefresh) {
+			pageNum.value = 1
+			noMoreData.value = false
+		}
+
+		try {
+			const res = await getNoticeList({
+				pageNum: pageNum.value,
+				pageSize: pageSize
+			})
+			if (res.code === 200) {
+				const list = res.data.rows
+				if (isRefresh) {
+					noticeList.value = list
+				} else {
+					noticeList.value = [...noticeList.value, ...list]
+				}
+				if (list.length < pageSize) {
+					noMoreData.value = true
+				}
+			} else {
+				uni.showToast({ title: res.msg || '加载失败', icon: 'none' })
+			}
+		} catch (err) {
+			uni.showToast({ title: '网络异常', icon: 'none' })
+		} finally {
+			loading.value = false
+			refreshing.value = false
+			loadingMore.value = false
+		}
+	}
+
+	// 下拉刷新
+	const onRefresh = () => {
+		refreshing.value = true
+		loadNotices(true)
+	}
+
+	// 上拉加载更多
+	const loadMore = () => {
+		if (noMoreData.value || loadingMore.value || loading.value) return
+		loadingMore.value = true
+		pageNum.value++
+		loadNotices()
+	}
+
 	// 返回
 	const narBack = () =>{
 		if(uni.getStorageSync('sourcePage') === "index"){
@@ -133,7 +173,13 @@
 		}
 		uni.removeStorageSync('sourcePage')
 	}
-	
+
+	onLoad(() => {
+		const sysInfo = uni.getSystemInfoSync()
+		statusBarHeight.value = sysInfo.statusBarHeight || 0
+		loadNotices(true)
+	})
+
 </script>
 
 <style lang="scss">
@@ -162,12 +208,12 @@
   padding: 20px 0;
   color: #999;
   font-size: 14px;
-  
+
   .loading {
     animation: rotate 1s linear infinite;
     margin-bottom: 8px;
   }
-  
+
   .refresh-text {
     font-size: 12px;
   }
@@ -181,11 +227,11 @@
   margin-bottom: 12px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
   position: relative;
-  
+
   &:active {
     background-color: #f9f9f9;
   }
-  
+
   /* 重要通知标记 */
   &.important::before {
     content: '';
@@ -215,8 +261,8 @@
   // -webkit-line-clamp: 2;
   width: 290px;
   overflow: hidden;
-  text-overflow: ellipsis; 
-  white-space: nowrap; 
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
     // 未读红点
 .unread-dot {
@@ -234,29 +280,29 @@
   margin-bottom: 12px;
   color: #666;
   font-size: 12px;
-  
+
   .notice-author {
     display: flex;
     align-items: center;
-    
+
     .author-name {
       color: #666;
     }
-    
+
     .separator {
       margin: 0 6px;
       color: #ccc;
     }
-    
+
     .publish-time {
       color: #999;
     }
   }
-  
+
   .notice-time {
     display: flex;
     align-items: center;
-    
+
     .date-text {
       margin-left: 4px;
       color: #999;
@@ -283,20 +329,20 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  
+
   .read-status {
     font-size: 12px;
     padding: 2px 8px;
     border-radius: 10px;
     background-color: #f0f0f0;
     color: #999;
-    
+
     &.unread {
       background-color: #e6f7ff;
       color: #1890ff;
     }
   }
-  
+
   .detail-btn {
     display: flex;
     align-items: flex-end;
@@ -306,11 +352,11 @@
     font-size: 14px;
     padding: 0;
 	margin-right: 10rpx;
-    
+
     &::after {
       border: none;
     }
-    
+
     text {
       margin-right: 4px;
     }
@@ -332,7 +378,7 @@
   padding: 20px 0;
   color: #999;
   font-size: 14px;
-  
+
   .loading {
     animation: rotate 1s linear infinite;
     margin-right: 8px;
@@ -353,31 +399,31 @@
   align-items: center;
   justify-content: center;
   padding: 60px 20px;
-  
+
   .empty-image {
     width: 200px;
     height: 150px;
     margin-bottom: 20px;
   }
-  
+
   .empty-text {
     font-size: 16px;
     color: #999;
     margin-bottom: 20px;
   }
-  
+
   .btn-refresh {
     background-color: #007AFF;
     color: #fff;
     padding: 8px 20px;
     border-radius: 20px;
     font-size: 14px;
-    
+
     &::after {
       border: none;
     }
   }
 }
 
-	
-</style>
\ No newline at end of file
+
+</style>
diff --git a/property-uniapp-project/pageSubPack/notice-list/noticeListDetails.vue b/property-uniapp-project/pageSubPack/notice-list/noticeListDetails.vue
index f88cac3..7d51c22 100644
--- a/property-uniapp-project/pageSubPack/notice-list/noticeListDetails.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/noticeListDetails.vue
@@ -75,9 +75,17 @@
 
 <script setup>
 	import { ref, onMounted } from 'vue'
-	// import { onLoad, onShow } from '@dcloudio/uni-app'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
 	
 	const isLoading = ref(false)
+	
+	// =====方法====
+	onLoad((options) =>{
+		console.log('options',options.id)
+	})
+	
+	
+	
 	// 下载文件
 	const downloadFile = (fileName) => {
 	  uni.showModal({
diff --git a/property-uniapp-project/pageSubPack/notice-list/selectHome.vue b/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
index 1387416..a590838 100644
--- a/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
@@ -4,9 +4,9 @@
     <view class="search-container">
       <view class="search-input-wrapper">
         <uni-icons class="search-icon" type="search" size="20" color="#999"></uni-icons>
-        <input 
-          class="search-input" 
-          placeholder="请输入关键字进行搜索" 
+        <input
+          class="search-input"
+          placeholder="请输入关键字进行搜索"
           placeholder-class="placeholder"
           v-model="searchText"
           @input="handleSearchInput"
@@ -19,34 +19,32 @@
     </view>
 
     <!-- 小区列表 -->
-    <scroll-view 
-      class="community-list" 
+    <scroll-view
+      class="community-list"
       scroll-y
       :scroll-into-view="scrollIntoViewId"
       @scrolltolower="loadMoreData"
       :lower-threshold="100"
     >
-      <view 
-        v-for="item in displayedCommunities" 
-        :key="item.villageId" 
+      <view
+        v-for="item in displayedCommunities"
+        :key="item.villageId"
         class="community-item"
+        :class="{ 'active-item': selectedItem && selectedItem.villageId === item.villageId }"
         :id="'item-' + item.villageId"
         @tap="selectCommunity(item)"
       >
         <view class="community-item-left">
-			<image src="http://47.104.199.163:9090/images/home/community.png" style="width: 60rpx;height: 60rpx;"></image>
-          <!-- <uni-icons class="house-icon" type="home" size="24" color="#666"></uni-icons> -->
+          <image src="http://47.104.199.163:9090/images/home/community.png" style="width: 60rpx;height: 60rpx;"></image>
           <view class="community-info">
             <text class="community-name">{{ item.villageName }}</text>
-            <!-- <text class="community-address">{{ item.address }}</text> -->
-            <!-- <text class="community-id">ID: {{ item.id }}</text> -->
           </view>
         </view>
         <view v-if="selectedItem && selectedItem.villageId === item.villageId" class="selected-icon">
           <uni-icons type="checkbox-filled" size="24" color="#007AFF"></uni-icons>
         </view>
       </view>
-      
+
       <!-- 加载更多 -->
       <view v-if="hasMoreData" class="load-more-container">
         <view v-if="!isLoading" class="load-more-btn" @tap="loadMoreData">
@@ -57,22 +55,21 @@
           <uni-icons type="spinner-cycle" size="20" color="#007AFF" class="loading-icon"></uni-icons>
           <text>正在加载...</text>
         </view>
-        <!-- <text class="page-info">第 {{ currentPage }} 页 / 共 {{ totalPages }} 页</text> -->
       </view>
-      
+
       <!-- 没有更多数据 -->
       <view v-if="!hasMoreData && displayedCommunities.length > 0" class="no-more-data">
         <text>没有更多数据了</text>
       </view>
-      
+
       <!-- 空状态 -->
-      <view v-if="displayedCommunities.length === 0 && !isSearching" class="empty-state">
+      <view v-if="displayedCommunities.length === 0 && !isSearching && !isLoading" class="empty-state">
         <uni-icons type="info" size="60" color="#ccc"></uni-icons>
         <text class="empty-text">暂无小区数据</text>
       </view>
-      
+
       <!-- 搜索无结果 -->
-      <view v-if="displayedCommunities.length === 0 && isSearching" class="empty-state">
+      <view v-if="displayedCommunities.length === 0 && isSearching && !isLoading" class="empty-state">
         <uni-icons type="search" size="60" color="#ccc"></uni-icons>
         <text class="empty-text">未找到相关小区</text>
         <text class="empty-tip">请尝试其他关键词</text>
@@ -81,35 +78,33 @@
 
     <!-- 确认按钮 -->
     <view class="confirm-area">
-      <button 
-        class="confirm-btn" 
+      <button
+        class="confirm-btn"
         :disabled="!selectedItem"
         :class="{ 'disabled-btn': !selectedItem }"
         @tap="handleConfirm"
       >
         确认选择
       </button>
-      <view v-if="selectedItem" class="selected-info">
-        已选: {{ selectedItem.name }}
-      </view>
     </view>
   </view>
 </template>
 
 <script setup>
 import { ref, computed, onMounted, watch } from 'vue'
-import {onLoad} from '@dcloudio/uni-app'
-// import {getVillageList} from "/pages/api/api.js"
+import { onLoad } from '@dcloudio/uni-app'
+import { getVillageList, getVillageSwitch } from "../api/api.js"
 
 // 响应式数据
 const searchText = ref('')
 const selectedItem = ref(null)
 const scrollIntoViewId = ref('')
+const currentVillageIdFromHome = ref('') // 首页传入的当前选中小区ID
 
 // 分页相关
 const currentPage = ref(1)
 const pageSize = 5
-const totalCommunities = ref([])
+const totalCount = ref(0)
 const displayedCommunities = ref([])
 const hasMoreData = ref(true)
 const isLoading = ref(false)
@@ -118,100 +113,84 @@ const isLoading = ref(false)
 const isSearching = ref(false)
 let searchTimeout = null
 
-// 所有小区数据
-const allCommunities = ref([
-  // { id: 1, name: '北境碧桂园小区', address: '北境市光明区碧桂路1号' },
-  // { id: 2, name: '南湖花园小区', address: '南湖市滨湖区湖滨路28号' },
-  // { id: 3, name: '东城国际社区', address: '东城市新城区人民路156号' },
-  // { id: 4, name: '西湖雅苑', address: '西湖市风景区梅灵路88号' },
-  // { id: 5, name: '北境锦绣家园', address: '北境市朝阳区朝阳路56号' },
-  // { id: 6, name: '阳光100小区', address: '阳光市高新区创业路100号' },
-  // { id: 7, name: '绿城玫瑰园', address: '绿城市西湖区学院路188号' },
-  // { id: 8, name: '金地自在城', address: '金城市江干区金沙大道200号' },
-  // { id: 9, name: '万科城市花园', address: '万城市余杭区文一西路299号' },
-  // { id: 10, name: '保利中央公园', address: '保利市拱墅区莫干山路500号' },
-  // { id: 11, name: '龙湖天街小区', address: '龙湖市滨江区江南大道100号' },
-])
-
-// 计算属性
-const totalPages = computed(() => {
-  return Math.ceil(totalCommunities.value.length / pageSize)
-})
-
 // =====方法======
-// 查询小区列表
-const getCommunityList = () =>{
-	let params = {
-		keyword:searchText.value
-	}
-	getVillageList(params).then(res =>{
-		console.log('1111',res)
-		if(res.code === 200){
-			allCommunities.value = res.data
-			uni.showToast({
-				title:"查询成功",
-				icon:'success'
-			})
-			
-		}else{
-			allCommunities.value = []
-			uni.showToast({
-				title:"查询失败",
-				icon:'error'
-			})
-		}
-	})
-}
-
-onLoad(() =>{
-	// getCommunityList()
-})
-
-
-
-
-// 加载分页数据
-const loadPageData = (pageNum) => {
+// 查询已认证小区列表
+const getCommunityList = async (pageNum = 1, keyword = '') => {
   isLoading.value = true
-  
-  // 模拟网络请求延迟
-  setTimeout(() => {
-    const startIndex = (pageNum - 1) * pageSize
-    const endIndex = startIndex + pageSize
-    const pageData = totalCommunities.value.slice(startIndex, endIndex)
-    
-    if (pageNum === 1) {
-      displayedCommunities.value = pageData
+
+  try {
+    const params = {
+      pageNum,
+      pageSize,
+      keyword: keyword.trim()
+    }
+
+    const res = await getVillageList(params)
+
+    if (res.code === 200) {
+      const listData = res.data?.rows || res.data?.list || res.data || []
+      const total = res.data?.total || listData.length
+
+      if (pageNum === 1) {
+        displayedCommunities.value = listData
+      } else {
+        displayedCommunities.value = [...displayedCommunities.value, ...listData]
+      }
+
+      totalCount.value = total
+      hasMoreData.value = displayedCommunities.value.length < totalCount.value
+
+      // 默认选中：优先匹配传入的 villageId，否则选第一条（仅第一页时）
+      if (pageNum === 1 && displayedCommunities.value.length > 0) {
+        const targetId = currentVillageIdFromHome.value || uni.getStorageSync('currentVillageId') || ''
+        if (targetId) {
+          const matched = displayedCommunities.value.find(
+            item => String(item.villageId) === String(targetId)
+          )
+          selectedItem.value = matched || displayedCommunities.value[0]
+        } else {
+          selectedItem.value = displayedCommunities.value[0]
+        }
+      }
     } else {
-      displayedCommunities.value = [...displayedCommunities.value, ...pageData]
+      displayedCommunities.value = []
+      hasMoreData.value = false
+      uni.showToast({
+        title: res.msg || "查询失败",
+        icon: 'error'
+      })
     }
-    
-    currentPage.value = pageNum
-    hasMoreData.value = displayedCommunities.value.length < totalCommunities.value.length
+  } catch (err) {
+    console.error('获取小区列表失败：', err)
+    displayedCommunities.value = []
+    hasMoreData.value = false
+    uni.showToast({
+      title: "网络异常",
+      icon: 'error'
+    })
+  } finally {
     isLoading.value = false
-    
-    // 滚动到新加载的内容
-    if (pageNum > 1 && pageData.length > 0) {
-      setTimeout(() => {
-        scrollIntoViewId.value = 'item-' + pageData[0].id
-      }, 100)
-    }
-  }, 500)
+  }
 }
 
+// 页面加载时初始化
+onLoad((options) => {
+  currentVillageIdFromHome.value = options?.villageId || ''
+  getCommunityList(1)
+})
+
 // 加载更多数据
 const loadMoreData = () => {
   if (isLoading.value || !hasMoreData.value) return
-  loadPageData(currentPage.value + 1)
+  getCommunityList(currentPage.value + 1, searchText.value)
+  currentPage.value += 1
 }
 
-// 处理搜索输入
+// 处理搜索输入（防抖）
 const handleSearchInput = () => {
-  // 防抖处理
   if (searchTimeout) {
     clearTimeout(searchTimeout)
   }
-  
   searchTimeout = setTimeout(() => {
     handleSearch()
   }, 300)
@@ -219,30 +198,18 @@ const handleSearchInput = () => {
 
 // 处理搜索
 const handleSearch = () => {
-  const keyword = searchText.value.trim().toLowerCase()
-  
-  if (!keyword) {
-    isSearching.value = false
-    totalCommunities.value = [...allCommunities.value]
-    loadPageData(1)
-    return
-  }
-  
-  isSearching.value = true
-  totalCommunities.value = allCommunities.value.filter(community => 
-    community.name.toLowerCase().includes(keyword) || 
-    community.address.toLowerCase().includes(keyword)
-  )
-  
-  loadPageData(1)
+  const keyword = searchText.value.trim()
+  isSearching.value = !!keyword
+  currentPage.value = 1
+  getCommunityList(1, keyword)
 }
 
 // 清空搜索
 const clearSearch = () => {
   searchText.value = ''
   isSearching.value = false
-  totalCommunities.value = [...allCommunities.value]
-  loadPageData(1)
+  currentPage.value = 1
+  getCommunityList(1)
 }
 
 // 选择小区
@@ -251,7 +218,7 @@ const selectCommunity = (item) => {
 }
 
 // 确认选择
-const handleConfirm = () => {
+const handleConfirm = async () => {
   if (!selectedItem.value) {
     uni.showToast({
       title: '请先选择小区',
@@ -260,28 +227,50 @@ const handleConfirm = () => {
     })
     return
   }
-  
-  uni.showModal({
-    title: '确认选择',
-    content: `您已选择: ${selectedItem.value.name}\n地址: ${selectedItem.value.address}`,
-    success: (res) => {
-      if (res.confirm) {
-        uni.showToast({
-          title: '选择成功',
-          icon: 'success',
-          duration: 1500
-        })
-        
-        // 这里可以触发回调或页面跳转
-       // uni.navigateBack() 或 emit('confirm', selectedItem.value)
-        uni.$emit('confirm', selectedItem.value)
-        // 模拟2秒后返回上一页
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1500)
-      }
+  try {
+    uni.showLoading({
+      title: '切换小区中...',
+      mask: true
+    })
+    const params = {
+      villageId: selectedItem.value.villageId,
     }
-  })
+    const res = await getVillageSwitch(params)
+    uni.hideLoading()
+
+    if (res.code === 200) {
+      if (res.data.villageId) {
+        selectedItem.value.villageId = res.data.villageId
+      }
+      uni.showToast({
+        title: '选择成功',
+        icon: 'success',
+        duration: 1500
+      })
+      // 更新缓存并通知首页
+      uni.setStorageSync('currentVillageId', selectedItem.value.villageId)
+      uni.$emit('confirm', {
+        name: selectedItem.value.villageName,
+        villageId: selectedItem.value.villageId
+      })
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1000)
+    } else {
+      uni.showToast({
+        title: res.msg || '切换小区失败',
+        icon: 'error',
+        duration: 2000
+      })
+    }
+  } catch (err) {
+    uni.hideLoading()
+    uni.showToast({
+      title: '网络异常，请重试',
+      icon: 'error',
+      duration: 2000
+    })
+  }
 }
 
 // 监听搜索文本变化
@@ -293,19 +282,13 @@ watch(searchText, (newVal) => {
 
 // 初始化
 onMounted(() => {
-  // 初始化数据
-  totalCommunities.value = [...allCommunities.value]
-  loadPageData(1)
-  
-  // 默认选中第一项
-  if (displayedCommunities.value.length > 0) {
-    selectedItem.value = displayedCommunities.value[0]
+  if (displayedCommunities.value.length === 0 && !isLoading.value) {
+    getCommunityList(1)
   }
 })
 </script>
 
 <style scoped>
-/* 页面容器 */
 .container {
   min-height: 100vh;
   background-color: #f5f5f5;
@@ -314,7 +297,6 @@ onMounted(() => {
    padding: 40rpx;
 }
 
-/* 搜索区域 */
 .search-container {
   padding: 20rpx 30rpx;
   background-color: #ffffff;
@@ -372,13 +354,10 @@ onMounted(() => {
   white-space: nowrap;
 }
 
-/* 小区列表 */
 .community-list {
   flex: 1;
-  /* padding: 0 30rpx; */
   margin-top: 20rpx;
   margin-bottom: 180rpx;
-  
 }
 
 .community-item {
@@ -393,9 +372,9 @@ onMounted(() => {
   transition: all 0.2s;
 }
 
-.community-item:active {
-  background-color: #f9f9f9;
-  transform: translateY(2rpx);
+.community-item:active,
+.community-item.active-item {
+  background-color: #e6f2ff;
 }
 
 .community-item-left {
@@ -404,39 +383,23 @@ onMounted(() => {
   flex: 1;
 }
 
-.house-icon {
-  margin-right: 20rpx;
-}
-
 .community-info {
   display: flex;
   flex-direction: column;
   flex: 1;
+  margin-left: 20rpx;
 }
 
 .community-name {
   font-size: 32rpx;
   color: #333;
   font-weight: 500;
-  margin-bottom: 8rpx;
-}
-
-.community-address {
-  font-size: 24rpx;
-  color: #999;
-  margin-bottom: 5rpx;
-}
-
-.community-id {
-  font-size: 22rpx;
-  color: #ccc;
 }
 
 .selected-icon {
   margin-left: 20rpx;
 }
 
-/* 加载更多容器 */
 .load-more-container {
   display: flex;
   flex-direction: column;
@@ -483,12 +446,6 @@ onMounted(() => {
   to { transform: rotate(360deg); }
 }
 
-.page-info {
-  font-size: 24rpx;
-  color: #999;
-}
-
-/* 没有更多数据 */
 .no-more-data {
   text-align: center;
   padding: 40rpx 0;
@@ -496,7 +453,6 @@ onMounted(() => {
   font-size: 28rpx;
 }
 
-/* 空状态 */
 .empty-state {
   display: flex;
   flex-direction: column;
@@ -517,7 +473,6 @@ onMounted(() => {
   color: #ccc;
 }
 
-/* 确认区域 */
 .confirm-area {
   position: fixed;
   bottom: 0;
@@ -544,17 +499,6 @@ onMounted(() => {
   color: #fff;
 }
 
-.selected-info {
-  text-align: center;
-  font-size: 24rpx;
-  color: #666;
-  margin-top: 20rpx;
-  padding: 10rpx;
-  background-color: #f8f8f8;
-  border-radius: 8rpx;
-}
-
-/* 适配不同屏幕 */
 @media (min-width: 768px) {
   .container {
     max-width: 500px;
diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue
index a5ec2b3..9705c0a 100644
--- a/property-uniapp-project/pages/index/index.vue
+++ b/property-uniapp-project/pages/index/index.vue
@@ -157,9 +157,8 @@
 
 <script setup>
 import { ref } from 'vue'
-import {onLoad,onUnload} from '@dcloudio/uni-app'
-import {getNoticeList} from "/pageSubPack/api/api.js"
-
+import {onLoad,onUnload,onShow} from '@dcloudio/uni-app'
+import {getNoticeLatest,getCurrentVillage} from "/pageSubPack/api/api.js"
 
 
 // 列表数据状态
@@ -187,14 +186,17 @@ const activityList = ref([
 		
 	// },
 ])
-const currentCommunity = ref('碧桂园小区')
+const currentCommunity = ref('请认证小区')
+const currentVillageId  = ref('')
 const bannerList = ref([
 	'http://47.104.199.163:9090/images/home/banner.png',
 	
 ]) 
-const noticeText = ref('公告公告本小区今天安装了摄像头')
+const noticeText = ref('暂无公告')
+const noticeId = ref('')
 
 // =======方法=======
+// 公告跳转
 const getNoticeMore = () =>{
 	uni.setStorageSync('sourcePage',"index")
 	uni.navigateTo({
@@ -203,31 +205,82 @@ const getNoticeMore = () =>{
 }
 // 接收选择小区返回的参数
 const slelctHomeData = (data) =>{
-	  // console.log('收到B页面返回的数据：', data)
-	  currentCommunity.value = data.name
+	  console.log('收到B页面返回的数据：', data)
+	  if(data.name){
+		  currentCommunity.value = data.name 
+	  }
+	  if(data.villageId){
+			currentVillageId.value = data.villageId  
+	  } 
+	  getCurrentCommunityData()
 }
+// 获取当前认证小区的方法
+const getCurrentCommunityData = () => {
+	getCurrentVillage().then(res =>{
+		if(res.code === 200 && res.data && res.data.villageId){
+			currentCommunity.value = res.data.villageName || '未命名小区'
+			currentVillageId.value = res.data.villageId
+			uni.setStorageSync('currentVillageId',res.data.villageId)
+		}else{
+			currentCommunity.value = '请认证小区'
+			currentVillageId.value = ''
+		}
+	}).catch(err =>{
+		uni.showToast({
+			title: '网络异常',
+			 icon: 'error'
+		});
+	})
+}
+  
 
 // 获取小区公告
-// const getNoticeData = () =>{
-// 	getNoticeList().then(res =>{
-// 		if(res.code === 200){
-// 			noticeText.value = res.data.noticeTitle
-			
-// 		}else{
-// 			noticeText.value = ''
-// 		}
-// 	}).catch(err =>{
-// 		uni.showToast({
-// 		  title: '网络异常',
-// 		  icon: 'error'
-// 		});
-// 	})
-// }
+const getNoticeData =  async() =>{
+	try{
+		const res =  await getNoticeLatest()
+		    if (res.code === 200) {
+				if(res.data){
+					noticeText.value = res.data.noticeTitle || ''
+					noticeId.value = res.data.noticeId || ''
+				}else{
+					noticeText.value = ''
+					noticeId.value = ''
+				}
+		  
+		    } else {
+		      uni.showToast({
+		        title: res.msg || '获取通知失败',
+		        icon: 'none',
+		        duration: 2000
+		      })
+		    }
+		  } catch (err) {
+		    // console.error('获取通知数据异常：', err)
+		    uni.showToast({
+		      title: err.msg,
+		      icon: 'error',
+		      duration: 1000
+		    })
+		    noticeText.value = ''
+		    noticeId.value = ''
+		  }
+	}
+
+onShow(() =>{
+})
+	
+
 onLoad(() => {
   // 绑定全局事件监听  
   uni.$on('confirm', slelctHomeData)
-  // getNoticeData()
-  
+ 
+   // 页面加载时，先判断是否有token，有则获取认证小区
+    const token = uni.getStorageSync('token') || '';
+	const currentVillageId = uni.getStorageSync('currentVillageId');
+    if (token && currentVillageId && currentVillageId !== '0' && currentVillageId !== 0) {
+      getCurrentCommunityData(); // 加载时获取认证小区
+    }
+	 getNoticeData() 
 })
 
 // 页面销毁时移除监听（防止内存泄漏）
@@ -250,33 +303,32 @@ const payMentClick =() =>{
 	})
 }
 // 点击小区选择
-// const navigateToPage = () => {
-//   // 获取登录状态 / token
-//   const token = uni.getStorageSync('token') || '';
-//   // 获取是否已经认证
-//   const userInfo = uni.getStorageSync('userInfo') || {};
-//   // 未登录 / 未认证 → 去我的页面（去认证）
-//   // 已登录 / 已认证 → 去选择小区
-//   if (!token || !userInfo.isAuth) {
-//     uni.showToast({
-//       title: '请先完成实名认证',
-//       icon: 'none'
-//     });
-//     // 跳转到我的页面
-//     uni.switchTab({
-//       url: '/pages/myIndex/myIndex'
-//     });
-//   } else {
-//     uni.navigateTo({
-//       url: '/pageSubPack/notice-list/selectHome'
-//     });
-//   }
-// }; 
 const navigateToPage = () => {
-  uni.navigateTo({
-    url: '/pageSubPack/notice-list/selectHome'
-  })
-}
+  const token = uni.getStorageSync('token') || '';
+  const cachedVillageId = uni.getStorageSync('currentVillageId');
+  // 未登录 或 未绑定小区 → 去我的页面认证
+  if (!token || !cachedVillageId || cachedVillageId === '0' || cachedVillageId === 0) {
+    currentCommunity.value = '请去认证小区';
+    uni.setStorageSync('currentCommunity', '请去认证小区');
+    uni.showToast({
+      title: '请先绑定小区',
+      icon: 'none',
+      duration: 1500
+    });
+    setTimeout(() => {
+      uni.switchTab({
+        url: '/pages/myIndex/myIndex',
+      });
+    }, 1500);
+  } else {
+    // 已登录且已绑定小区 → 去选择小区
+    uni.navigateTo({
+      url: `/pageSubPack/notice-list/selectHome?villageId=${cachedVillageId}`
+    });
+  }
+}; 
+
+
 const onlineRepairClick = () =>{
 	uni.setStorageSync('sourcePage',"index")
 	uni.navigateTo({