From c1ccf0064cdf23a6e6c44588dfeda1f2e4b53b19 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Fri, 14 Nov 2025 18:55:21 +0800
Subject: [PATCH] 1

---
 .../app/components/weather/WeatherDisplay.tsx | 53 +++++++++++++------
 1114/app/store/weatherStore.ts                |  4 +-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/1114/app/components/weather/WeatherDisplay.tsx b/1114/app/components/weather/WeatherDisplay.tsx
index c064a93..92eb7f0 100644
--- a/1114/app/components/weather/WeatherDisplay.tsx
+++ b/1114/app/components/weather/WeatherDisplay.tsx
@@ -1,5 +1,6 @@
 import { useWeatherStore } from "@/store/weatherStore";
-import { Cloud, CloudDrizzle, CloudFog, CloudLightning, CloudMoon, CloudRain, CloudSnow, CloudSun, MapPin, Moon, Sun } from "lucide-react";
+import { Cloud, CloudDrizzle, CloudFog, CloudLightning, CloudMoon, CloudRain, CloudSnow, CloudSun, MapPin, Moon, Sun, ThermometerSun } from "lucide-react";
+import { formatTemperature } from "../lib/utils";
 
 interface WeatherIconProps {
     description: string;
@@ -31,23 +32,41 @@ export function WeatherDisplay(){
     if (!currentWeather) return null;
 
     return (
-        <div className="relative overflow-hidden rounded-2xl bg-gradient-to-r from-[#3498db] to-[#2980b9] via-cyan-500 p-6 mb-4">
-            <div className="absolute inset-0 bg-gradient-to-r from-white/10 to-transparent"></div>
-            <div className="absolute -right-8 -top-8 w-32 h-32 bg-white/10 rounded-full blur-3xl"></div>
-            <div className="relative z-10">
-                <div className="flex items-start justify-between mb-6">
-                    <div>
-                        <h2 className="text-3xl font-semibold mb-2 text-white">{currentWeather.location.name}</h2>
-                        <div className="inline-flex items-center gap-2 px-2.5 py-1 rounded-full bg-white/20 backdrop-blur-sm">
-                            <MapPin className="w-3 h-3 text-white/90"/>
-                            <div className="text-white text-sm">{currentWeather.location.country}</div>
-                        </div>
-                    </div>
-                    <div className="text-white/90">
-                        {/* <WeatherIcon description={currentWeather.current.} isDay={currentWeather.current.is_day} className="w-12 h-12 md:w-16 md:h-16"/> */}
-                    </div>
-                </div>
+        <div className="relative overflow-hidden rounded-2xl bg-gradient-to-br from-blue-500 via-cyan-500 to-blue-600 dark:from-blue-600 dark:via-cyan-600 dark:to-blue-700 p-6 mb-4">
+      <div className="absolute inset-0 bg-gradient-to-br from-white/10 to-transparent"></div>
+      <div className="absolute -right-8 -top-8 w-32 h-32 bg-white/10 rounded-full blur-3xl"></div>
+
+      <div className="relative z-10">
+        <div className="flex items-start justify-between mb-6">
+          <div>
+            <h2 className="text-3xl font-semibold text-white mb-2">{currentWeather.location.name}</h2>
+            <div className="inline-flex items-center gap-2 px-2.5 py-1 rounded-full bg-white/20 backdrop-blur-sm">
+              <MapPin className="w-3 h-3 text-white/90" />
+              <span className="text-sm text-white/90">{currentWeather.location.country}</span>
             </div>
+          </div>
+          <div className="text-white/90">
+            <WeatherIcon
+              description={currentWeather.current.weather_descriptions[0]}
+              isDay={currentWeather.current.is_day}
+            />
+          </div>
         </div>
+
+        <div className="flex items-baseline gap-2 mb-2">
+          <span className="text-6xl font-light text-white">
+            {formatTemperature(currentWeather.current.temperature)}
+          </span>
+          <span className="text-2xl text-white/80">°C</span>
+        </div>
+        <p className="text-lg text-white/90 font-medium mb-2 capitalize">
+          {currentWeather.current.weather_descriptions[0]}
+        </p>
+        <div className="flex items-center gap-2 text-white/80 text-sm">
+          <ThermometerSun className="w-4 h-4" />
+          <span>体感 {formatTemperature(currentWeather.current.feelslike)}°C</span>
+        </div>
+      </div>
+    </div>
     )
 }
\ No newline at end of file
diff --git a/1114/app/store/weatherStore.ts b/1114/app/store/weatherStore.ts
index a12ab9e..c827f36 100644
--- a/1114/app/store/weatherStore.ts
+++ b/1114/app/store/weatherStore.ts
@@ -102,7 +102,7 @@ export const useWeatherStore = create<WeatherStore>()(
                     set({currentWeather:cachedWeather.data,isLoading:false});
                     return;
                 }
-                const weatherData = await WeatherAPI.getWeather(city);
+                const weatherData = await WeatherAPI.getCurrentWeather(city);
                 set({currentWeather:weatherData,isLoading:false});
                 get().cacheWeather(city,weatherData);
             }catch(error){
@@ -115,7 +115,7 @@ export const useWeatherStore = create<WeatherStore>()(
             try{
                 set({isLoading:true,error:null});
                 const city = currentWeather.location.name;
-                const weatherData = await WeatherAPI.getWeather(city);
+                const weatherData = await WeatherAPI.getCurrentWeather(city);
                 set({currentWeather:weatherData,isLoading:false});
                 get().cacheWeather(currentWeather.location.name,weatherData);
             }catch(error){