From 08ef87ce3348ccd8385ef712afd67467c37e2cb3 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 29 Oct 2024 16:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=9B=AD=E5=8C=BA=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pages/home/index.js b/pages/home/index.js
index 11fa741..53e9f1a 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -43,8 +43,8 @@ Page({
     })
   },
   chooseTenement() {
-    const { park = {}} = this.data;
-    const { tenements } = park;
+    const { all = [], park = {} } = this.data;
+    const tenements = all.find(item => item.id === park?.id)?.tenements
     this.setData({
       columns: tenements,
       show: true,
@@ -292,27 +292,24 @@ Page({
     const updateDatas = {}
     if (!park || !park.id) {
       const storagePark = wx.getStorageSync('park')
-      if (data.find(item => item.id !== storagePark.id)) {
+      if (!data.find(item => item.id === storagePark?.id)) {
         updateDatas.park = firstPark
       } else {
-        updateDatas.park = storagePark
+        updateDatas.park = storagePark || firstPark
       }
+    } else {
+      updateDatas.park = park;
     }
     if (!tenement || !tenement.id) {
       const storageTenement = wx.getStorageSync('tenement')
-      if (!park || !park.id) {
-        if (firstPark.tenements?.find(item => item.id !== storageTenement.id)) {
-          updateDatas.tenement = firstPark.tenements?.[0]
-        } else {
-          updateDatas.tenement = storageTenement
-        }
+      if (!updateDatas.park.tenements?.find(item => item.id === storageTenement?.id)) {
+        updateDatas.tenement = updateDatas.park.tenements?.[0]
       } else {
-        if (park.tenements?.find(item => item.id !== storageTenement.id)) {
-          updateDatas.tenement = park.tenements?.[0]
-        } else {
-          updateDatas.tenement = storageTenement
-        }
+        updateDatas.tenement = storageTenement || park.tenements?.[0]
       }
+      
+    } else {
+      updateDatas.tenement = tenement
     }
     updateDatas.all = data;
     this.setData({