From 2cb033e0d26877c6dc11e1695cd5f5ce5e09499c Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 8 Jul 2025 10:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue |  2 ++
 root/other/city.vue  | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 6600006..072e04d 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -358,6 +358,8 @@ export default {
 			if (cachedCity) {
 				if (this.selectedCity != cachedCity) {
 					this.selectedCity = cachedCity;
+					this.speed = -1;
+					this.loading = true;
 					this.getList();
 				}
 			}
diff --git a/root/other/city.vue b/root/other/city.vue
index 31e17ac..d7bc56b 100644
--- a/root/other/city.vue
+++ b/root/other/city.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="g_pl_16 container" style="background-color: #f5f5f5">
-		<scroll-view class="cities-scroll" scroll-with-animation="true" style="box-sizing: border-box; height: calc(100vh - 87px)" :scroll-into-view="az" scroll-y ref="scrollViewRef">
+		<scroll-view class="cities-scroll" scroll-with-animation="true" style="box-sizing: border-box" :scroll-into-view="az" scroll-y ref="scrollViewRef">
 			<view class="">
 				<view class="headTxt">当前城市</view>
 				<view class="" hover-class="none" hover-stop-propagation="false">
-					<view @click="selectQuanGuo" class="itemCity" :class="{ active: selectedCity === '全国' }">全国</view>
-					<view class="g_flex_row_center itemCity" v-if="currentCity" @click="selectCity({ shortName: currentCity })" :class="{ active: selectedCity === currentCity }">
+					<view @click="selectQuanGuo" :class="{ itemCity: true, active: selectedCity === '全国' }">全国</view>
+					<view class="g_flex_row_center" v-if="currentCity" @click="selectCity({ shortName: currentCity })" :class="{ itemCity: true, active: selectedCity === currentCity }">
 						<i class="iconfont icon-dizhi1 g_mr_4"></i>
 						{{ currentCity }}
 					</view>
@@ -15,7 +15,7 @@
 					<block v-for="group in cities">
 						<view class="headTxt" :id="`letter-${group.name[0] == '热' ? 're' : group.name[0]}`">{{ group.name }}</view>
 						<block v-for="city in group.list">
-							<view @click="selectCity(city)" class="itemCity" :class="{ active: selectedCity === city.shortName }">{{ city.shortName }}</view>
+							<view @click="selectCity(city)" :class="{ itemCity: true, active: selectedCity === city.shortName }">{{ city.shortName }}</view>
 						</block>
 					</block>
 				</view>
@@ -35,7 +35,7 @@
 		<g-panel-fixed>
 			<view class="g_flex_row_center">
 				<g-button btnText="重置" size="small" @clickBtn="back"></g-button>
-				<g-button btnText="确定" type="primary" class="g_ml_24" size="small" @clickBtn="setCity"></g-button>
+				<g-button btnText="确定" type="primary" class="g_ml_20" size="small" @clickBtn="setCity"></g-button>
 			</view>
 		</g-panel-fixed>
 	</view>
@@ -69,7 +69,7 @@ export default {
 	methods: {
 		setCity() {
 			uni.setStorageSync("selectedCity", this.selectedCity);
-			console.log(`城市 ${this.selectedCity} 已保存到缓存`);
+			console.log(`城市 ${this.selectedCity} 已 保存到缓存`);
 			uni.navigateBack({ delta: 1 });
 		},
 		getCity() {
@@ -225,6 +225,8 @@ export default {
 	}
 
 	.cities-scroll {
+		// height: calc(100vh - constant(safe-area-inset-bottom) - 72px);
+		padding-bottom: 87px;
 		// height: calc(100vh - 100px);
 		// overflow-y: auto;
 	}