diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 8df1a746..eed54962 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -12,11 +12,12 @@
{{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
-
- {{ weatherData.city }},白天{{ todayWeather.dayweather }},晚上{{ todayWeather.nightweather }} +
+ {{ weatherCity }}: 白天{{ todayWeather.dayweather }},晚上{{ todayWeather.nightweather }}
-
- 气温{{ todayWeather.daytemp }}°C~{{ todayWeather.nighttemp }}°C ,{{ todayWeather.daywind }}风{{ todayWeather.daypower }}级 +
+ 气温{{ todayWeather.daytemp }}°C~{{ todayWeather.nighttemp }}°C + ,{{ todayWeather.daywind }}风{{ todayWeather.daypower }}级
@@ -29,7 +30,8 @@ {{ item.date }}
- 白天{{ item.dayweather }},晚上{{ item.nightweather }},气温{{ item.daytemp }}°C~{{ item.nighttemp }}°C + 白天{{ item.dayweather }},晚上{{ item.nightweather }},气温 + {{ item.daytemp }}°C~{{ item.nighttemp }}°C ,{{ item.daywind }}风{{ item.daypower }}级
@@ -38,7 +40,6 @@
-
@@ -51,7 +52,7 @@ - - - - -
- - {{ item.name }} -
-
{{ t(item.message) }}
-
- {{ item.personal }} - {{ formatTime(item.time, 'yyyy-MM-dd') }} -
-
-
-
-
+
+
+ + + + +
+
@@ -190,15 +189,20 @@ let totalSate = reactive({ }) const weatherList = ref([]) -let weatherData = null +let weatherEnable = false let todayWeather = null +let weatherCity = "" /** 初始化 **/ onMounted(async () => { // 加载 - weatherData = await HomeApi.getWeatherInfo() - weatherList.value = weatherData.casts - if(weatherData.isEnable && weatherList) - todayWeather = weatherList.value[0]; + const data = await HomeApi.getWeatherInfo() + weatherEnable = data.isEnable + if(data.isEnable && weatherList){ + weatherList.value = data.casts + todayWeather = weatherList.value[0] + weatherCity = data.city + } + }) const getCount = async () => { @@ -393,3 +397,9 @@ const getAllApi = async () => { getAllApi() + diff --git a/src/views/Home/Link.vue b/src/views/Home/Link.vue new file mode 100644 index 00000000..775014a5 --- /dev/null +++ b/src/views/Home/Link.vue @@ -0,0 +1,24 @@ + +