From fcc57f2f3604444aabe9642e56a7f6e2863b9a7a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 12 Apr 2025 17:29:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/CommonWeather.vue | 5 +++--
.prettierrc.json | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.prettierrc.json b/.prettierrc.json
index c78fa85..e1e619b 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -7,6 +7,7 @@
"singleQuote": true,
"arrowParens": "avoid",
"endOfLine": "crlf",
+ "htmlWhitespaceSensitivity": "ignore",
"bracketSameLine": false,
"proseWrap": "preserve",
"useTabs": true,
@@ -21,4 +22,4 @@
}
}
]
-}
+}
\ No newline at end of file
diff --git a/src/components/CommonWeather.vue b/src/components/CommonWeather.vue
index cc2592f..473e729 100644
--- a/src/components/CommonWeather.vue
+++ b/src/components/CommonWeather.vue
@@ -6,7 +6,7 @@
<img src="@/assets/images/home/homeLeft/tq.png" alt="" />
<span class="tq">{{ weather }}</span>
<span class="tq">风速：{{ windVelocity }} </span>
- <span v-if="flylevel >= 5" :class="[isFly === '建议飞行' ? 'qk' : isFly === '禁止飞行' ? 'redqk' : 'yellowqk']">{{
+ <span v-if="flylevel >= 5" :class="[isFly === '适合飞行' ? 'qk' : isFly === '禁止飞行' ? 'redqk' : 'yellowqk']">{{
isFly
}}</span>
</div>
@@ -37,8 +37,9 @@
weather.value = res.data.data.weather
isFly.value = res.data.data.flightAdvice
windVelocity.value = res.data.data.windPower
- flylevel.value = res.data.data.adcode.replace(/0+$/, "")
+ flylevel.value = res.data.data.adcode.replace(/0+$/, "").length
+
})
}
--
Gitblit v1.9.3