Merge branch 'main' of http://113.45.67.59:3003/lzq/test

app/components/WeatherSearchForm.tsx

@@ -74,9 +74,6 @@ export function WeatherSearchForm() {
 
                     <div className='flex gap-2'>
                         <Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full">
-
-
-
                             {isLoading ? <>
                                 <Loader2 className="animate-spin w-5 h-5 text-white" />
                                 <span>搜索中...</span>
@@ -85,7 +82,6 @@ export function WeatherSearchForm() {
                                 <span>搜索天气</span>
                             </>)}
                         </Button>
-
                         {currentWeather && (
                             <Button type="button" variant="outline" onClick={refreshWeather} disabled={isLoading} className="mt-4 w-full" title='刷新数据'>
                                 <RefreshCw className={cn("w-5 h-5", isLoading && "animate-spin")} />

app/store/weatherStore.ts

@@ -89,7 +89,7 @@ export const useWeatherStore = create<WeatherStore>()(
                 return{weatherCache:newCache}
             }),
             setLoading:(loading)=>set({isLoading:loading}),
-            setError:(error)=>set({error}),
+            setError:(error)=>set({error,isLoading:false}),
             reset:()=>set({currentWeather:null,weatherCache:new Map(),isLoading:false,error:null}),
             searchWeather:async(city:string)=>{
                 try{