From 2ba24f2320fa2d9ee0d7858d0efed81944b6f6fc Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Thu, 4 Jun 2026 17:01:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B0=8F=E5=8C=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/pageSubPack/loginSub/login.vue     | 2 ++
 wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue | 2 ++
 wuye-manager-uniapp/pageSubPack/setting/setting.vue    | 2 +-
 wuye-manager-uniapp/pages/index/index.vue              | 5 ++++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index e603e05..2cee652 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -224,6 +224,8 @@ const handleLogin = () => {
           if (res.data.userId) {
             uni.setStorageSync('userId', res.data.userId)
           }
+          // 清掉上次账号的小区缓存，防止新账号显示旧小区
+          uni.removeStorageSync('currentVillage')
           // 存当前绑定的小区ID，0 表示未绑定
           const currentVillageId = res.data.currentVillageId || 0
           uni.setStorageSync('currentVillageId', currentVillageId)
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index d4d1f21..99dec9e 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -161,6 +161,8 @@
 		 		// console.log('33333',res)
 		 		if(res.code === 200){
 		 			uni.setStorageSync('token', res.data.token);
+				// 清掉上次账号的小区缓存，防止新账号显示旧小区
+				uni.removeStorageSync('currentVillage');
 				// 存用户ID
 				// if(res.data) {
 				// 	// 存当前绑定的小区ID，0 表示未绑定
diff --git a/wuye-manager-uniapp/pageSubPack/setting/setting.vue b/wuye-manager-uniapp/pageSubPack/setting/setting.vue
index baeb53e..41f8427 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/setting.vue
+++ b/wuye-manager-uniapp/pageSubPack/setting/setting.vue
@@ -29,7 +29,7 @@
 
     <!-- 退出登录按钮 -->
     <view class="logout-btn-wrap">
-      <button class="logout-btn" :disabled="!phoneNumber" @tap="handleLogout">
+      <button class="logout-btn" @tap="handleLogout">
         退出登录
       </button>
     </view>
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 9587b78..e8edf48 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -44,7 +44,7 @@
             @clickItem="clickItem"
             :info="bannerList"
             :current="current"
-            mode="round"
+            mode="default"
           >
             <swiper class="swiper-box" :current="current" @change="onSwiperChange" autoplay>
               <swiper-item v-for="(item, index) in bannerList" :key="index">
@@ -238,6 +238,8 @@ const goToReport = () => {
 }
 // 获取当前小区
 const currentVillageData = () => {
+  // 先重置，避免新账号无小区时仍显示旧账号的小区
+  currentCommunity.value = '请选择小区'
   getCurrentVillage()
     .then(res => {
       const data = res.data
@@ -306,6 +308,7 @@ const slelctHomeData = data => {
 onShow(()=>{
    getbannarData()
    getInspectionData()
+   currentVillageData()
 })
 
 onLoad(() => {

From 87b5269b87c8dedc046088e82f384e0005a41c69 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Thu, 4 Jun 2026 17:06:19 +0800
Subject: [PATCH 2/2] Merge branch 'master' of
 http://gitea.bugtc.com/zhouyanli/property-manager-side
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	wuye-manager-uniapp/pages/index/index.vue
解决冲突
---
 wuye-manager-uniapp/pages/index/index.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 8804788..af9b00d 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -305,12 +305,10 @@ const slelctHomeData = data => {
   getNoticeData()
   getInspectionData()
 }
-
-onShow(()=>{
-   getbannarData()
-   getInspectionData()
+onShow(() => {
+  getbannarData()
+  getInspectionData()
    currentVillageData()
-
 })
 
 onLoad(() => {