From 02fb18a0acc65d17ce4360df6c3c559269b0d2c7 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Fri, 3 Jan 2025 16:26:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=A4=A9=E6=B0=94?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=98=BE=E7=A4=BA=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=B9=B6=E4=BF=AE=E6=AD=A3=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/Temperature/Temperature.vue    | 2 +-
 src/components/PublicComponent/Tabs.vue | 4 ++--
 src/composables/useWeather.js           | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/base/Temperature/Temperature.vue b/src/base/Temperature/Temperature.vue
index bf3db23..14497d1 100644
--- a/src/base/Temperature/Temperature.vue
+++ b/src/base/Temperature/Temperature.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="Temperature-wrapper">
-    <div class="temperature">{{ weather.temperature_Now }}°</div>
+    <div class="temperature">{{ weather.temperatureLow }}~{{ weather.temperatureHigh }}°</div>
     <i class="iconfont weather-icon" :class="icon.icon"></i>
   </div>
 </template>
diff --git a/src/components/PublicComponent/Tabs.vue b/src/components/PublicComponent/Tabs.vue
index b99d00a..0cb4fbb 100644
--- a/src/components/PublicComponent/Tabs.vue
+++ b/src/components/PublicComponent/Tabs.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="tabs" v-if="menuList.find(({ routePath }) => routePath === path)">
-    <div :class="['item', tab.routePath === path ? 'active' : '']" v-for="(tab, i) of menuList" :key="tab.moduleCode" @click="goPage(tab)">
+    <div :class="['item', tab.routePath === path ? 'active' : '']" v-for="tab of menuList" :key="tab.moduleCode" @click="goPage(tab)">
       <div class="icon"><img :src="theme.images[tab.routePath.slice(1)]" /></div>
       <div class="title">{{ tab.moduleName }}</div>
-      <div class="count" v-if="i === 0 && activityCount">{{ activityCount }}</div>
+      <div class="count" v-if="tab.routePath === '/activity' && activityCount">{{ activityCount }}</div>
     </div>
   </div>
 </template>
diff --git a/src/composables/useWeather.js b/src/composables/useWeather.js
index 06ad2f8..badccc2 100644
--- a/src/composables/useWeather.js
+++ b/src/composables/useWeather.js
@@ -10,7 +10,11 @@ export const useWeather = () => {
     { icon: 'icon-duoyunzhuanyin', status: '阴' }
   ]
   const store = useStore()
-  const weather = computed(() => ({ temperature_Now: store.indexList.temperatureNow, status: store.indexList.weather }))
+  const weather = computed(() => ({
+    temperatureLow: Math.floor(Number(store.indexList.temperatureLow)),
+    temperatureHigh: Math.floor(Number(store.indexList.temperatureHigh)),
+    status: store.indexList.weather
+  }))
   const icon = computed(() => status.find(item => weather.value?.status?.includes(item.status)) ?? status[0])
 
   return { weather, icon }