From 93b467ba13b543dbce009f146b413ea492863a23 Mon Sep 17 00:00:00 2001
From: qiuchenfan <2035024011@qq.com>
Date: Mon, 17 Nov 2025 19:26:09 +0800
Subject: [PATCH] 1114

---
 app/components/WeatherDetailsGird.tsx |  1 +
 app/components/WeatherDispaly2.tsx    | 45 --------------------------
 app/components/WeatherDisplay.tsx     | 46 +++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 45 deletions(-)
 delete mode 100644 app/components/WeatherDispaly2.tsx

diff --git a/app/components/WeatherDetailsGird.tsx b/app/components/WeatherDetailsGird.tsx
index 30bf498..d4fe5ff 100644
--- a/app/components/WeatherDetailsGird.tsx
+++ b/app/components/WeatherDetailsGird.tsx
@@ -1,5 +1,6 @@
 import { Cloud, Droplets, Gauge, ThermometerSun, Wind } from "lucide-react";
 import { useWeatherStore } from "@/store/weatherStore";
+import { MapPin, Thermometer } from "lucide-react";
 
 interface WeatherDetailsGridProps {
   icon: React.ReactNode;
diff --git a/app/components/WeatherDispaly2.tsx b/app/components/WeatherDispaly2.tsx
deleted file mode 100644
index b519075..0000000
--- a/app/components/WeatherDispaly2.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { MapPin, Thermometer } from "lucide-react";
-
-export function WeatherDisplay2(){
-    const {currentWeather} = useWeatherStore();
-    if(!currentWeather) return null;
-
-    return(
-        <div className="relative overflow-hidden rounded-2xl bg-gradient-to-b from-blue-500 via-cyan-500 to-blue-500 p-6 mb-4">
-            <div className="absolute inset-0 bg-gradient-to-br from-white/100 to-transparent"></div>
-            <div className="absolute -right-8 -top-8 w-32 h-32 bg-white/20 rounded-full blur-3xl"></div>
-            <div className="realtive 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="text-white w-3 h-3">
-                            <MapPin className="w-3 h-3 text-white" />
-                            <span className="text-white text-sm">{currentWeather.location.country}</span>
-                        </div>
-                        <div className="text-white ">
-                            <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">
-                            °C
-                        </span>
-                    </div>
-                    <p className="text-lg text-white mb-2 capitalize font-medium">
-                        {currentWeather.current.weather_descriptions[0]}
-                    </p>
-                    <div className="flex items-center gap-2 text-white text-sm">
-                        <Thermometer className="w-4 h-4"/>
-                        <span>体感{formatTemperature(currentWeather.current.feelslike)}°C</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    )
-}
\ No newline at end of file
diff --git a/app/components/WeatherDisplay.tsx b/app/components/WeatherDisplay.tsx
index 6efd581..c6e3415 100644
--- a/app/components/WeatherDisplay.tsx
+++ b/app/components/WeatherDisplay.tsx
@@ -9,6 +9,7 @@ import {
     CloudSnow,
     CloudSun,
     MapPin, Moon, Sun,
+    Thermometer,
     ThermometerSun
 } from 'lucide-react';
 
@@ -44,3 +45,48 @@ function WeatherIcon({ description, isDay, className = "w-16 h-16 md:w-20 md:h-2
     }
     return isDaytime ? <Sun className={className} /> : <Moon className={className} />;
 }
+
+
+export function WeatherDisplay2(){
+    const {currentWeather} = useWeatherStore();
+    if(!currentWeather) return null;
+
+    return(
+        <div className="relative overflow-hidden rounded-2xl bg-gradient-to-b from-blue-500 via-cyan-500 to-blue-500 p-6 mb-4">
+            <div className="absolute inset-0 bg-gradient-to-br from-white/100 to-transparent"></div>
+            <div className="absolute -right-8 -top-8 w-32 h-32 bg-white/20 rounded-full blur-3xl"></div>
+            <div className="realtive 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="text-white w-3 h-3">
+                            <MapPin className="w-3 h-3 text-white" />
+                            <span className="text-white text-sm">{currentWeather.location.country}</span>
+                        </div>
+                        <div className="text-white ">
+                            <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">
+                            °C
+                        </span>
+                    </div>
+                    <p className="text-lg text-white mb-2 capitalize font-medium">
+                        {currentWeather.current.weather_descriptions[0]}
+                    </p>
+                    <div className="flex items-center gap-2 text-white text-sm">
+                        <Thermometer className="w-4 h-4"/>
+                        <span>体感{formatTemperature(currentWeather.current.feelslike)}°C</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    )
+}
\ No newline at end of file